diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index cd9b36a..3a162f0 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000901
 
 //===========================================================================
 //============================= Getting Started =============================
@@ -1234,7 +1234,7 @@
 #define Z_PROBE_OFFSET_RANGE_MAX 30
 
 // Enable the M48 repeatability test to test probe accuracy
-//#define Z_MIN_PROBE_REPEATABILITY_TEST
+#define Z_MIN_PROBE_REPEATABILITY_TEST
 
 // Before deploy/stow pause for user confirmation
 //#define PAUSE_BEFORE_DEPLOY_STOW
@@ -1297,8 +1297,8 @@
 
 // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
 #define INVERT_X_DIR false
-#define INVERT_Y_DIR true
-#define INVERT_Z_DIR false
+#define INVERT_Y_DIR false
+#define INVERT_Z_DIR true
 //#define INVERT_I_DIR false
 //#define INVERT_J_DIR false
 //#define INVERT_K_DIR false
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7a44388..d0be182 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000901
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -584,7 +584,7 @@
  * Multiple extruders can be assigned to the same pin in which case
  * the fan will turn on when any selected extruder is above the threshold.
  */
-#define E0_AUTO_FAN_PIN -1
+#define E0_AUTO_FAN_PIN PB4
 #define E1_AUTO_FAN_PIN -1
 #define E2_AUTO_FAN_PIN -1
 #define E3_AUTO_FAN_PIN -1
@@ -876,7 +876,7 @@
   // Define probe X and Y positions for Z1, Z2 [, Z3 [, Z4]]
   // If not defined, probe limits will be used.
   // Override with 'M422 S<index> X<pos> Y<pos>'
-  //#define Z_STEPPER_ALIGN_XY { {  10, 190 }, { 100,  10 }, { 190, 190 } }
+  #define Z_STEPPER_ALIGN_XY { {  10, 190 }, { 100,  10 }, { 190, 190 } }
 
   /**
    * Orientation for the automatically-calculated probe positions.
@@ -1449,7 +1449,7 @@
   //#define UTF_FILENAME_SUPPORT
 
   // This allows hosts to request long names for files and folders with M33
-  //#define LONG_FILENAME_HOST_SUPPORT
+  #define LONG_FILENAME_HOST_SUPPORT
 
   // Enable this option to scroll long filenames in the SD card menu
   //#define SCROLL_LONG_FILENAMES
@@ -1474,7 +1474,7 @@
   /**
    * Auto-report SdCard status with M27 S<seconds>
    */
-  //#define AUTO_REPORT_SD_STATUS
+  #define AUTO_REPORT_SD_STATUS
 
   /**
    * Support for USB thumb drives using an Arduino USB Host Shield or
@@ -1858,7 +1858,7 @@
  *
  * Warning: Does not respect endstops!
  */
-//#define BABYSTEPPING
+#define BABYSTEPPING
 #if ENABLED(BABYSTEPPING)
   //#define INTEGRATED_BABYSTEPPING         // EXPERIMENTAL integration of babystepping into the Stepper ISR
   //#define BABYSTEP_WITHOUT_HOMING
@@ -2206,7 +2206,7 @@
  * Currently handles M108, M112, M410, M876
  * NOTE: Not yet implemented for all platforms.
  */
-//#define EMERGENCY_PARSER
+#define EMERGENCY_PARSER
 
 /**
  * Realtime Reporting (requires EMERGENCY_PARSER)
@@ -2242,7 +2242,7 @@
 #define SERIAL_OVERRUN_PROTECTION
 
 // For serial echo, the number of digits after the decimal point
-//#define SERIAL_FLOAT_PRECISION 4
+#define SERIAL_FLOAT_PRECISION 4
 
 // @section extras
 
@@ -2424,7 +2424,7 @@
   //#define PARK_HEAD_ON_PAUSE                    // Park the nozzle during pause and filament change.
   //#define HOME_BEFORE_FILAMENT_CHANGE           // If needed, home before parking for filament change
 
-  //#define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
+  #define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
   //#define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
 #endif
 
@@ -2774,7 +2774,7 @@
    * The default SW SPI pins are defined the respective pins files,
    * but you can override or define them here.
    */
-  //#define TMC_USE_SW_SPI
+  #define TMC_USE_SW_SPI
   //#define TMC_SW_MOSI       -1
   //#define TMC_SW_MISO       -1
   //#define TMC_SW_SCK        -1
@@ -3589,7 +3589,7 @@
 /**
  * Auto-report position with M154 S<seconds>
  */
-//#define AUTO_REPORT_POSITION
+#define AUTO_REPORT_POSITION
 
 /**
  * Include capabilities in M115 output
@@ -3644,11 +3644,11 @@
 //#define NO_WORKSPACE_OFFSETS
 
 // Extra options for the M114 "Current Position" report
-//#define M114_DETAIL         // Use 'M114` for details to check planner calculations
+#define M114_DETAIL         // Use 'M114` for details to check planner calculations
 //#define M114_REALTIME       // Real current position based on forward kinematics
 //#define M114_LEGACY         // M114 used to synchronize on every call. Enable if needed.
 
-//#define REPORT_FAN_CHANGE   // Report the new fan speed when changed by M106 (and others)
+#define REPORT_FAN_CHANGE   // Report the new fan speed when changed by M106 (and others)
 
 /**
  * Set the number of proportional font spaces required to fill up a typical character space.
diff --git a/Marlin/Version.h b/Marlin/Version.h
index c8d8b3b..2a5f451 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "bugfix-2.0.x"
+//#define SHORT_BUILD_VERSION "2.0.9.1"
 
 /**
  * Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-12"
+//#define STRING_DISTRIBUTION_DATE "2021-06-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index a22daf9..a5896a0 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -39,19 +39,6 @@
 #include <avr/interrupt.h>
 #include <avr/io.h>
 
-//
-// Default graphical display delays
-//
-#if F_CPU >= 20000000
-  #define CPU_ST7920_DELAY_1 150
-  #define CPU_ST7920_DELAY_2   0
-  #define CPU_ST7920_DELAY_3 150
-#elif F_CPU == 16000000
-  #define CPU_ST7920_DELAY_1 125
-  #define CPU_ST7920_DELAY_2   0
-  #define CPU_ST7920_DELAY_3 188
-#endif
-
 #ifndef pgm_read_ptr
   // Compatibility for avr-libc 1.8.0-4.1 included with Ubuntu for
   // Windows Subsystem for Linux on Windows 10 as of 10/18/2019
diff --git a/Marlin/src/HAL/AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
index 8af3ef8..70132e7 100644
--- a/Marlin/src/HAL/AVR/fastio.cpp
+++ b/Marlin/src/HAL/AVR/fastio.cpp
@@ -267,11 +267,11 @@ uint16_t set_pwm_frequency_hz(const_float_t hz, const float dca, const float dcb
     SET_WGM(5, FAST_PWM_ICRn);            // Fast PWM with ICR5 as TOP
 
     //SERIAL_ECHOLNPGM("Timer 5 Settings:");
-    //SERIAL_ECHOLNPGM("  Prescaler=", prescaler);
-    //SERIAL_ECHOLNPGM("        TOP=", ICR5);
-    //SERIAL_ECHOLNPGM("      OCR5A=", OCR5A);
-    //SERIAL_ECHOLNPGM("      OCR5B=", OCR5B);
-    //SERIAL_ECHOLNPGM("      OCR5C=", OCR5C);
+    //SERIAL_ECHOLNPAIR("  Prescaler=", prescaler);
+    //SERIAL_ECHOLNPAIR("        TOP=", ICR5);
+    //SERIAL_ECHOLNPAIR("      OCR5A=", OCR5A);
+    //SERIAL_ECHOLNPAIR("      OCR5B=", OCR5B);
+    //SERIAL_ECHOLNPAIR("      OCR5C=", OCR5C);
   }
   else {
     // Restore the default for Timer 5
diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 79809b8..51ba247 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -35,7 +35,7 @@
 /**
  * Sanity checks for Spindle / Laser PWM
  */
-#if ENABLED(SPINDLE_LASER_USE_PWM)
+#if ENABLED(SPINDLE_LASER_PWM)
   #include "../ServoTimers.h"   // Needed to check timer availability (_useTimer3)
   #if SPINDLE_LASER_PWM_PIN == 4 || WITHIN(SPINDLE_LASER_PWM_PIN, 11, 13)
     #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by a system interrupt."
@@ -43,7 +43,7 @@
     #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by the servo system."
   #endif
 #elif defined(SPINDLE_LASER_FREQUENCY)
-  #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_USE_PWM."
+  #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_PWM."
 #endif
 
 /**
diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index fcbb7af..55fddb0 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -238,9 +235,9 @@ static void print_is_also_tied() { SERIAL_ECHOPGM(" is also tied to this pin");
 
 inline void com_print(const uint8_t N, const uint8_t Z) {
   const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
-  SERIAL_ECHOPGM("    COM", AS_DIGIT(N));
+  SERIAL_ECHOPAIR("    COM", AS_CHAR('0' + N));
   SERIAL_CHAR(Z);
-  SERIAL_ECHOPGM(": ", int((*TCCRA >> (6 - Z * 2)) & 0x03));
+  SERIAL_ECHOPAIR(": ", int((*TCCRA >> (6 - Z * 2)) & 0x03));
 }
 
 void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N - WGM bit layout
@@ -250,7 +247,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
   uint8_t WGM = (((*TCCRB & _BV(WGM_2)) >> 1) | (*TCCRA & (_BV(WGM_0) | _BV(WGM_1))));
   if (N == 4) WGM |= ((*TCCRB & _BV(WGM_3)) >> 1);
 
-  SERIAL_ECHOPGM("    TIMER", AS_DIGIT(T));
+  SERIAL_ECHOPAIR("    TIMER", AS_CHAR(T + '0'));
   SERIAL_CHAR(L);
   SERIAL_ECHO_SP(3);
 
@@ -262,14 +259,14 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
     const uint16_t *OCRVAL16 = (uint16_t*)OCR_VAL(T, L - 'A');
     PWM_PRINT(*OCRVAL16);
   }
-  SERIAL_ECHOPGM("    WGM: ", WGM);
+  SERIAL_ECHOPAIR("    WGM: ", WGM);
   com_print(T,L);
-  SERIAL_ECHOPGM("    CS: ", (*TCCRB & (_BV(CS_0) | _BV(CS_1) | _BV(CS_2)) ));
-  SERIAL_ECHOPGM("    TCCR", AS_DIGIT(T), "A: ", *TCCRA);
-  SERIAL_ECHOPGM("    TCCR", AS_DIGIT(T), "B: ", *TCCRB);
+  SERIAL_ECHOPAIR("    CS: ", (*TCCRB & (_BV(CS_0) | _BV(CS_1) | _BV(CS_2)) ));
+  SERIAL_ECHOPAIR("    TCCR", AS_CHAR(T + '0'), "A: ", *TCCRA);
+  SERIAL_ECHOPAIR("    TCCR", AS_CHAR(T + '0'), "B: ", *TCCRB);
 
   const uint8_t *TMSK = (uint8_t*)TIMSK(T);
-  SERIAL_ECHOPGM("    TIMSK", AS_DIGIT(T), ": ", *TMSK);
+  SERIAL_ECHOPAIR("    TIMSK", AS_CHAR(T + '0'), ": ", *TMSK);
 
   const uint8_t OCIE = L - 'A' + 1;
   if (N == 3) { if (WGM == 0 || WGM == 2 || WGM ==  4 || WGM ==  6) err_is_counter(); }
@@ -396,4 +393,3 @@ static void pwm_details(uint8_t pin) {
 #endif
 
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
diff --git a/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
index 582ae79..051972a 100644
--- a/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/AVR/pinsDebug_plus_70.h b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
index d9aa44c..db3fdf1 100644
--- a/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index c5e8f24..d3d76e9 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -594,14 +594,18 @@
       SPI_Configure(SPI0, ID_SPI0, SPI_MR_MSTR | SPI_MR_MODFDIS | SPI_MR_PS);
       SPI_Enable(SPI0);
 
-      SET_OUTPUT(DAC0_SYNC_PIN);
+      SET_OUTPUT(DAC0_SYNC);
       #if HAS_MULTI_EXTRUDER
-        OUT_WRITE(DAC1_SYNC_PIN, HIGH);
+        SET_OUTPUT(DAC1_SYNC);
+        WRITE(DAC1_SYNC, HIGH);
       #endif
-      WRITE(DAC0_SYNC_PIN, HIGH);
-      OUT_WRITE(SPI_EEPROM1_CS_PIN, HIGH);
-      OUT_WRITE(SPI_EEPROM2_CS_PIN, HIGH);
-      OUT_WRITE(SPI_FLASH_CS_PIN, HIGH);
+      SET_OUTPUT(SPI_EEPROM1_CS);
+      SET_OUTPUT(SPI_EEPROM2_CS);
+      SET_OUTPUT(SPI_FLASH_CS);
+      WRITE(DAC0_SYNC, HIGH);
+      WRITE(SPI_EEPROM1_CS, HIGH);
+      WRITE(SPI_EEPROM2_CS, HIGH);
+      WRITE(SPI_FLASH_CS, HIGH);
       WRITE(SD_SS_PIN, HIGH);
 
       OUT_WRITE(SDSS, LOW);
diff --git a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
index 68f6a5c..fcfcef8 100644
--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+
 /**
  * Based on u8g_com_msp430_hw_spi.c
  *
diff --git a/Marlin/src/HAL/DUE/eeprom_flash.cpp b/Marlin/src/HAL/DUE/eeprom_flash.cpp
index 7ce4a84..b4cb991 100644
--- a/Marlin/src/HAL/DUE/eeprom_flash.cpp
+++ b/Marlin/src/HAL/DUE/eeprom_flash.cpp
@@ -200,9 +200,9 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     pageContents[i] = (((uint32_t*)data)[i]) | (~(pageContents[i] ^ ((uint32_t*)data)[i]));
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM PageWrite   ", page);
-  DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
-  DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
+  DEBUG_ECHOLNPAIR("EEPROM PageWrite   ", page);
+  DEBUG_ECHOLNPAIR(" in FLASH address ", (uint32_t)addrflash);
+  DEBUG_ECHOLNPAIR(" base address     ", (uint32_t)getFlashStorage(0));
   DEBUG_FLUSH();
 
   // Get the page relative to the start of the EFC controller, and the EFC controller to use
@@ -246,7 +246,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ", page);
+    DEBUG_ECHOLNPAIR("EEPROM Unlock failure for page ", page);
     return false;
   }
 
@@ -271,7 +271,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Write failure for page ", page);
+    DEBUG_ECHOLNPAIR("EEPROM Write failure for page ", page);
 
     return false;
   }
@@ -287,7 +287,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
 
     #ifdef EE_EMU_DEBUG
       DEBUG_ECHO_START();
-      DEBUG_ECHOLNPGM("EEPROM Verify Write failure for page ", page);
+      DEBUG_ECHOLNPAIR("EEPROM Verify Write failure for page ", page);
 
       ee_Dump( page, (uint32_t *)addrflash);
       ee_Dump(-page, data);
@@ -306,7 +306,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
           }
         }
       }
-      DEBUG_ECHOLNPGM("--> Differing bits: ", count);
+      DEBUG_ECHOLNPAIR("--> Differing bits: ", count);
     #endif
 
     return false;
@@ -326,9 +326,9 @@ static bool ee_PageErase(uint16_t page) {
   uint32_t addrflash = uint32_t(getFlashStorage(page));
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM PageErase  ", page);
-  DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
-  DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
+  DEBUG_ECHOLNPAIR("EEPROM PageErase  ", page);
+  DEBUG_ECHOLNPAIR(" in FLASH address ", (uint32_t)addrflash);
+  DEBUG_ECHOLNPAIR(" base address     ", (uint32_t)getFlashStorage(0));
   DEBUG_FLUSH();
 
   // Get the page relative to the start of the EFC controller, and the EFC controller to use
@@ -371,7 +371,7 @@ static bool ee_PageErase(uint16_t page) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ",page);
+    DEBUG_ECHOLNPAIR("EEPROM Unlock failure for page ",page);
 
     return false;
   }
@@ -395,7 +395,7 @@ static bool ee_PageErase(uint16_t page) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Erase failure for page ",page);
+    DEBUG_ECHOLNPAIR("EEPROM Erase failure for page ",page);
 
     return false;
   }
@@ -411,7 +411,7 @@ static bool ee_PageErase(uint16_t page) {
   for (i = 0; i < PageSize >> 2; i++) {
     if (*aligned_src++ != 0xFFFFFFFF) {
       DEBUG_ECHO_START();
-      DEBUG_ECHOLNPGM("EEPROM Verify Erase failure for page ",page);
+      DEBUG_ECHOLNPAIR("EEPROM Verify Erase failure for page ",page);
       ee_Dump(page, (uint32_t *)addrflash);
       return false;
     }
@@ -922,7 +922,7 @@ static void ee_Init() {
   if (curGroup >= GroupCount) curGroup = 0;
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM Current Group: ",curGroup);
+  DEBUG_ECHOLNPAIR("EEPROM Current Group: ",curGroup);
   DEBUG_FLUSH();
 
   // Now, validate that all the other group pages are empty
@@ -932,7 +932,7 @@ static void ee_Init() {
     for (int page = 0; page < PagesPerGroup; page++) {
       if (!ee_IsPageClean(grp * PagesPerGroup + page)) {
         DEBUG_ECHO_START();
-        DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on group ", grp);
+        DEBUG_ECHOLNPAIR("EEPROM Page ", page, " not clean on group ", grp);
         DEBUG_FLUSH();
         ee_PageErase(grp * PagesPerGroup + page);
       }
@@ -949,14 +949,14 @@ static void ee_Init() {
   }
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM Active page: ", curPage);
+  DEBUG_ECHOLNPAIR("EEPROM Active page: ", curPage);
   DEBUG_FLUSH();
 
   // Make sure the pages following the first clean one are also clean
   for (int page = curPage + 1; page < PagesPerGroup; page++) {
     if (!ee_IsPageClean(curGroup * PagesPerGroup + page)) {
       DEBUG_ECHO_START();
-      DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on active group ", curGroup);
+      DEBUG_ECHOLNPAIR("EEPROM Page ", page, " not clean on active group ", curGroup);
       DEBUG_FLUSH();
       ee_Dump(curGroup * PagesPerGroup + page, getFlashStorage(curGroup * PagesPerGroup + page));
       ee_PageErase(curGroup * PagesPerGroup + page);
diff --git a/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
index f01c53c..a99ca8e 100644
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -67,7 +64,6 @@
 #define PRINT_PORT(p)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
 #define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL ? 1 : 0)
@@ -90,7 +86,7 @@ bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
 void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     uint32_t chan = g_APinDescription[pin].ulPWMChannel;
-    SERIAL_ECHOPGM("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
+    SERIAL_ECHOPAIR("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
   }
 }
 
diff --git a/Marlin/src/HAL/ESP32/spi_pins.h b/Marlin/src/HAL/ESP32/spi_pins.h
index 58881f0..cfe71ee 100644
--- a/Marlin/src/HAL/ESP32/spi_pins.h
+++ b/Marlin/src/HAL/ESP32/spi_pins.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/ESP32/wifi.cpp b/Marlin/src/HAL/ESP32/wifi.cpp
index 060f3bd..f4cf5a6 100644
--- a/Marlin/src/HAL/ESP32/wifi.cpp
+++ b/Marlin/src/HAL/ESP32/wifi.cpp
@@ -59,7 +59,7 @@ void wifi_init() {
 
   MDNS.addService("http", "tcp", 80);
 
-  SERIAL_ECHOLNPGM("Successfully connected to WiFi with SSID '" WIFI_SSID "', hostname: '" WIFI_HOSTNAME "', IP address: ", WiFi.localIP().toString().c_str());
+  SERIAL_ECHOLNPAIR("Successfully connected to WiFi with SSID '" WIFI_SSID "', hostname: '" WIFI_HOSTNAME "', IP address: ", WiFi.localIP().toString().c_str());
 }
 
 #endif // WIFISUPPORT
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index 79639f4..36906bf 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -63,9 +63,9 @@ uint8_t _getc();
 extern MSerialT usb_serial;
 #define MYSERIAL1 usb_serial
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+#define ST7920_DELAY_1 DELAY_NS(600)
+#define ST7920_DELAY_2 DELAY_NS(750)
+#define ST7920_DELAY_3 DELAY_NS(750)
 
 //
 // Interrupts
diff --git a/Marlin/src/HAL/LINUX/inc/SanityCheck.h b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
index 36d3190..45bb266 100644
--- a/Marlin/src/HAL/LINUX/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
@@ -26,7 +26,7 @@
  */
 
 // Emulating RAMPS
-#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
   #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 #endif
 
diff --git a/Marlin/src/HAL/LINUX/main.cpp b/Marlin/src/HAL/LINUX/main.cpp
index f2af2ff..31f6de9 100644
--- a/Marlin/src/HAL/LINUX/main.cpp
+++ b/Marlin/src/HAL/LINUX/main.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #ifdef __PLAT_LINUX__
 
 //#define GPIO_LOGGING // Full GPIO and Positional Logging
diff --git a/Marlin/src/HAL/LINUX/pinsDebug.h b/Marlin/src/HAL/LINUX/pinsDebug.h
index 7bfd97d..8f8543e 100644
--- a/Marlin/src/HAL/LINUX/pinsDebug.h
+++ b/Marlin/src/HAL/LINUX/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -37,7 +34,6 @@
 #define GET_ARRAY_PIN(p)    pin_array[p].pin
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p)        do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD  16 // space needed to be pretty if not first name assigned to a pin
 
 // active ADC function/mode/code values for PINSEL registers
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index f241249..3f9cd2d 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -50,9 +50,15 @@ extern "C" volatile uint32_t _millis;
 //
 // Default graphical display delays
 //
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+#ifndef ST7920_DELAY_1
+  #define ST7920_DELAY_1 DELAY_NS(600)
+#endif
+#ifndef ST7920_DELAY_2
+  #define ST7920_DELAY_2 DELAY_NS(750)
+#endif
+#ifndef ST7920_DELAY_3
+  #define ST7920_DELAY_3 DELAY_NS(750)
+#endif
 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 extern DefaultSerial1 USBSerial;
@@ -107,7 +113,7 @@ extern DefaultSerial1 USBSerial;
     #error "LCD_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
   #endif
   #if HAS_DGUS_LCD
-    #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.available()
+    #define SERIAL_GET_TX_BUFFER_FREE() MSerial0.available()
   #endif
 #endif
 
@@ -156,17 +162,17 @@ int freeMemory();
 
 using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
 extern uint32_t HAL_adc_reading;
-[[gnu::always_inline]] inline void HAL_adc_start_conversion(const pin_t pin) {
+[[gnu::always_inline]] inline void HAL_start_adc(const pin_t pin) {
   HAL_adc_reading = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
 }
-[[gnu::always_inline]] inline uint16_t HAL_adc_get_result() {
+[[gnu::always_inline]] inline uint16_t HAL_read_adc() {
   return HAL_adc_reading;
 }
 
 #define HAL_adc_init()
 #define HAL_ANALOG_SELECT(pin) FilteredADC::enable_channel(pin)
-#define HAL_START_ADC(pin)     HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()         HAL_adc_get_result()
+#define HAL_START_ADC(pin)     HAL_start_adc(pin)
+#define HAL_READ_ADC()         HAL_read_adc()
 #define HAL_ADC_READY()        (true)
 
 // Test whether the pin is valid
diff --git a/Marlin/src/HAL/LPC1768/MarlinSerial.h b/Marlin/src/HAL/LPC1768/MarlinSerial.h
index 3e6848a..808d19f 100644
--- a/Marlin/src/HAL/LPC1768/MarlinSerial.h
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.h
@@ -46,8 +46,6 @@ public:
 
   void end() {}
 
-  uint8_t availableForWrite(void) { /* flushTX(); */ return TX_BUFFER_SIZE; }
-
   #if ENABLED(EMERGENCY_PARSER)
     bool recv_callback(const char c) override;
   #endif
diff --git a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
index 6570a59..7039525 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
@@ -1,9 +1,10 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
+ * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,19 +20,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
-/**
- * Implementation of EEPROM settings in SD Card
- */
-
 #ifdef TARGET_LPC1768
 
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-//#define DEBUG_SD_EEPROM_EMULATION
-
 #include "../shared/eeprom_api.h"
 
 #include <chanfs/diskio.h>
@@ -44,11 +38,9 @@ FATFS fat_fs;
 FIL eeprom_file;
 bool eeprom_file_open = false;
 
-#define EEPROM_FILENAME "eeprom.dat"
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(0x1000) // 4KiB of Emulated EEPROM
 #endif
-
 size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }
 
 bool PersistentStore::access_start() {
@@ -58,7 +50,7 @@ bool PersistentStore::access_start() {
     MSC_Release_Lock();
     return false;
   }
-  FRESULT res = f_open(&eeprom_file, EEPROM_FILENAME, FA_OPEN_ALWAYS | FA_WRITE | FA_READ);
+  FRESULT res = f_open(&eeprom_file, "eeprom.dat", FA_OPEN_ALWAYS | FA_WRITE | FA_READ);
   if (res) MSC_Release_Lock();
 
   if (res == FR_OK) {
@@ -89,20 +81,18 @@ bool PersistentStore::access_finish() {
 // This extra chit-chat goes away soon, but is helpful for now
 // to see errors that are happening in read_data / write_data
 static void debug_rw(const bool write, int &pos, const uint8_t *value, const size_t size, const FRESULT s, const size_t total=0) {
-  #if ENABLED(DEBUG_SD_EEPROM_EMULATION)
-    PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
-    SERIAL_CHAR(' ');
+  PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
+  SERIAL_CHAR(' ');
+  SERIAL_ECHOPGM_P(rw_str);
+  SERIAL_ECHOLNPAIR("_data(", pos, ",", value, ",", size, ", ...)");
+  if (total) {
+    SERIAL_ECHOPGM(" f_");
     SERIAL_ECHOPGM_P(rw_str);
-    SERIAL_ECHOLNPGM("_data(", pos, ",", *value, ",", size, ", ...)");
-    if (total) {
-      SERIAL_ECHOPGM(" f_");
-      SERIAL_ECHOPGM_P(rw_str);
-      SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
-      SERIAL_ECHOLNPGM_P(write ? PSTR("written=") : PSTR("read="), total);
-    }
-    else
-      SERIAL_ECHOLNPGM(" f_lseek()=", s);
-  #endif
+    SERIAL_ECHOPAIR("()=", s, "\n size=", size, "\n bytes_");
+    SERIAL_ECHOLNPAIR_P(write ? PSTR("written=") : PSTR("read="), total);
+  }
+  else
+    SERIAL_ECHOLNPAIR(" f_lseek()=", s);
 }
 
 // File function return codes for type FRESULT. This goes away soon, but
diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
index 3ea0545..23d797b 100644
--- a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -67,7 +67,7 @@ static_assert(!(NUM_SERVOS && ENABLED(FAST_PWM_FAN)), "BLTOUCH and Servos are in
  * Test LPC176x-specific configuration values for errors at compile-time.
  */
 
-//#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
 //  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 //#endif
 
diff --git a/Marlin/src/HAL/LPC1768/pinsDebug.h b/Marlin/src/HAL/LPC1768/pinsDebug.h
index a2f5c12..f805516 100644
--- a/Marlin/src/HAL/LPC1768/pinsDebug.h
+++ b/Marlin/src/HAL/LPC1768/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -36,9 +33,8 @@
 #define PRINT_PORT(p)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("P%d_%02d"), LPC176x::pin_port(p), LPC176x::pin_bit(p)); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR("_A%d     "), LPC176x::pin_get_adc_channel(pin)); SERIAL_ECHO(buffer); }while(0)
-#define MULTI_NAME_PAD 17 // space needed to be pretty if not first name assigned to a pin
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%d.%02d"), LPC176x::pin_port(p), LPC176x::pin_bit(p)); SERIAL_ECHO(buffer); }while(0)
+#define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
 
 // pins that will cause hang/reset/disconnect in M43 Toggle and Watch utilities
 #ifndef M43_NEVER_TOUCH
@@ -52,4 +48,6 @@ bool GET_PINMODE(const pin_t pin) {
   return LPC176x::gpio_direction(pin);
 }
 
-#define GET_ARRAY_IS_DIGITAL(x) ((bool) pin_array[x].is_digital)
+bool GET_ARRAY_IS_DIGITAL(const pin_t pin) {
+  return (!LPC176x::pin_has_adc(pin) || !LPC176x::pin_adc_enabled(pin));
+}
diff --git a/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp b/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
index a9847b2..a2cb66a 100644
--- a/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
@@ -26,22 +26,39 @@
 
 #include "tft_spi.h"
 
+//TFT_SPI tft;
+
 SPIClass TFT_SPI::SPIx(1);
 
+#define TFT_CS_H  WRITE(TFT_CS_PIN, HIGH)
+#define TFT_CS_L  WRITE(TFT_CS_PIN, LOW)
+
+#define TFT_DC_H  WRITE(TFT_DC_PIN, HIGH)
+#define TFT_DC_L  WRITE(TFT_DC_PIN, LOW)
+
+#define TFT_RST_H WRITE(TFT_RESET_PIN, HIGH)
+#define TFT_RST_L WRITE(TFT_RESET_PIN, LOW)
+
+#define TFT_BLK_H WRITE(TFT_BACKLIGHT_PIN, HIGH)
+#define TFT_BLK_L WRITE(TFT_BACKLIGHT_PIN, LOW)
+
 void TFT_SPI::Init() {
   #if PIN_EXISTS(TFT_RESET)
-    OUT_WRITE(TFT_RESET_PIN, HIGH);
+    SET_OUTPUT(TFT_RESET_PIN);
+    TFT_RST_H;
     delay(100);
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
+    SET_OUTPUT(TFT_BACKLIGHT_PIN);
+    TFT_BLK_H;
   #endif
 
   SET_OUTPUT(TFT_DC_PIN);
   SET_OUTPUT(TFT_CS_PIN);
-  WRITE(TFT_DC_PIN, HIGH);
-  WRITE(TFT_CS_PIN, HIGH);
+
+  TFT_DC_H;
+  TFT_CS_H;
 
   /**
    * STM32F1 APB2 = 72MHz, APB1 = 36MHz, max SPI speed of this MCU if 18Mhz
@@ -80,7 +97,7 @@ void TFT_SPI::Init() {
 void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
   SPIx.setDataSize(DataSize);
   SPIx.begin();
-  WRITE(TFT_CS_PIN, LOW);
+  TFT_CS_L;
 }
 
 uint32_t TFT_SPI::GetID() {
@@ -99,7 +116,7 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
     SPIx.setDataSize(DATASIZE_8BIT);
     SPIx.setClock(SPI_CLOCK_DIV64);
     SPIx.begin();
-    WRITE(TFT_CS_PIN, LOW);
+    TFT_CS_L;
     WriteReg(Reg);
 
     LOOP_L_N(i, 4) {
@@ -114,15 +131,21 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
   return data >> 7;
 }
 
-bool TFT_SPI::isBusy() { return false; }
+bool TFT_SPI::isBusy() {
+  return false;
+}
 
-void TFT_SPI::Abort() { DataTransferEnd(); }
+void TFT_SPI::Abort() {
+  DataTransferEnd();
+}
 
-void TFT_SPI::Transmit(uint16_t Data) { SPIx.transfer(Data); }
+void TFT_SPI::Transmit(uint16_t Data) {
+  SPIx.transfer(Data);
+}
 
 void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
-  DataTransferBegin(DATASIZE_16BIT);
-  WRITE(TFT_DC_PIN, HIGH);
+  DataTransferBegin(DATASIZE_16BIT); //16
+  TFT_DC_H;
   SPIx.dmaSend(Data, Count, MemoryIncrease);
   DataTransferEnd();
 }
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 235c248..d5c5782 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -99,9 +99,9 @@ extern MSerialT serial_stream_3;
 #endif
 
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+#define ST7920_DELAY_1 DELAY_NS(600)
+#define ST7920_DELAY_2 DELAY_NS(750)
+#define ST7920_DELAY_3 DELAY_NS(750)
 
 //
 // Interrupts
diff --git a/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h b/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
index 2d7bef2..104af9a 100644
--- a/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
+++ b/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
@@ -26,7 +26,7 @@
  */
 
 // Emulating RAMPS
-#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
   #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 #endif
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
index aa90eb3..7ba1457 100644
--- a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
+++ b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
@@ -20,6 +20,7 @@
 /**
  * Support routines for X86_64
  */
+
 #pragma once
 
 /**
@@ -35,7 +36,6 @@
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
 
 // active ADC function/mode/code values for PINSEL registers
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.h b/Marlin/src/HAL/SAMD51/QSPIFlash.h
index 58822fe..db4abec 100644
--- a/Marlin/src/HAL/SAMD51/QSPIFlash.h
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.h
@@ -25,6 +25,7 @@
  *
  * Derived from Adafruit_SPIFlash class with no SdFat references
  */
+
 #pragma once
 
 #include <Adafruit_SPIFlashBase.h>
diff --git a/Marlin/src/HAL/SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
index f0a46fd..81376db 100644
--- a/Marlin/src/HAL/SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/SAMD51/pinsDebug.h
@@ -26,7 +26,6 @@
 #define PRINT_PORT(p) do{ SERIAL_ECHOPGM("  Port: "); sprintf_P(buffer, PSTR("%c%02ld"), 'A' + g_APinDescription[p].ulPort, g_APinDescription[p].ulPin); SERIAL_ECHO(buffer); }while (0)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
 #define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL)
@@ -48,7 +47,7 @@ bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
 void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     //uint32_t chan = g_APinDescription[pin].ulPWMChannel TODO when fast pwm is operative;
-    //SERIAL_ECHOPGM("PWM = ", duty);
+    //SERIAL_ECHOPAIR("PWM = ", duty);
   }
 }
 
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index a68e8a8..02bee57 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -37,13 +37,6 @@
 
 #include <stdint.h>
 
-//
-// Default graphical display delays
-//
-#define CPU_ST7920_DELAY_1 300
-#define CPU_ST7920_DELAY_2  40
-#define CPU_ST7920_DELAY_3 340
-
 //
 // Serial Ports
 //
@@ -183,13 +176,8 @@ static inline int freeMemory() {
 
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
 
-#ifdef ADC_RESOLUTION
-  #define HAL_ADC_RESOLUTION ADC_RESOLUTION
-#else
-  #define HAL_ADC_RESOLUTION 12
-#endif
-
 #define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  ADC_RESOLUTION // 12
 #define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
 #define HAL_READ_ADC()      HAL_adc_result
 #define HAL_ADC_READY()     true
diff --git a/Marlin/src/HAL/STM32/MarlinSPI.cpp b/Marlin/src/HAL/STM32/MarlinSPI.cpp
index 7078d21..e1be508 100644
--- a/Marlin/src/HAL/STM32/MarlinSPI.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSPI.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #if defined(HAL_STM32) && !defined(STM32H7xx)
diff --git a/Marlin/src/HAL/STM32/MarlinSerial.cpp b/Marlin/src/HAL/STM32/MarlinSerial.cpp
index 37a8f40..3caedc7 100644
--- a/Marlin/src/HAL/STM32/MarlinSerial.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSerial.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/MarlinSerial.h b/Marlin/src/HAL/STM32/MarlinSerial.h
index bf861fb..ab5c426 100644
--- a/Marlin/src/HAL/STM32/MarlinSerial.h
+++ b/Marlin/src/HAL/STM32/MarlinSerial.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
index 54e1820..914969f 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
index f30b3de..5bd4c18 100644
--- a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 252b057..e785e59 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -133,7 +133,7 @@ bool PersistentStore::access_start() {
         // load current settings
         uint8_t *eeprom_data = (uint8_t *)SLOT_ADDRESS(current_slot);
         for (int i = 0; i < MARLIN_EEPROM_SIZE; i++) ram_eeprom[i] = eeprom_data[i];
-        DEBUG_ECHOLNPGM("EEPROM loaded from slot ", current_slot, ".");
+        DEBUG_ECHOLNPAIR("EEPROM loaded from slot ", current_slot, ".");
       }
       eeprom_data_written = false;
     }
@@ -179,9 +179,9 @@ bool PersistentStore::access_finish() {
         ENABLE_ISRS();
         TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
         if (status != HAL_OK) {
-          DEBUG_ECHOLNPGM("HAL_FLASHEx_Erase=", status);
-          DEBUG_ECHOLNPGM("GetError=", HAL_FLASH_GetError());
-          DEBUG_ECHOLNPGM("SectorError=", SectorError);
+          DEBUG_ECHOLNPAIR("HAL_FLASHEx_Erase=", status);
+          DEBUG_ECHOLNPAIR("GetError=", HAL_FLASH_GetError());
+          DEBUG_ECHOLNPAIR("SectorError=", SectorError);
           LOCK_FLASH();
           return false;
         }
@@ -204,9 +204,9 @@ bool PersistentStore::access_finish() {
           offset += sizeof(uint32_t);
         }
         else {
-          DEBUG_ECHOLNPGM("HAL_FLASH_Program=", status);
-          DEBUG_ECHOLNPGM("GetError=", HAL_FLASH_GetError());
-          DEBUG_ECHOLNPGM("address=", address);
+          DEBUG_ECHOLNPAIR("HAL_FLASH_Program=", status);
+          DEBUG_ECHOLNPAIR("GetError=", HAL_FLASH_GetError());
+          DEBUG_ECHOLNPAIR("address=", address);
           success = false;
           break;
         }
@@ -216,7 +216,7 @@ bool PersistentStore::access_finish() {
 
       if (success) {
         eeprom_data_written = false;
-        DEBUG_ECHOLNPGM("EEPROM saved to slot ", current_slot, ".");
+        DEBUG_ECHOLNPAIR("EEPROM saved to slot ", current_slot, ".");
       }
 
       return success;
diff --git a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
index ad8712c..26b3d90 100644
--- a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
index 473b656..77563b2 100644
--- a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 917e126..a8fcbe5 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
index 7bd7eee..12ff2ab 100644
--- a/Marlin/src/HAL/STM32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32/inc/SanityCheck.h
@@ -24,7 +24,7 @@
 /**
  * Test STM32-specific configuration values for errors at compile-time.
  */
-//#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
 //  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 //#endif
 
@@ -39,7 +39,7 @@
 
 #if defined(STM32F4xx) && BOTH(PRINTCOUNTER, FLASH_EEPROM_EMULATION)
   #warning "FLASH_EEPROM_EMULATION may cause long delays when writing and should not be used while printing."
-  //#error "Disable PRINTCOUNTER or choose another EEPROM emulation."
+  #error "Disable PRINTCOUNTER or choose another EEPROM emulation."
 #endif
 
 #if !defined(STM32F4xx) && ENABLED(FLASH_EEPROM_LEVELING)
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index 73d850f..048f788 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -112,7 +109,6 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define VALID_PIN(ANUM) ((ANUM) >= 0 && (ANUM) < NUMBER_PINS_TOTAL)
 #define digitalRead_mod(Ard_num) extDigitalRead(Ard_num)  // must use Arduino pin numbers when doing reads
 #define PRINT_PIN(Q)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PORT(ANUM) port_print(ANUM)
 #define DIGITAL_PIN_TO_ANALOG_PIN(ANUM) -1  // will report analog pin number in the print port routine
 #define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
@@ -240,7 +236,7 @@ void pwm_details(const pin_t Ard_num) {
       if (over_7) pin_number -= 8;
 
       uint8_t alt_func = (alt_all >> (4 * pin_number)) & 0x0F;
-      SERIAL_ECHOPGM("Alt Function: ", alt_func);
+      SERIAL_ECHOPAIR("Alt Function: ", alt_func);
       if (alt_func < 10) SERIAL_CHAR(' ');
       SERIAL_ECHOPGM(" - ");
       switch (alt_func) {
diff --git a/Marlin/src/HAL/STM32/spi_pins.h b/Marlin/src/HAL/STM32/spi_pins.h
index 7f341a8..e2052c5 100644
--- a/Marlin/src/HAL/STM32/spi_pins.h
+++ b/Marlin/src/HAL/STM32/spi_pins.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
index e68b3c1..dacf533 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index 66cfd65..0549dbf 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -183,7 +183,7 @@ void LTDC_Config() {
   hltdc_F.Init.AccumulatedVBP = (LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
   hltdc_F.Init.AccumulatedActiveH = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
   hltdc_F.Init.AccumulatedActiveW = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP - 1);
-  hltdc_F.Init.TotalHeigh = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
+  hltdc_F.Init.TotalHeight = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
   hltdc_F.Init.TotalWidth = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP + LTDC_LCD_HFP - 1);
 
   /* Configure R,G,B component values for LCD background color : all black background */
@@ -205,7 +205,7 @@ void LTDC_Config() {
   pLayerCfg.PixelFormat = LTDC_PIXEL_FORMAT_RGB565;
 
   /* Start Address configuration : frame buffer is located at SDRAM memory */
-  pLayerCfg.FBStartAdress = (uint32_t)(FRAME_BUFFER_ADDRESS);
+  pLayerCfg.FBStartAddress = (uint32_t)(FRAME_BUFFER_ADDRESS);
 
   /* Alpha constant (255 == totally opaque) */
   pLayerCfg.Alpha = 255;
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 790513e..29a309f 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.cpp b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
index cf4a8f1..912e6c2 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/usb_host.cpp b/Marlin/src/HAL/STM32/usb_host.cpp
index d77f0b2..d2d1d69 100644
--- a/Marlin/src/HAL/STM32/usb_host.cpp
+++ b/Marlin/src/HAL/STM32/usb_host.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
@@ -89,9 +88,9 @@ void USBHost::setUsbTaskState(uint8_t state) {
     capacity = info.capacity.block_nbr / 2000;
     block_size = info.capacity.block_size;
     block_count = info.capacity.block_nbr;
-    //SERIAL_ECHOLNPGM("info.capacity.block_nbr : %ld\n", info.capacity.block_nbr);
-    //SERIAL_ECHOLNPGM("info.capacity.block_size: %d\n", info.capacity.block_size);
-    //SERIAL_ECHOLNPGM("capacity                : %d MB\n", capacity);
+    // SERIAL_ECHOLNPAIR("info.capacity.block_nbr : %ld\n", info.capacity.block_nbr);
+    // SERIAL_ECHOLNPAIR("info.capacity.block_size: %d\n", info.capacity.block_size);
+    // SERIAL_ECHOLNPAIR("capacity                : %d MB\n", capacity);
   }
 };
 
diff --git a/Marlin/src/HAL/STM32/usb_serial.cpp b/Marlin/src/HAL/STM32/usb_serial.cpp
index b607275..959ca4f 100644
--- a/Marlin/src/HAL/STM32/usb_serial.cpp
+++ b/Marlin/src/HAL/STM32/usb_serial.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/usb_serial.h b/Marlin/src/HAL/STM32/usb_serial.h
index 3edb6fd..ca61b9e 100644
--- a/Marlin/src/HAL/STM32/usb_serial.h
+++ b/Marlin/src/HAL/STM32/usb_serial.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
index 1eccdec..72c74a2 100644
--- a/Marlin/src/HAL/STM32/watchdog.cpp
+++ b/Marlin/src/HAL/STM32/watchdog.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index df1ba33..7301494 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -437,7 +437,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
       case POWER_MONITOR_VOLTAGE_PIN: pin_index = POWERMON_VOLTS; break;
     #endif
   }
-  HAL_adc_result = HAL_adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
+  HAL_adc_result = (HAL_adc_results[(int)pin_index] >> 2) & 0x3FF; // shift to get 10 bits only.
 }
 
 uint16_t HAL_adc_get_result() { return HAL_adc_result; }
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 3bdfb97..b3d8dc9 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -51,13 +51,6 @@
 // Defines
 // ------------------------
 
-//
-// Default graphical display delays
-//
-#define CPU_ST7920_DELAY_1 300
-#define CPU_ST7920_DELAY_2  40
-#define CPU_ST7920_DELAY_3 340
-
 #ifndef STM32_FLASH_SIZE
   #if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)
     #define STM32_FLASH_SIZE 512
@@ -237,13 +230,8 @@ static inline int freeMemory() {
 
 void HAL_adc_init();
 
-#ifdef ADC_RESOLUTION
-  #define HAL_ADC_RESOLUTION ADC_RESOLUTION
-#else
-  #define HAL_ADC_RESOLUTION 12
-#endif
-
 #define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
 #define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
 #define HAL_READ_ADC()      HAL_adc_result
 #define HAL_ADC_READY()     true
diff --git a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
index 26ea1ea..f1cd6b3 100644
--- a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #ifdef __STM32F1__
 
 #include "../../../inc/MarlinConfig.h"
diff --git a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp b/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
index bc48eef..0ad6906 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -47,7 +44,7 @@ bool PersistentStore::access_start() {
       SET_OUTPUT(BOARD_SPI1_SCK_PIN);
       SET_OUTPUT(BOARD_SPI1_MOSI_PIN);
       SET_INPUT(BOARD_SPI1_MISO_PIN);
-      SET_OUTPUT(SPI_EEPROM1_CS_PIN);
+      SET_OUTPUT(SPI_EEPROM1_CS);
     #endif
     spiInit(0);
   #endif
diff --git a/Marlin/src/HAL/STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
index df98c2c..e269471 100644
--- a/Marlin/src/HAL/STM32F1/onboard_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
@@ -158,7 +158,7 @@ static void sd_power_on() {
   ONBOARD_SD_SPI.begin();
   ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
   ONBOARD_SD_SPI.setDataMode(SPI_MODE0);
-  CS_HIGH();
+  OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); // Set CS# high
 }
 
 // Disable SPI function
diff --git a/Marlin/src/HAL/STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
index 27f4b67..b018a0f 100644
--- a/Marlin/src/HAL/STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -44,7 +41,6 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS];
 #define pwm_status(pin) PWM_PIN(pin)
 #define digitalRead_mod(p) extDigitalRead(p)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3hd "), int16_t(p)); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PORT(p) print_port(p)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 21 // space needed to be pretty if not first name assigned to a pin
diff --git a/Marlin/src/HAL/STM32F1/spi_pins.h b/Marlin/src/HAL/STM32F1/spi_pins.h
index 3d3c8f8..7d650ff 100644
--- a/Marlin/src/HAL/STM32F1/spi_pins.h
+++ b/Marlin/src/HAL/STM32F1/spi_pins.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
index 9bf6bbb..5edf96f 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
@@ -26,20 +26,36 @@
 
 #include "tft_spi.h"
 
+// TFT_SPI tft;
+
 SPIClass TFT_SPI::SPIx(1);
 
+#define TFT_CS_H  OUT_WRITE(TFT_CS_PIN, HIGH)
+#define TFT_CS_L  OUT_WRITE(TFT_CS_PIN, LOW)
+
+#define TFT_DC_H  OUT_WRITE(TFT_DC_PIN, HIGH)
+#define TFT_DC_L  OUT_WRITE(TFT_DC_PIN, LOW)
+
+#define TFT_RST_H OUT_WRITE(TFT_RST_PIN, HIGH)
+#define TFT_RST_L OUT_WRITE(TFT_RST_PIN, LOW)
+
+#define TFT_BLK_H OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH)
+#define TFT_BLK_L OUT_WRITE(TFT_BACKLIGHT_PIN, LOW)
+
 void TFT_SPI::Init() {
   #if PIN_EXISTS(TFT_RESET)
-    OUT_WRITE(TFT_RST_PIN, HIGH);
+    // OUT_WRITE(TFT_RESET_PIN, HIGH);
+    TFT_RST_H;
     delay(100);
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
+    // OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
+    TFT_BLK_H;
   #endif
 
-  OUT_WRITE(TFT_DC_PIN, HIGH);
-  OUT_WRITE(TFT_CS_PIN, HIGH);
+  TFT_DC_H;
+  TFT_CS_H;
 
   /**
    * STM32F1 APB2 = 72MHz, APB1 = 36MHz, max SPI speed of this MCU if 18Mhz
@@ -71,7 +87,7 @@ void TFT_SPI::Init() {
 void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
   SPIx.setDataSize(DataSize);
   SPIx.begin();
-  OUT_WRITE(TFT_CS_PIN, LOW);
+  TFT_CS_L;
 }
 
 #ifdef TFT_DEFAULT_DRIVER
@@ -113,16 +129,28 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
   #endif
 }
 
-bool TFT_SPI::isBusy() { return false; }
+bool TFT_SPI::isBusy() {
+  return false;
+}
 
-void TFT_SPI::Abort() { DataTransferEnd(); }
+void TFT_SPI::Abort() {
+  DataTransferEnd();
+}
 
-void TFT_SPI::Transmit(uint16_t Data) { SPIx.send(Data); }
+void TFT_SPI::Transmit(uint16_t Data) {
+  SPIx.send(Data);
+}
 
 void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
   DataTransferBegin();
-  OUT_WRITE(TFT_DC_PIN, HIGH);
-  SPIx.dmaSend(Data, Count, MemoryIncrease == DMA_MINC_ENABLE);
+  TFT_DC_H;
+  if (MemoryIncrease == DMA_MINC_ENABLE) {
+    SPIx.dmaSend(Data, Count, true);
+  }
+  else {
+    SPIx.dmaSend(Data, Count, false);
+  }
+
   DataTransferEnd();
 }
 
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index aa19584..8baa793 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -36,9 +36,9 @@
 
 #include <stdint.h>
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+#define ST7920_DELAY_1 DELAY_NS(600)
+#define ST7920_DELAY_2 DELAY_NS(750)
+#define ST7920_DELAY_3 DELAY_NS(750)
 
 //#undef MOTHERBOARD
 //#define MOTHERBOARD BOARD_TEENSY31_32
diff --git a/Marlin/src/HAL/TEENSY31_32/eeprom.cpp b/Marlin/src/HAL/TEENSY31_32/eeprom.cpp
index d1ff940..85febeb 100644
--- a/Marlin/src/HAL/TEENSY31_32/eeprom.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/eeprom.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #ifdef __MK20DX256__
 
 /**
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 0093294..26c3522 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -37,9 +37,9 @@
 #include <stdint.h>
 #include <util/atomic.h>
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+#define ST7920_DELAY_1 DELAY_NS(600)
+#define ST7920_DELAY_2 DELAY_NS(750)
+#define ST7920_DELAY_3 DELAY_NS(750)
 
 // ------------------------
 // Defines
diff --git a/Marlin/src/HAL/TEENSY35_36/pinsDebug.h b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
index 7a2e1d6..e529fa9 100644
--- a/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
+++ b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index ea51f15..1d00447 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -41,9 +41,9 @@
   #include "../../feature/ethernet.h"
 #endif
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+//#define ST7920_DELAY_1 DELAY_NS(600)
+//#define ST7920_DELAY_2 DELAY_NS(750)
+//#define ST7920_DELAY_3 DELAY_NS(750)
 
 // ------------------------
 // Defines
diff --git a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
index 94b85ea..4ad62d0 100644
--- a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
+++ b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -33,7 +30,6 @@
 #define PRINT_PORT(p)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
 #define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL ? 1 : 0)
diff --git a/Marlin/src/HAL/shared/Delay.cpp b/Marlin/src/HAL/shared/Delay.cpp
index 32543c6..129698f 100644
--- a/Marlin/src/HAL/shared/Delay.cpp
+++ b/Marlin/src/HAL/shared/Delay.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "Delay.h"
 
 #include "../../inc/MarlinConfig.h"
@@ -111,16 +110,16 @@
       auto report_call_time = [](PGM_P const name, PGM_P const unit, const uint32_t cycles, const uint32_t total, const bool do_flush=true) {
         SERIAL_ECHOPGM("Calling ");
         SERIAL_ECHOPGM_P(name);
-        SERIAL_ECHOLNPGM(" for ", cycles);
+        SERIAL_ECHOLNPAIR(" for ", cycles);
         SERIAL_ECHOPGM_P(unit);
-        SERIAL_ECHOLNPGM(" took: ", total);
+        SERIAL_ECHOLNPAIR(" took: ", total);
         SERIAL_ECHOPGM_P(unit);
         if (do_flush) SERIAL_FLUSHTX();
       };
 
       uint32_t s, e;
 
-      SERIAL_ECHOLNPGM("Computed delay calibration value: ", ASM_CYCLES_PER_ITERATION);
+      SERIAL_ECHOLNPAIR("Computed delay calibration value: ", ASM_CYCLES_PER_ITERATION);
       SERIAL_FLUSH();
       // Display the results of the calibration above
       constexpr uint32_t testValues[] = { 1, 5, 10, 20, 50, 100, 150, 200, 350, 500, 750, 1000 };
diff --git a/Marlin/src/HAL/shared/eeprom_if_spi.cpp b/Marlin/src/HAL/shared/eeprom_if_spi.cpp
index 72c35ad..6aa6e09 100644
--- a/Marlin/src/HAL/shared/eeprom_if_spi.cpp
+++ b/Marlin/src/HAL/shared/eeprom_if_spi.cpp
@@ -49,8 +49,8 @@ static void _eeprom_begin(uint8_t * const pos, const uint8_t cmd) {
     (unsigned(pos) >> 8) & 0xFF,  // Address High
      unsigned(pos)       & 0xFF   // Address Low
   };
-  WRITE(SPI_EEPROM1_CS_PIN, HIGH);    // Usually free already
-  WRITE(SPI_EEPROM1_CS_PIN, LOW);     // Activate the Bus
+  WRITE(SPI_EEPROM1_CS, HIGH);    // Usually free already
+  WRITE(SPI_EEPROM1_CS, LOW);     // Activate the Bus
   spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 3);
                                   // Leave the Bus in-use
 }
@@ -60,23 +60,23 @@ uint8_t eeprom_read_byte(uint8_t *pos) {
 
   const uint8_t v = spiRec(SPI_CHAN_EEPROM1); // After READ a value sits on the Bus
 
-  WRITE(SPI_EEPROM1_CS_PIN, HIGH);    // Done with device
+  WRITE(SPI_EEPROM1_CS, HIGH);    // Done with device
 
   return v;
 }
 
 void eeprom_write_byte(uint8_t *pos, uint8_t value) {
   const uint8_t eeprom_temp = CMD_WREN;
-  WRITE(SPI_EEPROM1_CS_PIN, LOW);
+  WRITE(SPI_EEPROM1_CS, LOW);
   spiSend(SPI_CHAN_EEPROM1, &eeprom_temp, 1); // Write Enable
 
-  WRITE(SPI_EEPROM1_CS_PIN, HIGH);      // Done with the Bus
+  WRITE(SPI_EEPROM1_CS, HIGH);      // Done with the Bus
   delay(1);                         // For a small amount of time
 
   _eeprom_begin(pos, CMD_WRITE);    // Set write address and begin transmission
 
   spiSend(SPI_CHAN_EEPROM1, value); // Send the value to be written
-  WRITE(SPI_EEPROM1_CS_PIN, HIGH);      // Done with the Bus
+  WRITE(SPI_EEPROM1_CS, HIGH);      // Done with the Bus
   delay(EEPROM_WRITE_DELAY);        // Give page write time to complete
 }
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 147853e..acb7e9c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -30,6 +30,10 @@
 
 #include "MarlinCore.h"
 
+#if ENABLED(MARLIN_DEV_MODE)
+  #warning "WARNING! Disable MARLIN_DEV_MODE for the final build!"
+#endif
+
 #include "HAL/shared/Delay.h"
 #include "HAL/shared/esp_wifi.h"
 #include "HAL/shared/cpu_exception/exception_hook.h"
@@ -70,15 +74,9 @@
   #include <lvgl.h>
 #endif
 
-#if HAS_DWIN_E3V2
-  #include "lcd/e3v2/common/encoder.h"
-  #if ENABLED(DWIN_CREALITY_LCD)
-    #include "lcd/e3v2/creality/dwin.h"
-  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-    #include "lcd/e3v2/enhanced/dwin.h"
-  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    #include "lcd/e3v2/jyersui/dwin.h"
-  #endif
+#if ENABLED(DWIN_CREALITY_LCD)
+  #include "lcd/e3v2/creality/dwin.h"
+  #include "lcd/e3v2/creality/rotary_encoder.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
@@ -238,10 +236,6 @@
   #include "feature/stepper_driver_safety.h"
 #endif
 
-#if ENABLED(PSU_CONTROL)
-  #include "feature/power.h"
-#endif
-
 PGMSTR(M112_KILL_STR, "M112 Shutdown");
 
 MarlinState marlin_state = MF_INITIALIZING;
@@ -538,7 +532,6 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
           next_cub_ms_##N = ms + CUB_DEBOUNCE_DELAY_##N;               \
           CODE;                                                        \
           queue.inject_P(PSTR(BUTTON##N##_GCODE));                     \
-          TERN_(HAS_LCD_MENU, ui.quick_feedback());                    \
         }                                                              \
       }                                                                \
     }while(0)
@@ -795,7 +788,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
 void idle(bool no_stepper_sleep/*=false*/) {
   #if ENABLED(MARLIN_DEV_MODE)
     static uint16_t idle_depth = 0;
-    if (++idle_depth > 5) SERIAL_ECHOLNPGM("idle() call depth: ", idle_depth);
+    if (++idle_depth > 5) SERIAL_ECHOLNPAIR("idle() call depth: ", idle_depth);
   #endif
 
   // Core Marlin activities
@@ -849,7 +842,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   TERN_(USE_BEEPER, buzzer.tick());
 
   // Handle UI input / draw events
-  TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
+  TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
 
   // Run i2c Position Encoders
   #if ENABLED(I2C_POSITION_ENCODERS)
@@ -871,7 +864,6 @@ void idle(bool no_stepper_sleep/*=false*/) {
       TERN_(AUTO_REPORT_TEMPERATURES, thermalManager.auto_reporter.tick());
       TERN_(AUTO_REPORT_SD_STATUS, card.auto_reporter.tick());
       TERN_(AUTO_REPORT_POSITION, position_auto_reporter.tick());
-      TERN_(BUFFER_MONITORING, queue.auto_report_buffer_statistics());
     }
   #endif
 
@@ -904,7 +896,7 @@ void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr
   // Echo the LCD message to serial for extra context
   if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNPGM_P(lcd_error); }
 
-  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
+  #if HAS_DISPLAY
     ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
   #else
     UNUSED(lcd_error); UNUSED(lcd_component);
@@ -940,7 +932,7 @@ void minkill(const bool steppers_off/*=false*/) {
   // Power off all steppers (for M112) or just the E steppers
   steppers_off ? disable_all_steppers() : disable_e_steppers();
 
-  TERN_(PSU_CONTROL, powerManager.power_off());
+  TERN_(PSU_CONTROL, PSU_OFF());
 
   TERN_(HAS_SUICIDE, suicide());
 
@@ -1195,7 +1187,7 @@ void setup() {
 
   #if HAS_SUICIDE
     SETUP_LOG("SUICIDE_PIN");
-    OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
+    OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
   #endif
 
   #ifdef JTAGSWD_RESET
@@ -1222,10 +1214,10 @@ void setup() {
   SETUP_RUN(HAL_init());
 
   // Init and disable SPI thermocouples; this is still needed
-  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0))
+  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
     OUT_WRITE(TEMP_0_CS_PIN, HIGH);  // Disable
   #endif
-  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
+  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
     OUT_WRITE(TEMP_1_CS_PIN, HIGH);
   #endif
 
@@ -1243,7 +1235,8 @@ void setup() {
 
   #if ENABLED(PSU_CONTROL)
     SETUP_LOG("PSU_CONTROL");
-    powerManager.init();
+    powersupply_on = ENABLED(PSU_DEFAULT_OFF);
+    if (ENABLED(PSU_DEFAULT_OFF)) PSU_OFF(); else PSU_ON();
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
@@ -1282,13 +1275,14 @@ void setup() {
   HAL_clear_reset_source();
 
   SERIAL_ECHOLNPGM("Marlin " SHORT_BUILD_VERSION);
+  SERIAL_EOL();
   #if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR)
     SERIAL_ECHO_MSG(
       " Last Updated: " STRING_DISTRIBUTION_DATE
       " | Author: " STRING_CONFIG_H_AUTHOR
     );
   #endif
-  SERIAL_ECHO_MSG(" Compiled: " __DATE__);
+  SERIAL_ECHO_MSG("Compiled: " __DATE__);
   SERIAL_ECHO_MSG(STR_FREE_MEMORY, freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
 
   // Some HAL need precise delay adjustment
@@ -1315,7 +1309,7 @@ void setup() {
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
 
-  #if HAS_DWIN_E3V2_BASIC
+  #if ENABLED(DWIN_CREALITY_LCD)
     SETUP_RUN(DWIN_Startup());
   #else
     SETUP_RUN(ui.init());
@@ -1351,7 +1345,7 @@ void setup() {
   #endif
 
   #if HAS_TOUCH_BUTTONS
-    SETUP_RUN(touchBt.init());
+    SETUP_RUN(touch.init());
   #endif
 
   TERN_(HAS_M206_COMMAND, current_position += home_offset); // Init current position based on home_offset
@@ -1590,7 +1584,7 @@ void setup() {
     SERIAL_ECHO_TERNARY(err, "BL24CXX Check ", "failed", "succeeded", "!\n");
   #endif
 
-  #if HAS_DWIN_E3V2_BASIC
+  #if ENABLED(DWIN_CREALITY_LCD)
     Encoder_Configuration();
     HMI_Init();
     HMI_SetLanguageCache();
@@ -1598,7 +1592,7 @@ void setup() {
     DWIN_StatusChanged_P(GET_TEXT(WELCOME_MSG));
   #endif
 
-  #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
+  #if HAS_SERVICE_INTERVALS && DISABLED(DWIN_CREALITY_LCD)
     ui.reset_status(true);  // Show service messages or keep current status
   #endif
 
@@ -1620,7 +1614,7 @@ void setup() {
   #if BOTH(HAS_WIRED_LCD, SHOW_BOOTSCREEN)
     const millis_t elapsed = millis() - bootscreen_ms;
     #if ENABLED(MARLIN_DEV_MODE)
-      SERIAL_ECHOLNPGM("elapsed=", elapsed);
+      SERIAL_ECHOLNPAIR("elapsed=", elapsed);
     #endif
     SETUP_RUN(ui.bootscreen_completion(elapsed));
   #endif
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 6428b77..243811d 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -23,6 +23,10 @@
 
 #include "inc/MarlinConfig.h"
 
+#ifdef DEBUG_GCODE_PARSER
+  #include "gcode/parser.h"
+#endif
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -77,10 +81,29 @@ extern bool wait_for_heatup;
   void wait_for_user_response(millis_t ms=0, const bool no_sleep=false);
 #endif
 
+#if ENABLED(PSU_CONTROL)
+  extern bool powersupply_on;
+  #define PSU_PIN_ON()  do{ OUT_WRITE(PS_ON_PIN,  PSU_ACTIVE_STATE); powersupply_on = true;  }while(0)
+  #define PSU_PIN_OFF() do{ OUT_WRITE(PS_ON_PIN, !PSU_ACTIVE_STATE); powersupply_on = false; }while(0)
+  #if ENABLED(AUTO_POWER_CONTROL)
+    #define PSU_ON()       powerManager.power_on()
+    #define PSU_OFF()      powerManager.power_off()
+    #define PSU_OFF_SOON() powerManager.power_off_soon()
+  #else
+    #define PSU_ON()     PSU_PIN_ON()
+    #if ENABLED(PS_OFF_SOUND)
+      #define PSU_OFF()  do{ BUZZ(1000, 659); PSU_PIN_OFF(); }while(0)
+    #else
+      #define PSU_OFF()  PSU_PIN_OFF()
+    #endif
+    #define PSU_OFF_SOON PSU_OFF
+  #endif
+#endif
+
 bool pin_is_protected(const pin_t pin);
 
 #if HAS_SUICIDE
-  inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_STATE); }
+  inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_INVERTING); }
 #endif
 
 #if HAS_KILL
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 46b2e5c..2ed5859 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -149,10 +149,10 @@
 #define BOARD_GT2560_REV_A            1314  // Geeetech GT2560 Rev A
 #define BOARD_GT2560_REV_A_PLUS       1315  // Geeetech GT2560 Rev A+ (with auto level probe)
 #define BOARD_GT2560_REV_B            1316  // Geeetech GT2560 Rev B
-#define BOARD_GT2560_V3               1317  // Geeetech GT2560 Rev B for A10(M/T/D)
-#define BOARD_GT2560_V4               1318  // Geeetech GT2560 Rev B for A10(M/T/D)
+#define BOARD_GT2560_V3               1317  // Geeetech GT2560 Rev B for A10(M/D)
+#define BOARD_GT2560_V4               1318  // Geeetech GT2560 Rev B for A10(M/D)
 #define BOARD_GT2560_V3_MC2           1319  // Geeetech GT2560 Rev B for Mecreator2
-#define BOARD_GT2560_V3_A20           1320  // Geeetech GT2560 Rev B for A20(M/T/D)
+#define BOARD_GT2560_V3_A20           1320  // Geeetech GT2560 Rev B for A20(M/D)
 #define BOARD_EINSTART_S              1321  // Einstart retrofit
 #define BOARD_WANHAO_ONEPLUS          1322  // Wanhao 0ne+ i3 Mini
 #define BOARD_LEAPFROG_XEED2015       1323  // Leapfrog Xeed 2015
@@ -160,8 +160,6 @@
 #define BOARD_PICA                    1325  // PICA Shield (rev C or later)
 #define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
 #define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
-#define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
-#define BOARD_PROTONEER_CNC_SHIELD_V3 1329  // Mega controller & Protoneer CNC Shield V3.00
 
 //
 // ATmega1281, ATmega2561
@@ -340,21 +338,17 @@
 #define BOARD_CREALITY_V427           4040  // Creality v4.2.7 (STM32F103RE)
 #define BOARD_CREALITY_V4210          4041  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
 #define BOARD_CREALITY_V431           4042  // Creality v4.3.1 (STM32F103RE)
-#define BOARD_CREALITY_V431_A         4043  // Creality v4.3.1a (STM32F103RE)
-#define BOARD_CREALITY_V431_B         4044  // Creality v4.3.1b (STM32F103RE)
-#define BOARD_CREALITY_V431_C         4045  // Creality v4.3.1c (STM32F103RE)
-#define BOARD_CREALITY_V431_D         4046  // Creality v4.3.1d (STM32F103RE)
-#define BOARD_CREALITY_V452           4047  // Creality v4.5.2 (STM32F103RE)
-#define BOARD_CREALITY_V453           4048  // Creality v4.5.3 (STM32F103RE)
-#define BOARD_TRIGORILLA_PRO          4049  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4050  // FLYmaker FLY MINI (STM32F103RCT6)
-#define BOARD_FLSUN_HISPEED           4051  // FLSUN HiSpeedV1 (STM32F103VET6)
-#define BOARD_BEAST                   4052  // STM32F103RET6 Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4053  // STM32F103ZET6 Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4054  // STM32F103VET6 controller
-#define BOARD_ZONESTAR_ZM3E2          4055  // Zonestar ZM3E2    (STM32F103RCT6)
-#define BOARD_ZONESTAR_ZM3E4          4056  // Zonestar ZM3E4 V1 (STM32F103VCT6)
-#define BOARD_ZONESTAR_ZM3E4V2        4057  // Zonestar ZM3E4 V2 (STM32F103VCT6)
+#define BOARD_CREALITY_V452           4043  // Creality v4.5.2 (STM32F103RE)
+#define BOARD_CREALITY_V453           4044  // Creality v4.5.3 (STM32F103RE)
+#define BOARD_TRIGORILLA_PRO          4045  // Trigorilla Pro (STM32F103ZET6)
+#define BOARD_FLY_MINI                4046  // FLYmaker FLY MINI (STM32F103RCT6)
+#define BOARD_FLSUN_HISPEED           4047  // FLSUN HiSpeedV1 (STM32F103VET6)
+#define BOARD_BEAST                   4048  // STM32F103RET6 Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4049  // STM32F103ZET6 Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4050  // STM32F103VET6 controller
+#define BOARD_ZONESTAR_ZM3E2          4051  // Zonestar ZM3E2    (STM32F103RCT6)
+#define BOARD_ZONESTAR_ZM3E4          4052  // Zonestar ZM3E4 V1 (STM32F103VCT6)
+#define BOARD_ZONESTAR_ZM3E4V2        4053  // Zonestar ZM3E4 V2 (STM32F103VCT6)
 
 //
 // ARM Cortex-M4F
@@ -371,37 +365,33 @@
 #define BOARD_RUMBA32_V1_0            4201  // RUMBA32 STM32F446VET6 based controller from Aus3D
 #define BOARD_RUMBA32_V1_1            4202  // RUMBA32 STM32F446VET6 based controller from Aus3D
 #define BOARD_RUMBA32_MKS             4203  // RUMBA32 STM32F446VET6 based controller from Makerbase
-#define BOARD_RUMBA32_BTT             4204  // RUMBA32 STM32F446VET6 based controller from BIGTREETECH
-#define BOARD_BLACK_STM32F407VE       4205  // BLACK_STM32F407VE
-#define BOARD_BLACK_STM32F407ZE       4206  // BLACK_STM32F407ZE
-#define BOARD_STEVAL_3DP001V1         4207  // STEVAL-3DP001V1 3D PRINTER BOARD
-#define BOARD_BTT_SKR_PRO_V1_1        4208  // BigTreeTech SKR Pro v1.1 (STM32F407ZGT6)
-#define BOARD_BTT_SKR_PRO_V1_2        4209  // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
-#define BOARD_BTT_BTT002_V1_0         4210  // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
-#define BOARD_BTT_E3_RRF              4211  // BigTreeTech E3 RRF (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0_REV_A      4212  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0_REV_B      4213  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
-#define BOARD_BTT_GTR_V1_0            4214  // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
-#define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
-#define BOARD_LERDGE_K                4217  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S                4218  // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X                4219  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4220  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4221  // FYSETC S6 (STM32F446VET6)
-#define BOARD_FYSETC_S6_V2_0          4222  // FYSETC S6 v2.0 (STM32F446VET6)
-#define BOARD_FYSETC_SPIDER           4223  // FYSETC Spider (STM32F446VET6)
-#define BOARD_FLYF407ZG               4224  // FLYmaker FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4225  // MKS_ROBIN2 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        4226  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       4227  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_MONSTER8            4228  // MKS Monster8 (STM32F407VGT6)
-#define BOARD_ANET_ET4                4229  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4230  // ANET ET4P V1.x (STM32F407VGT6)
-#define BOARD_FYSETC_CHEETAH_V20      4231  // FYSETC Cheetah V2.0
-#define BOARD_TH3D_EZBOARD_LITE_V2    4232  // TH3D EZBoard Lite v2.0
-#define BOARD_INDEX_REV03             4233  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4234  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
+#define BOARD_BLACK_STM32F407VE       4204  // BLACK_STM32F407VE
+#define BOARD_BLACK_STM32F407ZE       4205  // BLACK_STM32F407ZE
+#define BOARD_STEVAL_3DP001V1         4206  // STEVAL-3DP001V1 3D PRINTER BOARD
+#define BOARD_BTT_SKR_PRO_V1_1        4207  // BigTreeTech SKR Pro v1.1 (STM32F407ZGT6)
+#define BOARD_BTT_SKR_PRO_V1_2        4208  // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
+#define BOARD_BTT_BTT002_V1_0         4209  // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
+#define BOARD_BTT_E3_RRF              4210  // BigTreeTech E3 RRF (STM32F407VGT6)
+#define BOARD_BTT_SKR_V2_0_REV_A      4211  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
+#define BOARD_BTT_SKR_V2_0_REV_B      4212  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
+#define BOARD_BTT_GTR_V1_0            4213  // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_BTT_OCTOPUS_V1_0        4214  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
+#define BOARD_BTT_OCTOPUS_V1_1        4215  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
+#define BOARD_LERDGE_K                4216  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S                4217  // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X                4218  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4219  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4220  // FYSETC S6 (STM32F446VET6)
+#define BOARD_FYSETC_S6_V2_0          4221  // FYSETC S6 v2.0 (STM32F446VET6)
+#define BOARD_FYSETC_SPIDER           4222  // FYSETC Spider (STM32F446VET6)
+#define BOARD_FLYF407ZG               4223  // FLYmaker FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4224  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        4225  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       4226  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_MKS_MONSTER8            4227  // MKS Monster8 (STM32F407VGT6)
+#define BOARD_ANET_ET4                4228  // ANET ET4 V1.x (STM32F407VGT6)
+#define BOARD_ANET_ET4P               4229  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_FYSETC_CHEETAH_V20      4230  // FYSETC Cheetah V2.0
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/core/bug_on.h b/Marlin/src/core/bug_on.h
index 7f1243e..cc745f2 100644
--- a/Marlin/src/core/bug_on.h
+++ b/Marlin/src/core/bug_on.h
@@ -20,19 +20,19 @@
  */
 #pragma once
 
-// We need SERIAL_ECHOPGM and macros.h
+// We need SERIAL_ECHOPAIR and macros.h
 #include "serial.h"
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
   // Useful macro for stopping the CPU on an unexpected condition
-  // This is used like SERIAL_ECHOPGM, that is: a key-value call of the local variables you want
+  // This is used like SERIAL_ECHOPAIR, that is: a key-value call of the local variables you want
   // to dump to the serial port before stopping the CPU.
-                          // \/ Don't replace by SERIAL_ECHOPGM since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
-  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": "); SERIAL_ECHOLNPGM(V); SERIAL_FLUSHTX(); *(char*)0 = 42; } while(0)
+                          // \/ Don't replace by SERIAL_ECHOPAIR since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
+  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": "); SERIAL_ECHOLNPAIR(V); SERIAL_FLUSHTX(); *(char*)0 = 42; } while(0)
 #elif ENABLED(MARLIN_DEV_MODE)
   // Don't stop the CPU here, but at least dump the bug on the serial port
-                          // \/ Don't replace by SERIAL_ECHOPGM since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
-  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": BUG!"); SERIAL_ECHOLNPGM(V); SERIAL_FLUSHTX(); } while(0)
+                          // \/ Don't replace by SERIAL_ECHOPAIR since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
+  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": BUG!"); SERIAL_ECHOLNPAIR(V); SERIAL_FLUSHTX(); } while(0)
 #else
   // Release mode, let's ignore the bug
   #define BUG_ON(V...) NOOP
diff --git a/Marlin/src/core/debug_out.h b/Marlin/src/core/debug_out.h
index 4e30a53..a7dc326 100644
--- a/Marlin/src/core/debug_out.h
+++ b/Marlin/src/core/debug_out.h
@@ -27,6 +27,7 @@
 //
 
 #undef DEBUG_SECTION
+#undef DEBUG_ECHOPGM_P
 #undef DEBUG_ECHO_START
 #undef DEBUG_ERROR_START
 #undef DEBUG_CHAR
@@ -36,10 +37,12 @@
 #undef DEBUG_ECHOLN
 #undef DEBUG_ECHOPGM
 #undef DEBUG_ECHOLNPGM
-#undef DEBUG_ECHOPGM_P
-#undef DEBUG_ECHOLNPGM_P
+#undef DEBUG_ECHOPAIR
+#undef DEBUG_ECHOPAIR_P
 #undef DEBUG_ECHOPAIR_F
 #undef DEBUG_ECHOPAIR_F_P
+#undef DEBUG_ECHOLNPAIR
+#undef DEBUG_ECHOLNPAIR_P
 #undef DEBUG_ECHOLNPAIR_F
 #undef DEBUG_ECHOLNPAIR_F_P
 #undef DEBUG_ECHO_MSG
@@ -56,6 +59,7 @@
   #include "debug_section.h"
   #define DEBUG_SECTION(N,S,D)    SectionLog N(PSTR(S),D)
 
+  #define DEBUG_ECHOPGM_P(P)      SERIAL_ECHOPGM_P(P)
   #define DEBUG_ECHO_START        SERIAL_ECHO_START
   #define DEBUG_ERROR_START       SERIAL_ERROR_START
   #define DEBUG_CHAR              SERIAL_CHAR
@@ -65,12 +69,12 @@
   #define DEBUG_ECHOLN            SERIAL_ECHOLN
   #define DEBUG_ECHOPGM           SERIAL_ECHOPGM
   #define DEBUG_ECHOLNPGM         SERIAL_ECHOLNPGM
-  #define DEBUG_ECHOPGM           SERIAL_ECHOPGM
-  #define DEBUG_ECHOPGM_P         SERIAL_ECHOPGM_P
+  #define DEBUG_ECHOPAIR          SERIAL_ECHOPAIR
+  #define DEBUG_ECHOPAIR_P        SERIAL_ECHOPAIR_P
   #define DEBUG_ECHOPAIR_F        SERIAL_ECHOPAIR_F
   #define DEBUG_ECHOPAIR_F_P      SERIAL_ECHOPAIR_F_P
-  #define DEBUG_ECHOLNPGM         SERIAL_ECHOLNPGM
-  #define DEBUG_ECHOLNPGM_P       SERIAL_ECHOLNPGM_P
+  #define DEBUG_ECHOLNPAIR        SERIAL_ECHOLNPAIR
+  #define DEBUG_ECHOLNPAIR_P      SERIAL_ECHOLNPAIR_P
   #define DEBUG_ECHOLNPAIR_F      SERIAL_ECHOLNPAIR_F
   #define DEBUG_ECHOLNPAIR_F_P    SERIAL_ECHOLNPAIR_F_P
   #define DEBUG_ECHO_MSG          SERIAL_ECHO_MSG
@@ -85,6 +89,7 @@
 #else
 
   #define DEBUG_SECTION(...)        NOOP
+  #define DEBUG_ECHOPGM_P(P)          NOOP
   #define DEBUG_ECHO_START()        NOOP
   #define DEBUG_ERROR_START()       NOOP
   #define DEBUG_CHAR(...)           NOOP
@@ -94,10 +99,12 @@
   #define DEBUG_ECHOLN(...)         NOOP
   #define DEBUG_ECHOPGM(...)        NOOP
   #define DEBUG_ECHOLNPGM(...)      NOOP
-  #define DEBUG_ECHOPGM_P(...)      NOOP
-  #define DEBUG_ECHOLNPGM_P(...)    NOOP
+  #define DEBUG_ECHOPAIR(...)       NOOP
+  #define DEBUG_ECHOPAIR_P(...)     NOOP
   #define DEBUG_ECHOPAIR_F(...)     NOOP
   #define DEBUG_ECHOPAIR_F_P(...)   NOOP
+  #define DEBUG_ECHOLNPAIR(...)     NOOP
+  #define DEBUG_ECHOLNPAIR_P(...)   NOOP
   #define DEBUG_ECHOLNPAIR_F(...)   NOOP
   #define DEBUG_ECHOLNPAIR_F_P(...) NOOP
   #define DEBUG_ECHO_MSG(...)       NOOP
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 7588a7b..8e97ec6 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -158,14 +158,15 @@
 #define STR_OFF                             "OFF"
 #define STR_ENDSTOP_HIT                     "TRIGGERED"
 #define STR_ENDSTOP_OPEN                    "open"
+#define STR_HOTEND_OFFSET                   "Hotend offsets:"
 #define STR_DUPLICATION_MODE                "Duplication mode: "
+#define STR_SOFT_ENDSTOPS                   "Soft endstops: "
 #define STR_SOFT_MIN                        "  Min: "
 #define STR_SOFT_MAX                        "  Max: "
 
 #define STR_SAVED_POS                       "Position saved"
 #define STR_RESTORING_POS                   "Restoring position"
 #define STR_INVALID_POS_SLOT                "Invalid slot. Total: "
-#define STR_DONE                            "Done."
 
 #define STR_SD_CANT_OPEN_SUBDIR             "Cannot open subdir "
 #define STR_SD_INIT_FAIL                    "No SD card"
@@ -230,9 +231,6 @@
 #define STR_HEATER_BED                      "bed"
 #define STR_HEATER_CHAMBER                  "chamber"
 #define STR_COOLER                          "cooler"
-#define STR_MOTHERBOARD                     "motherboard"
-#define STR_PROBE                           "probe"
-#define STR_REDUNDANT                       "redundant "
 #define STR_LASER_TEMP                      "laser temperature"
 
 #define STR_STOPPED_HEATER                  ", system stopped! Heater_ID: "
@@ -261,49 +259,6 @@
 #define STR_REMINDER_SAVE_SETTINGS          "Remember to save!"
 #define STR_PASSWORD_SET                    "Password is "
 
-// Settings Report Strings
-#define STR_Z_AUTO_ALIGN                    "Z Auto-Align"
-#define STR_BACKLASH_COMPENSATION           "Backlash compensation"
-#define STR_DELTA_SETTINGS                  "Delta settings (L<diagonal-rod> R<radius> H<height> S<segments-per-sec> XYZ<tower-angle-trim> ABC<rod-trim>)"
-#define STR_SCARA_SETTINGS                  "SCARA settings"
-#define STR_SCARA_S                         "S<seg-per-sec>"
-#define STR_SCARA_P_T_Z                     "P<theta-psi-offset> T<theta-offset> Z<home-offset>"
-#define STR_ENDSTOP_ADJUSTMENT              "Endstop adjustment"
-#define STR_SKEW_FACTOR                     "Skew Factor"
-#define STR_FILAMENT_SETTINGS               "Filament settings"
-#define STR_MAX_ACCELERATION                "Max Acceleration (units/s2)"
-#define STR_MAX_FEEDRATES                   "Max feedrates (units/s)"
-#define STR_ACCELERATION_P_R_T              "Acceleration (units/s2) (P<print-accel> R<retract-accel> T<travel-accel>)"
-#define STR_TOOL_CHANGING                   "Tool-changing"
-#define STR_HOTEND_OFFSETS                  "Hotend offsets"
-#define STR_SERVO_ANGLES                    "Servo Angles"
-#define STR_HOTEND_PID                      "Hotend PID"
-#define STR_BED_PID                         "Bed PID"
-#define STR_CHAMBER_PID                     "Chamber PID"
-#define STR_STEPS_PER_UNIT                  "Steps per unit"
-#define STR_LINEAR_ADVANCE                  "Linear Advance"
-#define STR_CONTROLLER_FAN                  "Controller Fan"
-#define STR_STEPPER_MOTOR_CURRENTS          "Stepper motor currents"
-#define STR_RETRACT_S_F_Z                   "Retract (S<length> F<feedrate> Z<lift>)"
-#define STR_RECOVER_S_F                     "Recover (S<length> F<feedrate>)"
-#define STR_AUTO_RETRACT_S                  "Auto-Retract (S<enable>)"
-#define STR_FILAMENT_LOAD_UNLOAD            "Filament load/unload"
-#define STR_POWER_LOSS_RECOVERY             "Power-loss recovery"
-#define STR_FILAMENT_RUNOUT_SENSOR          "Filament runout sensor"
-#define STR_DRIVER_STEPPING_MODE            "Driver stepping mode"
-#define STR_STEPPER_DRIVER_CURRENT          "Stepper driver current"
-#define STR_HYBRID_THRESHOLD                "Hybrid Threshold"
-#define STR_STALLGUARD_THRESHOLD            "StallGuard threshold"
-#define STR_HOME_OFFSET                     "Home offset"
-#define STR_SOFT_ENDSTOPS                   "Soft endstops"
-#define STR_MATERIAL_HEATUP                 "Material heatup parameters"
-#define STR_LCD_CONTRAST                    "LCD Contrast"
-#define STR_LCD_BRIGHTNESS                  "LCD Brightness"
-#define STR_UI_LANGUAGE                     "UI Language"
-#define STR_Z_PROBE_OFFSET                  "Z-Probe Offset"
-#define STR_TEMPERATURE_UNITS               "Temperature Units"
-#define STR_USER_THERMISTORS                "User thermistors"
-
 //
 // Endstop Names used by Endstops::report_states
 //
@@ -332,7 +287,7 @@
 
 #define STR_Z_PROBE                         "z_probe"
 #define STR_PROBE_EN                        "probe_en"
-#define STR_FILAMENT                        "filament"
+#define STR_FILAMENT_RUNOUT_SENSOR          "filament"
 
 // General axis names
 #define STR_X "X"
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 0174e21..86368bf 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -260,7 +260,6 @@
 #define CODE_3( A,B,C,...) A; B; C
 #define CODE_2( A,B,...) A; B
 #define CODE_1( A,...) A
-#define CODE_0(...)
 #define _CODE_N(N,V...) CODE_##N(V)
 #define CODE_N(N,V...) _CODE_N(N,V)
 
@@ -280,7 +279,6 @@
 #define GANG_3( A,B,C,...) A B C
 #define GANG_2( A,B,...) A B
 #define GANG_1( A,...) A
-#define GANG_0(...)
 #define _GANG_N(N,V...) GANG_##N(V)
 #define GANG_N(N,V...) _GANG_N(N,V)
 #define GANG_N_1(N,K) _GANG_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index 5063faf..1eaef69 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -36,8 +36,9 @@ typedef const char Language_Str[];
   #define NUM_LANGUAGES 1
 #endif
 
-// Set unused languages equal to each other so the
-// compiler can optimize away the conditionals.
+// Setting the unused languages equal to each other allows
+// the compiler to optimize away the conditionals
+
 #ifndef LCD_LANGUAGE_2
   #define LCD_LANGUAGE_2 LCD_LANGUAGE
 #endif
@@ -57,11 +58,11 @@ typedef const char Language_Str[];
 #if NUM_LANGUAGES > 1
   #define HAS_MULTI_LANGUAGE 1
   #define GET_TEXT(MSG) ( \
-    ui.language == 4 ? GET_LANG(LCD_LANGUAGE_5)::MSG : \
-    ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \
-    ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
+    ui.language == 0 ? GET_LANG(LCD_LANGUAGE  )::MSG : \
     ui.language == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
-                       GET_LANG(LCD_LANGUAGE  )::MSG   )
+    ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
+    ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \
+                       GET_LANG(LCD_LANGUAGE_5)::MSG   )
   #define MAX_LANG_CHARSIZE _MAX(GET_LANG(LCD_LANGUAGE  )::CHARSIZE, \
                                  GET_LANG(LCD_LANGUAGE_2)::CHARSIZE, \
                                  GET_LANG(LCD_LANGUAGE_3)::CHARSIZE, \
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 8c9f4a8..50cc50a 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -96,7 +96,7 @@ void print_bin(uint16_t val) {
 
 void print_pos(LINEAR_AXIS_ARGS(const_float_t), PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
   if (prefix) serialprintPGM(prefix);
-  SERIAL_ECHOPGM_P(
+  SERIAL_ECHOPAIR_P(
     LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k)
   );
   if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 05d80a4..dfcf23d 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -88,7 +88,7 @@ extern uint8_t marlin_debug_flags;
 #if HAS_MULTI_SERIAL
   #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
   #define _PORT_RESTORE(n,p)  RESTORE(n)
-  #define SERIAL_ASSERT(P)    if (multiSerial.portMask!=(P)) { debugger(); }
+  #define SERIAL_ASSERT(P)    if(multiSerial.portMask!=(P)){ debugger(); }
   // If we have a catchall, use that directly
   #ifdef SERIAL_CATCHALL
     #define _SERIAL_LEAF_2 SERIAL_CATCHALL
@@ -188,44 +188,44 @@ inline void SERIAL_FLUSHTX()  { SERIAL_IMPL.flushTX(); }
 void serialprintPGM(PGM_P str);
 
 //
-// SERIAL_ECHOPGM... macros are used to output string-value pairs.
+// SERIAL_ECHOPAIR... macros are used to output string-value pairs.
 //
 
 // Print up to 20 pairs of values. Odd elements must be literal strings.
 #define __SEP_N(N,V...)           _SEP_##N(V)
 #define _SEP_N(N,V...)            __SEP_N(N,V)
 #define _SEP_N_REF()              _SEP_N
-#define _SEP_1(s)                 serialprintPGM(PSTR(s));
+#define _SEP_1(s)                 SERIAL_ECHOPGM(s);
 #define _SEP_2(s,v)               serial_echopair_PGM(PSTR(s),v);
 #define _SEP_3(s,v,V...)          _SEP_2(s,v); DEFER2(_SEP_N_REF)()(TWO_ARGS(V),V);
-#define SERIAL_ECHOPGM(V...)      do{ EVAL(_SEP_N(TWO_ARGS(V),V)); }while(0)
+#define SERIAL_ECHOPAIR(V...)     do{ EVAL(_SEP_N(TWO_ARGS(V),V)); }while(0)
 
 // Print up to 20 pairs of values followed by newline. Odd elements must be literal strings.
 #define __SELP_N(N,V...)          _SELP_##N(V)
 #define _SELP_N(N,V...)           __SELP_N(N,V)
 #define _SELP_N_REF()             _SELP_N
-#define _SELP_1(s)                serialprintPGM(PSTR(s "\n"));
+#define _SELP_1(s)                SERIAL_ECHOLNPGM(s);
 #define _SELP_2(s,v)              serial_echopair_PGM(PSTR(s),v); SERIAL_EOL();
 #define _SELP_3(s,v,V...)         _SEP_2(s,v); DEFER2(_SELP_N_REF)()(TWO_ARGS(V),V);
-#define SERIAL_ECHOLNPGM(V...)    do{ EVAL(_SELP_N(TWO_ARGS(V),V)); }while(0)
+#define SERIAL_ECHOLNPAIR(V...)   do{ EVAL(_SELP_N(TWO_ARGS(V),V)); }while(0)
 
 // Print up to 20 pairs of values. Odd elements must be PSTR pointers.
 #define __SEP_N_P(N,V...)         _SEP_##N##_P(V)
 #define _SEP_N_P(N,V...)          __SEP_N_P(N,V)
 #define _SEP_N_P_REF()            _SEP_N_P
-#define _SEP_1_P(p)               serialprintPGM(p);
-#define _SEP_2_P(p,v)             serial_echopair_PGM(p,v);
-#define _SEP_3_P(p,v,V...)        _SEP_2_P(p,v); DEFER2(_SEP_N_P_REF)()(TWO_ARGS(V),V);
-#define SERIAL_ECHOPGM_P(V...)    do{ EVAL(_SEP_N_P(TWO_ARGS(V),V)); }while(0)
+#define _SEP_1_P(s)               serialprintPGM(s);
+#define _SEP_2_P(s,v)             serial_echopair_PGM(s,v);
+#define _SEP_3_P(s,v,V...)        _SEP_2_P(s,v); DEFER2(_SEP_N_P_REF)()(TWO_ARGS(V),V);
+#define SERIAL_ECHOPAIR_P(V...)   do{ EVAL(_SEP_N_P(TWO_ARGS(V),V)); }while(0)
 
 // Print up to 20 pairs of values followed by newline. Odd elements must be PSTR pointers.
 #define __SELP_N_P(N,V...)        _SELP_##N##_P(V)
 #define _SELP_N_P(N,V...)         __SELP_N_P(N,V)
 #define _SELP_N_P_REF()           _SELP_N_P
-#define _SELP_1_P(p)              { serialprintPGM(p); SERIAL_EOL(); }
-#define _SELP_2_P(p,v)            { serial_echopair_PGM(p,v); SERIAL_EOL(); }
-#define _SELP_3_P(p,v,V...)       { _SEP_2_P(p,v); DEFER2(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
-#define SERIAL_ECHOLNPGM_P(V...)  do{ EVAL(_SELP_N_P(TWO_ARGS(V),V)); }while(0)
+#define _SELP_1_P(s)              { serialprintPGM(s); SERIAL_EOL(); }
+#define _SELP_2_P(s,v)            { serial_echopair_PGM(s,v); SERIAL_EOL(); }
+#define _SELP_3_P(s,v,V...)       { _SEP_2_P(s,v); DEFER2(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
+#define SERIAL_ECHOLNPAIR_P(V...) do{ EVAL(_SELP_N_P(TWO_ARGS(V),V)); }while(0)
 
 #ifdef AllowDifferentTypeInList
 
@@ -261,6 +261,12 @@ void serialprintPGM(PGM_P str);
 
 #endif
 
+#define SERIAL_ECHOPGM_P(P)         (serialprintPGM(P))
+#define SERIAL_ECHOLNPGM_P(P)       do{ serialprintPGM(P); SERIAL_EOL(); }while(0)
+
+#define SERIAL_ECHOPGM(S)           (serialprintPGM(PSTR(S)))
+#define SERIAL_ECHOLNPGM(S)         (serialprintPGM(PSTR(S "\n")))
+
 #define SERIAL_ECHOPAIR_F_P(P,V...) do{ serialprintPGM(P); SERIAL_ECHO_F(V); }while(0)
 #define SERIAL_ECHOLNPAIR_F_P(V...) do{ SERIAL_ECHOPAIR_F_P(V); SERIAL_EOL(); }while(0)
 
@@ -271,8 +277,8 @@ void serialprintPGM(PGM_P str);
 #define SERIAL_ERROR_START()        serial_error_start()
 #define SERIAL_EOL()                SERIAL_CHAR('\n')
 
-#define SERIAL_ECHO_MSG(V...)       do{ SERIAL_ECHO_START();  SERIAL_ECHOLNPGM(V); }while(0)
-#define SERIAL_ERROR_MSG(V...)      do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPGM(V); }while(0)
+#define SERIAL_ECHO_MSG(V...)       do{ SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
+#define SERIAL_ERROR_MSG(V...)      do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPAIR(V); }while(0)
 
 #define SERIAL_ECHO_SP(C)           serial_spaces(C)
 
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 372b4b1..833167a 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -55,8 +55,6 @@ struct IF<true, L, R> { typedef L type; };
 #define LOGICAL_AXIS_ELEM(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k)
 #define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V)
 
-#define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)
-
 #if HAS_EXTRUDERS
   #define LIST_ITEM_E(N) , N
   #define CODE_ITEM_E(N) ; N
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 8aeec89..b810855 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -79,9 +79,9 @@ void safe_delay(millis_t ms) {
     #if HAS_BED_PROBE
 
       #if !HAS_PROBE_XY_OFFSET
-        SERIAL_ECHOPGM("Probe Offset X0 Y0 Z", probe.offset.z, " (");
+        SERIAL_ECHOPAIR("Probe Offset X0 Y0 Z", probe.offset.z, " (");
       #else
-        SERIAL_ECHOPGM_P(PSTR("Probe Offset X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR, probe.offset.z);
+        SERIAL_ECHOPAIR_P(PSTR("Probe Offset X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR, probe.offset.z);
         if (probe.offset_xy.x > 0)
           SERIAL_ECHOPGM(" (Right");
         else if (probe.offset_xy.x < 0)
@@ -119,7 +119,7 @@ void safe_delay(millis_t ms) {
         SERIAL_ECHOLNPGM(" (enabled)");
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           if (planner.z_fade_height)
-            SERIAL_ECHOLNPGM("Z Fade: ", planner.z_fade_height);
+            SERIAL_ECHOLNPAIR("Z Fade: ", planner.z_fade_height);
         #endif
         #if ABL_PLANAR
           SERIAL_ECHOPGM("ABL Adjustment");
@@ -140,7 +140,7 @@ void safe_delay(millis_t ms) {
           SERIAL_ECHO(ftostr43sign(rz, '+'));
           #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
             if (planner.z_fade_height) {
-              SERIAL_ECHOPGM(" (", ftostr43sign(rz * planner.fade_scaling_factor_for_z(current_position.z), '+'));
+              SERIAL_ECHOPAIR(" (", ftostr43sign(rz * planner.fade_scaling_factor_for_z(current_position.z), '+'));
               SERIAL_CHAR(')');
             }
           #endif
@@ -156,10 +156,10 @@ void safe_delay(millis_t ms) {
       SERIAL_ECHOPGM("Mesh Bed Leveling");
       if (planner.leveling_active) {
         SERIAL_ECHOLNPGM(" (enabled)");
-        SERIAL_ECHOPGM("MBL Adjustment Z", ftostr43sign(mbl.get_z(current_position), '+'));
+        SERIAL_ECHOPAIR("MBL Adjustment Z", ftostr43sign(mbl.get_z(current_position), '+'));
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           if (planner.z_fade_height) {
-            SERIAL_ECHOPGM(" (", ftostr43sign(
+            SERIAL_ECHOPAIR(" (", ftostr43sign(
               mbl.get_z(current_position, planner.fade_scaling_factor_for_z(current_position.z)), '+'
             ));
             SERIAL_CHAR(')');
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 23dc973..5ab95d1 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -134,12 +134,12 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
           switch (axis) {
             case CORE_AXIS_1:
               //block->steps[CORE_AXIS_2] += influence_distance_mm[axis] * planner.settings.axis_steps_per_mm[CORE_AXIS_2];
-              //SERIAL_ECHOLNPGM("CORE_AXIS_1 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
+              //SERIAL_ECHOLNPAIR("CORE_AXIS_1 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
               //  " da=", da, " db=", db, " block->steps[axis]=", block->steps[axis], " err_corr=", error_correction);
               break;
             case CORE_AXIS_2:
               //block->steps[CORE_AXIS_1] += influence_distance_mm[axis] * planner.settings.axis_steps_per_mm[CORE_AXIS_1];;
-              //SERIAL_ECHOLNPGM("CORE_AXIS_2 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
+              //SERIAL_ECHOLNPAIR("CORE_AXIS_2 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
               //  " da=", da, " db=", db, " block->steps[axis]=", block->steps[axis], " err_corr=", error_correction);
               break;
             case NORMAL_AXIS: break;
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index ece7481..7390656 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -336,11 +336,11 @@ float bilinear_z_offset(const xy_pos_t &raw) {
   /*
   static float last_offset = 0;
   if (ABS(last_offset - offset) > 0.2) {
-    SERIAL_ECHOLNPGM("Sudden Shift at x=", rel.x, " / ", bilinear_grid_spacing.x, " -> thisg.x=", thisg.x);
-    SERIAL_ECHOLNPGM(" y=", rel.y, " / ", bilinear_grid_spacing.y, " -> thisg.y=", thisg.y);
-    SERIAL_ECHOLNPGM(" ratio.x=", ratio.x, " ratio.y=", ratio.y);
-    SERIAL_ECHOLNPGM(" z1=", z1, " z2=", z2, " z3=", z3, " z4=", z4);
-    SERIAL_ECHOLNPGM(" L=", L, " R=", R, " offset=", offset);
+    SERIAL_ECHOLNPAIR("Sudden Shift at x=", rel.x, " / ", bilinear_grid_spacing.x, " -> thisg.x=", thisg.x);
+    SERIAL_ECHOLNPAIR(" y=", rel.y, " / ", bilinear_grid_spacing.y, " -> thisg.y=", thisg.y);
+    SERIAL_ECHOLNPAIR(" ratio.x=", ratio.x, " ratio.y=", ratio.y);
+    SERIAL_ECHOLNPAIR(" z1=", z1, " z2=", z2, " z3=", z3, " z4=", z4);
+    SERIAL_ECHOLNPAIR(" L=", L, " R=", R, " offset=", offset);
   }
   last_offset = offset;
   //*/
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 00cb5ed..37c8be5 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -51,7 +51,7 @@ void unified_bed_leveling::report_current_mesh() {
   GRID_LOOP(x, y)
     if (!isnan(z_values[x][y])) {
       SERIAL_ECHO_START();
-      SERIAL_ECHOPGM("  M421 I", x, " J", y);
+      SERIAL_ECHOPAIR("  M421 I", x, " J", y);
       SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, z_values[x][y], 4);
       serial_delay(75); // Prevent Printrun from exploding
     }
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index ffabadd..cf00a28 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -208,7 +208,7 @@ public:
 
       if (DEBUGGING(LEVELING)) {
         if (WITHIN(x1_i, 0, (GRID_MAX_POINTS_X) - 1)) DEBUG_ECHOPGM("yi"); else DEBUG_ECHOPGM("x1_i");
-        DEBUG_ECHOLNPGM(" out of bounds in z_correction_for_x_on_horizontal_mesh_line(rx0=", rx0, ",x1_i=", x1_i, ",yi=", yi, ")");
+        DEBUG_ECHOLNPAIR(" out of bounds in z_correction_for_x_on_horizontal_mesh_line(rx0=", rx0, ",x1_i=", x1_i, ",yi=", yi, ")");
       }
 
       // The requested location is off the mesh. Return UBL_Z_RAISE_WHEN_OFF_MESH or NAN.
@@ -231,7 +231,7 @@ public:
 
       if (DEBUGGING(LEVELING)) {
         if (WITHIN(xi, 0, (GRID_MAX_POINTS_X) - 1)) DEBUG_ECHOPGM("y1_i"); else DEBUG_ECHOPGM("xi");
-        DEBUG_ECHOLNPGM(" out of bounds in z_correction_for_y_on_vertical_mesh_line(ry0=", ry0, ", xi=", xi, ", y1_i=", y1_i, ")");
+        DEBUG_ECHOLNPAIR(" out of bounds in z_correction_for_y_on_vertical_mesh_line(ry0=", ry0, ", xi=", xi, ", y1_i=", y1_i, ")");
       }
 
       // The requested location is off the mesh. Return UBL_Z_RAISE_WHEN_OFF_MESH or NAN.
@@ -275,11 +275,11 @@ public:
                      // because part of the Mesh is undefined and we don't have the
                      // information we need to complete the height correction.
 
-      if (DEBUGGING(MESH_ADJUST)) DEBUG_ECHOLNPGM("??? Yikes! NAN in ");
+      if (DEBUGGING(MESH_ADJUST)) DEBUG_ECHOLNPAIR("??? Yikes! NAN in ");
     }
 
     if (DEBUGGING(MESH_ADJUST)) {
-      DEBUG_ECHOPGM("get_z_correction(", rx0, ", ", ry0);
+      DEBUG_ECHOPAIR("get_z_correction(", rx0, ", ", ry0);
       DEBUG_ECHOLNPAIR_F(") => ", z0, 6);
     }
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 750c63f..f8e446c 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -428,7 +428,7 @@ void unified_bed_leveling::G29() {
             SERIAL_ECHOLNPGM("Mesh invalidated. Probing mesh.");
           }
           if (param.V_verbosity > 1) {
-            SERIAL_ECHOPGM("Probing around (", param.XY_pos.x);
+            SERIAL_ECHOPAIR("Probing around (", param.XY_pos.x);
             SERIAL_CHAR(',');
             SERIAL_DECIMAL(param.XY_pos.y);
             SERIAL_ECHOLNPGM(").\n");
@@ -602,14 +602,14 @@ void unified_bed_leveling::G29() {
     }
 
     if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) {
-      SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1);
+      SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
       return;
     }
 
     settings.load_mesh(param.KLS_storage_slot);
     storage_slot = param.KLS_storage_slot;
 
-    SERIAL_ECHOLNPGM(STR_DONE);
+    SERIAL_ECHOLNPGM("Done.");
   }
 
   //
@@ -630,14 +630,14 @@ void unified_bed_leveling::G29() {
     }
 
     if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) {
-      SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1);
+      SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
       goto LEAVE;
     }
 
     settings.store_mesh(param.KLS_storage_slot);
     storage_slot = param.KLS_storage_slot;
 
-    SERIAL_ECHOLNPGM(STR_DONE);
+    SERIAL_ECHOLNPGM("Done.");
   }
 
   if (parser.seen_test('T'))
@@ -653,7 +653,7 @@ void unified_bed_leveling::G29() {
   #endif
 
   #ifdef Z_PROBE_END_SCRIPT
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
     if (probe_deployed) {
       planner.synchronize();
       gcode.process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
@@ -690,7 +690,7 @@ void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const_float_t o
     if (!isnan(z_values[x][y]))
       sum_of_diff_squared += sq(z_values[x][y] - mean);
 
-  SERIAL_ECHOLNPGM("# of samples: ", n);
+  SERIAL_ECHOLNPAIR("# of samples: ", n);
   SERIAL_ECHOLNPAIR_F("Mean Mesh Height: ", mean, 6);
 
   const float sigma = SQRT(sum_of_diff_squared / (n + 1));
@@ -735,8 +735,8 @@ void unified_bed_leveling::shift_mesh_height() {
       if (do_ubl_mesh_map) display_map(param.T_map_type);
 
       const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
-      SERIAL_ECHOLNPGM("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
-      TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
+      SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
+      TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), point_num, int(GRID_MAX_POINTS)));
 
       #if HAS_LCD_MENU
         if (ui.button_pressed()) {
@@ -1450,7 +1450,7 @@ void unified_bed_leveling::smart_fill_mesh() {
         #endif
         if (param.V_verbosity > 3) {
           serial_spaces(16);
-          SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
+          SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
         }
         incremental_LSF(&lsf_results, points[0], measured_z);
       }
@@ -1469,7 +1469,7 @@ void unified_bed_leveling::smart_fill_mesh() {
           measured_z -= get_z_correction(points[1]);
           if (param.V_verbosity > 3) {
             serial_spaces(16);
-            SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
+            SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
           }
           incremental_LSF(&lsf_results, points[1], measured_z);
         }
@@ -1479,7 +1479,7 @@ void unified_bed_leveling::smart_fill_mesh() {
         SERIAL_ECHOLNPGM("Tilting mesh (3/3)");
         TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
 
-        measured_z = probe.probe_at_point(points[2], PROBE_PT_LAST_STOW, param.V_verbosity);
+        measured_z = probe.probe_at_point(points[2], PROBE_PT_STOW, param.V_verbosity);
         #ifdef VALIDATE_MESH_TILT
           z3 = measured_z;
         #endif
@@ -1489,7 +1489,7 @@ void unified_bed_leveling::smart_fill_mesh() {
           measured_z -= get_z_correction(points[2]);
           if (param.V_verbosity > 3) {
             serial_spaces(16);
-            SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
+            SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
           }
           incremental_LSF(&lsf_results, points[2], measured_z);
         }
@@ -1517,7 +1517,7 @@ void unified_bed_leveling::smart_fill_mesh() {
           rpos.y = y_min + dy * (zig_zag ? param.J_grid_size - 1 - iy : iy);
 
           if (!abort_flag) {
-            SERIAL_ECHOLNPGM("Tilting mesh point ", point_num, "/", total_points, "\n");
+            SERIAL_ECHOLNPAIR("Tilting mesh point ", point_num, "/", total_points, "\n");
             TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_LCD_TILTING_MESH), point_num, total_points));
 
             measured_z = probe.probe_at_point(rpos, parser.seen_test('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity); // TODO: Needs error handling
@@ -1545,7 +1545,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
             if (param.V_verbosity > 3) {
               serial_spaces(16);
-              SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
+              SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
             }
             incremental_LSF(&lsf_results, rpos, measured_z);
           }
@@ -1648,7 +1648,7 @@ void unified_bed_leveling::smart_fill_mesh() {
         DEBUG_ECHOLNPAIR_F("0 : ", normed(safe_homing_xy, 0), 6);
         d_from(); DEBUG_ECHOPGM("safe home with Z=");
         DEBUG_ECHOLNPAIR_F("mesh value ", normed(safe_homing_xy, get_z_correction(safe_homing_xy)), 6);
-        DEBUG_ECHOPGM("   Z error = (", Z_SAFE_HOMING_X_POINT, ",", Z_SAFE_HOMING_Y_POINT);
+        DEBUG_ECHOPAIR("   Z error = (", Z_SAFE_HOMING_X_POINT, ",", Z_SAFE_HOMING_Y_POINT);
         DEBUG_ECHOLNPAIR_F(") = ", get_z_correction(safe_homing_xy), 6);
       #endif
     } // DEBUGGING(LEVELING)
@@ -1722,7 +1722,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     if (storage_slot == -1)
       SERIAL_ECHOPGM("No Mesh Loaded.");
     else
-      SERIAL_ECHOPGM("Mesh ", storage_slot, " Loaded.");
+      SERIAL_ECHOPAIR("Mesh ", storage_slot, " Loaded.");
     SERIAL_EOL();
     serial_delay(50);
 
@@ -1736,14 +1736,14 @@ void unified_bed_leveling::smart_fill_mesh() {
       SERIAL_ECHOLNPAIR_F("Probe Offset M851 Z", probe.offset.z, 7);
     #endif
 
-    SERIAL_ECHOLNPGM("MESH_MIN_X  " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50);
-    SERIAL_ECHOLNPGM("MESH_MIN_Y  " STRINGIFY(MESH_MIN_Y) "=", MESH_MIN_Y); serial_delay(50);
-    SERIAL_ECHOLNPGM("MESH_MAX_X  " STRINGIFY(MESH_MAX_X) "=", MESH_MAX_X); serial_delay(50);
-    SERIAL_ECHOLNPGM("MESH_MAX_Y  " STRINGIFY(MESH_MAX_Y) "=", MESH_MAX_Y); serial_delay(50);
-    SERIAL_ECHOLNPGM("GRID_MAX_POINTS_X  ", GRID_MAX_POINTS_X);             serial_delay(50);
-    SERIAL_ECHOLNPGM("GRID_MAX_POINTS_Y  ", GRID_MAX_POINTS_Y);             serial_delay(50);
-    SERIAL_ECHOLNPGM("MESH_X_DIST  ", MESH_X_DIST);
-    SERIAL_ECHOLNPGM("MESH_Y_DIST  ", MESH_Y_DIST);                         serial_delay(50);
+    SERIAL_ECHOLNPAIR("MESH_MIN_X  " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50);
+    SERIAL_ECHOLNPAIR("MESH_MIN_Y  " STRINGIFY(MESH_MIN_Y) "=", MESH_MIN_Y); serial_delay(50);
+    SERIAL_ECHOLNPAIR("MESH_MAX_X  " STRINGIFY(MESH_MAX_X) "=", MESH_MAX_X); serial_delay(50);
+    SERIAL_ECHOLNPAIR("MESH_MAX_Y  " STRINGIFY(MESH_MAX_Y) "=", MESH_MAX_Y); serial_delay(50);
+    SERIAL_ECHOLNPAIR("GRID_MAX_POINTS_X  ", GRID_MAX_POINTS_X);             serial_delay(50);
+    SERIAL_ECHOLNPAIR("GRID_MAX_POINTS_Y  ", GRID_MAX_POINTS_Y);             serial_delay(50);
+    SERIAL_ECHOLNPAIR("MESH_X_DIST  ", MESH_X_DIST);
+    SERIAL_ECHOLNPAIR("MESH_Y_DIST  ", MESH_Y_DIST);                         serial_delay(50);
 
     SERIAL_ECHOPGM("X-Axis Mesh Points at: ");
     LOOP_L_N(i, GRID_MAX_POINTS_X) {
@@ -1762,27 +1762,27 @@ void unified_bed_leveling::smart_fill_mesh() {
     SERIAL_EOL();
 
     #if HAS_KILL
-      SERIAL_ECHOLNPGM("Kill pin on :", KILL_PIN, "  state:", kill_state());
+      SERIAL_ECHOLNPAIR("Kill pin on :", KILL_PIN, "  state:", kill_state());
     #endif
 
     SERIAL_EOL();
     serial_delay(50);
 
     #if ENABLED(UBL_DEVEL_DEBUGGING)
-      SERIAL_ECHOLNPGM("ubl_state_at_invocation :", ubl_state_at_invocation, "\nubl_state_recursion_chk :", ubl_state_recursion_chk);
+      SERIAL_ECHOLNPAIR("ubl_state_at_invocation :", ubl_state_at_invocation, "\nubl_state_recursion_chk :", ubl_state_recursion_chk);
       serial_delay(50);
 
-      SERIAL_ECHOLNPGM("Meshes go from ", hex_address((void*)settings.meshes_start_index()), " to ", hex_address((void*)settings.meshes_end_index()));
+      SERIAL_ECHOLNPAIR("Meshes go from ", hex_address((void*)settings.meshes_start_index()), " to ", hex_address((void*)settings.meshes_end_index()));
       serial_delay(50);
 
-      SERIAL_ECHOLNPGM("sizeof(ubl) :  ", sizeof(ubl));         SERIAL_EOL();
-      SERIAL_ECHOLNPGM("z_value[][] size: ", sizeof(z_values)); SERIAL_EOL();
+      SERIAL_ECHOLNPAIR("sizeof(ubl) :  ", sizeof(ubl));         SERIAL_EOL();
+      SERIAL_ECHOLNPAIR("z_value[][] size: ", sizeof(z_values)); SERIAL_EOL();
       serial_delay(25);
 
-      SERIAL_ECHOLNPGM("EEPROM free for UBL: ", hex_address((void*)(settings.meshes_end_index() - settings.meshes_start_index())));
+      SERIAL_ECHOLNPAIR("EEPROM free for UBL: ", hex_address((void*)(settings.meshes_end_index() - settings.meshes_start_index())));
       serial_delay(50);
 
-      SERIAL_ECHOLNPGM("EEPROM can hold ", settings.calc_num_meshes(), " meshes.\n");
+      SERIAL_ECHOLNPAIR("EEPROM can hold ", settings.calc_num_meshes(), " meshes.\n");
       serial_delay(25);
     #endif // UBL_DEVEL_DEBUGGING
 
@@ -1829,7 +1829,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     }
 
     if (!parser.has_value() || !WITHIN(parser.value_int(), 0, a - 1)) {
-      SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1);
+      SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
       return;
     }
 
@@ -1838,7 +1838,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     float tmp_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
     settings.load_mesh(param.KLS_storage_slot, &tmp_z_values);
 
-    SERIAL_ECHOLNPGM("Subtracting mesh in slot ", param.KLS_storage_slot, " from current mesh.");
+    SERIAL_ECHOLNPAIR("Subtracting mesh in slot ", param.KLS_storage_slot, " from current mesh.");
 
     GRID_LOOP(x, y) {
       z_values[x][y] -= tmp_z_values[x][y];
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index be5f6fe..20408d8 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
diff --git a/Marlin/src/feature/binary_stream.h b/Marlin/src/feature/binary_stream.h
index 417e39c..cef8a3c 100644
--- a/Marlin/src/feature/binary_stream.h
+++ b/Marlin/src/feature/binary_stream.h
@@ -146,9 +146,9 @@ public:
     transfer_timeout = millis() + TIMEOUT;
     switch (static_cast<FileTransfer>(packet_type)) {
       case FileTransfer::QUERY:
-        SERIAL_ECHOPGM("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
+        SERIAL_ECHOPAIR("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
         #if ENABLED(BINARY_STREAM_COMPRESSION)
-          SERIAL_ECHOLNPGM(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
+          SERIAL_ECHOLNPAIR(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
         #else
           SERIAL_ECHOLNPGM(":compression:none");
         #endif
@@ -322,7 +322,7 @@ public:
             if (packet.header.checksum == packet.header_checksum) {
               // The SYNC control packet is a special case in that it doesn't require the stream sync to be correct
               if (static_cast<Protocol>(packet.header.protocol()) == Protocol::CONTROL && static_cast<ProtocolControl>(packet.header.type()) == ProtocolControl::SYNC) {
-                  SERIAL_ECHOLNPGM("ss", sync, ",", buffer_size, ",", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
+                  SERIAL_ECHOLNPAIR("ss", sync, ",", buffer_size, ",", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
                   stream_state = StreamState::PACKET_RESET;
                   break;
               }
@@ -337,7 +337,7 @@ public:
                   stream_state = StreamState::PACKET_PROCESS;
               }
               else if (packet.header.sync == sync - 1) {           // ok response must have been lost
-                SERIAL_ECHOLNPGM("ok", packet.header.sync);  // transmit valid packet received and drop the payload
+                SERIAL_ECHOLNPAIR("ok", packet.header.sync);  // transmit valid packet received and drop the payload
                 stream_state = StreamState::PACKET_RESET;
               }
               else if (packet_retries) {
@@ -393,7 +393,7 @@ public:
           packet_retries = 0;
           bytes_received += packet.header.size;
 
-          SERIAL_ECHOLNPGM("ok", packet.header.sync); // transmit valid packet received
+          SERIAL_ECHOLNPAIR("ok", packet.header.sync); // transmit valid packet received
           dispatch();
           stream_state = StreamState::PACKET_RESET;
           break;
@@ -402,7 +402,7 @@ public:
             packet_retries++;
             stream_state = StreamState::PACKET_RESET;
             SERIAL_ECHO_MSG("Resend request ", packet_retries);
-            SERIAL_ECHOLNPGM("rs", sync);
+            SERIAL_ECHOLNPAIR("rs", sync);
           }
           else
             stream_state = StreamState::PACKET_ERROR;
@@ -412,7 +412,7 @@ public:
           stream_state = StreamState::PACKET_RESEND;
           break;
         case StreamState::PACKET_ERROR:
-          SERIAL_ECHOLNPGM("fe", packet.header.sync);
+          SERIAL_ECHOLNPAIR("fe", packet.header.sync);
           reset(); // reset everything, resync required
           stream_state = StreamState::PACKET_RESET;
           break;
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 49a10f6..7fccc52 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -39,7 +39,7 @@ void stop();
 #include "../core/debug_out.h"
 
 bool BLTouch::command(const BLTCommand cmd, const millis_t &ms) {
-  if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("BLTouch Command :", cmd);
+  if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPAIR("BLTouch Command :", cmd);
   MOVE_SERVO(Z_PROBE_SERVO_NR, cmd);
   safe_delay(_MAX(ms, (uint32_t)BLTOUCH_DELAY)); // BLTOUCH_DELAY is also the *minimum* delay
   return triggered();
@@ -64,7 +64,7 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
   #else
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOLNPGM("last_written_mode - ", last_written_mode);
+      DEBUG_ECHOLNPAIR("last_written_mode - ", last_written_mode);
       DEBUG_ECHOLNPGM("config mode - "
         #if ENABLED(BLTOUCH_SET_5V_MODE)
           "BLTOUCH_SET_5V_MODE"
@@ -175,7 +175,7 @@ bool BLTouch::status_proc() {
   _set_SW_mode();              // Incidentally, _set_SW_mode() will also RESET any active alarm
   const bool tr = triggered(); // If triggered in SW mode, the pin is up, it is STOWED
 
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch is ", tr);
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("BLTouch is ", tr);
 
   if (tr) _stow(); else _deploy();  // Turn off SW mode, reset any trigger, honor pin state
   return !tr;
@@ -187,7 +187,7 @@ void BLTouch::mode_conv_proc(const bool M5V) {
    * BLTOUCH V3.0: This will set the mode (twice) and sadly, a STOW is needed at the end, because of the deploy
    * BLTOUCH V3.1: This will set the mode and store it in the eeprom. The STOW is not needed but does not hurt
    */
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Set Mode - ", M5V);
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("BLTouch Set Mode - ", M5V);
   _deploy();
   if (M5V) _set_5V_mode(); else _set_OD_mode();
   _mode_store();
diff --git a/Marlin/src/feature/cancel_object.cpp b/Marlin/src/feature/cancel_object.cpp
index 9d50bfc..ee57168 100644
--- a/Marlin/src/feature/cancel_object.cpp
+++ b/Marlin/src/feature/cancel_object.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(CANCEL_OBJECTS)
diff --git a/Marlin/src/feature/closedloop.cpp b/Marlin/src/feature/closedloop.cpp
index 1b9f711..8a97f0c 100644
--- a/Marlin/src/feature/closedloop.cpp
+++ b/Marlin/src/feature/closedloop.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 35f567f..0206467 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -76,14 +76,9 @@ void ControllerFan::update() {
       )
     );
 
-    // If any triggers for the controller fan are true...
-    //   - At least one stepper driver is enabled
-    //   - The heated bed is enabled
-    //   - TEMP_SENSOR_BOARD is reporting >= CONTROLLER_FAN_MIN_BOARD_TEMP
-    if ( motor_on
-      || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0)
-      || TERN0(HAS_CONTROLLER_FAN_MIN_BOARD_TEMP, thermalManager.wholeDegBoard() >= CONTROLLER_FAN_MIN_BOARD_TEMP)
-    ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
+    // If any of the drivers or the heated bed are enabled...
+    if (motor_on || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0))
+      lastMotorOn = ms; //... set time to NOW so the fan will turn on
 
     // Fan Settings. Set fan > 0:
     //  - If AutoMode is on and steppers have been enabled for CONTROLLERFAN_IDLE_TIME seconds.
diff --git a/Marlin/src/feature/dac/dac_dac084s085.cpp b/Marlin/src/feature/dac/dac_dac084s085.cpp
index b88aaf8..649aa55 100644
--- a/Marlin/src/feature/dac/dac_dac084s085.cpp
+++ b/Marlin/src/feature/dac/dac_dac084s085.cpp
@@ -20,35 +20,35 @@ void dac084s085::begin() {
   uint8_t externalDac_buf[] = { 0x20, 0x00 }; // all off
 
   // All SPI chip-select HIGH
-  SET_OUTPUT(DAC0_SYNC_PIN);
+  SET_OUTPUT(DAC0_SYNC);
   #if HAS_MULTI_EXTRUDER
-    SET_OUTPUT(DAC1_SYNC_PIN);
+    SET_OUTPUT(DAC1_SYNC);
   #endif
   cshigh();
   spiBegin();
 
   //init onboard DAC
   DELAY_US(2);
-  WRITE(DAC0_SYNC_PIN, LOW);
+  WRITE(DAC0_SYNC, LOW);
   DELAY_US(2);
-  WRITE(DAC0_SYNC_PIN, HIGH);
+  WRITE(DAC0_SYNC, HIGH);
   DELAY_US(2);
-  WRITE(DAC0_SYNC_PIN, LOW);
+  WRITE(DAC0_SYNC, LOW);
 
   spiSend(SPI_CHAN_DAC, externalDac_buf, COUNT(externalDac_buf));
-  WRITE(DAC0_SYNC_PIN, HIGH);
+  WRITE(DAC0_SYNC, HIGH);
 
   #if HAS_MULTI_EXTRUDER
     //init Piggy DAC
     DELAY_US(2);
-    WRITE(DAC1_SYNC_PIN, LOW);
+    WRITE(DAC1_SYNC, LOW);
     DELAY_US(2);
-    WRITE(DAC1_SYNC_PIN, HIGH);
+    WRITE(DAC1_SYNC, HIGH);
     DELAY_US(2);
-    WRITE(DAC1_SYNC_PIN, LOW);
+    WRITE(DAC1_SYNC, LOW);
 
     spiSend(SPI_CHAN_DAC, externalDac_buf, COUNT(externalDac_buf));
-    WRITE(DAC1_SYNC_PIN, HIGH);
+    WRITE(DAC1_SYNC, HIGH);
   #endif
 
   return;
@@ -66,18 +66,18 @@ void dac084s085::setValue(const uint8_t channel, const uint8_t value) {
   cshigh();
 
   if (channel > 3) {        // DAC Piggy E1,E2,E3
-    WRITE(DAC1_SYNC_PIN, LOW);
+    WRITE(DAC1_SYNC, LOW);
     DELAY_US(2);
-    WRITE(DAC1_SYNC_PIN, HIGH);
+    WRITE(DAC1_SYNC, HIGH);
     DELAY_US(2);
-    WRITE(DAC1_SYNC_PIN, LOW);
+    WRITE(DAC1_SYNC, LOW);
   }
   else {                    // DAC onboard X,Y,Z,E0
-    WRITE(DAC0_SYNC_PIN, LOW);
+    WRITE(DAC0_SYNC, LOW);
     DELAY_US(2);
-    WRITE(DAC0_SYNC_PIN, HIGH);
+    WRITE(DAC0_SYNC, HIGH);
     DELAY_US(2);
-    WRITE(DAC0_SYNC_PIN, LOW);
+    WRITE(DAC0_SYNC, LOW);
   }
 
   DELAY_US(2);
@@ -85,13 +85,13 @@ void dac084s085::setValue(const uint8_t channel, const uint8_t value) {
 }
 
 void dac084s085::cshigh() {
-  WRITE(DAC0_SYNC_PIN, HIGH);
+  WRITE(DAC0_SYNC, HIGH);
   #if HAS_MULTI_EXTRUDER
-    WRITE(DAC1_SYNC_PIN, HIGH);
+    WRITE(DAC1_SYNC, HIGH);
   #endif
-  WRITE(SPI_EEPROM1_CS_PIN, HIGH);
-  WRITE(SPI_EEPROM2_CS_PIN, HIGH);
-  WRITE(SPI_FLASH_CS_PIN, HIGH);
+  WRITE(SPI_EEPROM1_CS, HIGH);
+  WRITE(SPI_EEPROM2_CS, HIGH);
+  WRITE(SPI_FLASH_CS, HIGH);
   WRITE(SD_SS_PIN, HIGH);
 }
 
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index ff730e9..6d03808 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -85,15 +85,15 @@ void StepperDAC::print_values() {
   if (!dac_present) return;
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
   SERIAL_ECHO_START();
-  SERIAL_ECHOPGM_P(SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
+  SERIAL_ECHOPAIR_P(SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
   #if HAS_Y_AXIS
-    SERIAL_ECHOPGM_P(SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
+    SERIAL_ECHOPAIR_P(SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
   #endif
   #if HAS_Z_AXIS
-    SERIAL_ECHOPGM_P(SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
+    SERIAL_ECHOPAIR_P(SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
   #endif
   #if HAS_EXTRUDERS
-    SERIAL_ECHOLNPGM_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
+    SERIAL_ECHOLNPAIR_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
   #endif
 }
 
diff --git a/Marlin/src/feature/direct_stepping.cpp b/Marlin/src/feature/direct_stepping.cpp
index ce97914..2698b53 100644
--- a/Marlin/src/feature/direct_stepping.cpp
+++ b/Marlin/src/feature/direct_stepping.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../inc/MarlinConfigPre.h"
 
 #if ENABLED(DIRECT_STEPPING)
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index e6b127e..283092e 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -49,7 +49,7 @@ void I2CPositionEncoder::init(const uint8_t address, const AxisEnum axis) {
 
   initialized = true;
 
-  SERIAL_ECHOLNPGM("Setting up encoder on ", AS_CHAR(axis_codes[encoderAxis]), " axis, addr = ", address);
+  SERIAL_ECHOLNPAIR("Setting up encoder on ", AS_CHAR(axis_codes[encoderAxis]), " axis, addr = ", address);
 
   position = get_position();
 }
@@ -67,7 +67,7 @@ void I2CPositionEncoder::update() {
     /*
     if (trusted) { //commented out as part of the note below
       trusted = false;
-      SERIAL_ECHOLNPGM("Fault detected on ", AS_CHAR(axis_codes[encoderAxis]), " axis encoder. Disengaging error correction until module is trusted again.");
+      SERIAL_ECHOLNPAIR("Fault detected on ", AS_CHAR(axis_codes[encoderAxis]), " axis encoder. Disengaging error correction until module is trusted again.");
     }
     */
     return;
@@ -92,7 +92,7 @@ void I2CPositionEncoder::update() {
       if (millis() - lastErrorTime > I2CPE_TIME_TRUSTED) {
         trusted = true;
 
-        SERIAL_ECHOLNPGM("Untrusted encoder module on ", AS_CHAR(axis_codes[encoderAxis]), " axis has been fault-free for set duration, reinstating error correction.");
+        SERIAL_ECHOLNPAIR("Untrusted encoder module on ", AS_CHAR(axis_codes[encoderAxis]), " axis has been fault-free for set duration, reinstating error correction.");
 
         //the encoder likely lost its place when the error occurred, so we'll reset and use the printer's
         //idea of where it the axis is to re-initialize
@@ -103,10 +103,10 @@ void I2CPositionEncoder::update() {
         zeroOffset -= (positionInTicks - get_position());
 
         #ifdef I2CPE_DEBUG
-          SERIAL_ECHOLNPGM("Current position is ", pos);
-          SERIAL_ECHOLNPGM("Position in encoder ticks is ", positionInTicks);
-          SERIAL_ECHOLNPGM("New zero-offset of ", zeroOffset);
-          SERIAL_ECHOPGM("New position reads as ", get_position());
+          SERIAL_ECHOLNPAIR("Current position is ", pos);
+          SERIAL_ECHOLNPAIR("Position in encoder ticks is ", positionInTicks);
+          SERIAL_ECHOLNPAIR("New zero-offset of ", zeroOffset);
+          SERIAL_ECHOPAIR("New position reads as ", get_position());
           SERIAL_CHAR('(');
           SERIAL_DECIMAL(mm_from_count(get_position()));
           SERIAL_ECHOLNPGM(")");
@@ -149,12 +149,12 @@ void I2CPositionEncoder::update() {
       const int32_t error = get_axis_error_steps(false);
     #endif
 
-    //SERIAL_ECHOLNPGM("Axis error steps: ", error);
+    //SERIAL_ECHOLNPAIR("Axis error steps: ", error);
 
     #ifdef I2CPE_ERR_THRESH_ABORT
       if (ABS(error) > I2CPE_ERR_THRESH_ABORT * planner.settings.axis_steps_per_mm[encoderAxis]) {
         //kill(PSTR("Significant Error"));
-        SERIAL_ECHOLNPGM("Axis error over threshold, aborting!", error);
+        SERIAL_ECHOLNPAIR("Axis error over threshold, aborting!", error);
         safe_delay(5000);
       }
     #endif
@@ -173,7 +173,7 @@ void I2CPositionEncoder::update() {
             LOOP_L_N(i, I2CPE_ERR_PRST_ARRAY_SIZE) sumP += errPrst[i];
             const int32_t errorP = int32_t(sumP * RECIPROCAL(I2CPE_ERR_PRST_ARRAY_SIZE));
             SERIAL_CHAR(axis_codes[encoderAxis]);
-            SERIAL_ECHOLNPGM(" : CORRECT ERR ", errorP * planner.steps_to_mm[encoderAxis], "mm");
+            SERIAL_ECHOLNPAIR(" : CORRECT ERR ", errorP * planner.steps_to_mm[encoderAxis], "mm");
             babystep.add_steps(encoderAxis, -LROUND(errorP));
             errPrstIdx = 0;
           }
@@ -193,7 +193,7 @@ void I2CPositionEncoder::update() {
       const millis_t ms = millis();
       if (ELAPSED(ms, nextErrorCountTime)) {
         SERIAL_CHAR(axis_codes[encoderAxis]);
-        SERIAL_ECHOLNPGM(" : LARGE ERR ", error, "; diffSum=", diffSum);
+        SERIAL_ECHOLNPAIR(" : LARGE ERR ", error, "; diffSum=", diffSum);
         errorCount++;
         nextErrorCountTime = ms + I2CPE_ERR_CNT_DEBOUNCE_MS;
       }
@@ -213,7 +213,7 @@ void I2CPositionEncoder::set_homed() {
 
     #ifdef I2CPE_DEBUG
       SERIAL_CHAR(axis_codes[encoderAxis]);
-      SERIAL_ECHOLNPGM(" axis encoder homed, offset of ", zeroOffset, " ticks.");
+      SERIAL_ECHOLNPAIR(" axis encoder homed, offset of ", zeroOffset, " ticks.");
     #endif
   }
 }
@@ -253,7 +253,7 @@ float I2CPositionEncoder::get_axis_error_mm(const bool report) {
 
   if (report) {
     SERIAL_CHAR(axis_codes[encoderAxis]);
-    SERIAL_ECHOLNPGM(" axis target=", target, "mm; actual=", actual, "mm; err=", error, "mm");
+    SERIAL_ECHOLNPAIR(" axis target=", target, "mm; actual=", actual, "mm; err=", error, "mm");
   }
 
   return error;
@@ -288,7 +288,7 @@ int32_t I2CPositionEncoder::get_axis_error_steps(const bool report) {
 
   if (report) {
     SERIAL_CHAR(axis_codes[encoderAxis]);
-    SERIAL_ECHOLNPGM(" axis target=", target, "; actual=", encoderCountInStepperTicksScaled, "; err=", error);
+    SERIAL_ECHOLNPAIR(" axis target=", target, "; actual=", encoderCountInStepperTicksScaled, "; err=", error);
   }
 
   if (suppressOutput) {
@@ -424,15 +424,15 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
 
     travelledDistance = mm_from_count(ABS(stopCount - startCount));
 
-    SERIAL_ECHOLNPGM("Attempted travel: ", travelDistance, "mm");
-    SERIAL_ECHOLNPGM("   Actual travel:  ", travelledDistance, "mm");
+    SERIAL_ECHOLNPAIR("Attempted travel: ", travelDistance, "mm");
+    SERIAL_ECHOLNPAIR("   Actual travel:  ", travelledDistance, "mm");
 
     //Calculate new axis steps per unit
     old_steps_mm = planner.settings.axis_steps_per_mm[encoderAxis];
     new_steps_mm = (old_steps_mm * travelDistance) / travelledDistance;
 
-    SERIAL_ECHOLNPGM("Old steps/mm: ", old_steps_mm);
-    SERIAL_ECHOLNPGM("New steps/mm: ", new_steps_mm);
+    SERIAL_ECHOLNPAIR("Old steps/mm: ", old_steps_mm);
+    SERIAL_ECHOLNPAIR("New steps/mm: ", new_steps_mm);
 
     //Save new value
     planner.settings.axis_steps_per_mm[encoderAxis] = new_steps_mm;
@@ -449,7 +449,7 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
 
   if (iter > 1) {
     total /= (float)iter;
-    SERIAL_ECHOLNPGM("Average steps/mm: ", total);
+    SERIAL_ECHOLNPAIR("Average steps/mm: ", total);
   }
 
   ec = oldec;
@@ -675,18 +675,18 @@ void I2CPositionEncodersMgr::change_module_address(const uint8_t oldaddr, const
   // First check 'new' address is not in use
   Wire.beginTransmission(I2C_ADDRESS(newaddr));
   if (!Wire.endTransmission()) {
-    SERIAL_ECHOLNPGM("?There is already a device with that address on the I2C bus! (", newaddr, ")");
+    SERIAL_ECHOLNPAIR("?There is already a device with that address on the I2C bus! (", newaddr, ")");
     return;
   }
 
   // Now check that we can find the module on the oldaddr address
   Wire.beginTransmission(I2C_ADDRESS(oldaddr));
   if (Wire.endTransmission()) {
-    SERIAL_ECHOLNPGM("?No module detected at this address! (", oldaddr, ")");
+    SERIAL_ECHOLNPAIR("?No module detected at this address! (", oldaddr, ")");
     return;
   }
 
-  SERIAL_ECHOLNPGM("Module found at ", oldaddr, ", changing address to ", newaddr);
+  SERIAL_ECHOLNPAIR("Module found at ", oldaddr, ", changing address to ", newaddr);
 
   // Change the modules address
   Wire.beginTransmission(I2C_ADDRESS(oldaddr));
@@ -722,11 +722,11 @@ void I2CPositionEncodersMgr::report_module_firmware(const uint8_t address) {
   // First check there is a module
   Wire.beginTransmission(I2C_ADDRESS(address));
   if (Wire.endTransmission()) {
-    SERIAL_ECHOLNPGM("?No module detected at this address! (", address, ")");
+    SERIAL_ECHOLNPAIR("?No module detected at this address! (", address, ")");
     return;
   }
 
-  SERIAL_ECHOLNPGM("Requesting version info from module at address ", address, ":");
+  SERIAL_ECHOLNPAIR("Requesting version info from module at address ", address, ":");
 
   Wire.beginTransmission(I2C_ADDRESS(address));
   Wire.write(I2CPE_SET_REPORT_MODE);
@@ -773,13 +773,13 @@ int8_t I2CPositionEncodersMgr::parse() {
   else if (parser.seenval('I')) {
 
     if (!parser.has_value()) {
-      SERIAL_ECHOLNPGM("?I seen, but no index specified! [0-", I2CPE_ENCODER_CNT - 1, "]");
+      SERIAL_ECHOLNPAIR("?I seen, but no index specified! [0-", I2CPE_ENCODER_CNT - 1, "]");
       return I2CPE_PARSE_ERR;
     };
 
     I2CPE_idx = parser.value_byte();
     if (I2CPE_idx >= I2CPE_ENCODER_CNT) {
-      SERIAL_ECHOLNPGM("?Index out of range. [0-", I2CPE_ENCODER_CNT - 1, "]");
+      SERIAL_ECHOLNPAIR("?Index out of range. [0-", I2CPE_ENCODER_CNT - 1, "]");
       return I2CPE_PARSE_ERR;
     }
 
@@ -954,7 +954,7 @@ void I2CPositionEncodersMgr::M864() {
     else return;
   }
 
-  SERIAL_ECHOLNPGM("Changing module at address ", I2CPE_addr, " to address ", newAddress);
+  SERIAL_ECHOLNPAIR("Changing module at address ", I2CPE_addr, " to address ", newAddress);
 
   change_module_address(I2CPE_addr, newAddress);
 }
diff --git a/Marlin/src/feature/encoder_i2c.h b/Marlin/src/feature/encoder_i2c.h
index 50fb27a..20871af 100644
--- a/Marlin/src/feature/encoder_i2c.h
+++ b/Marlin/src/feature/encoder_i2c.h
@@ -236,7 +236,7 @@ class I2CPositionEncodersMgr {
 
     static void report_status(const int8_t idx) {
       CHECK_IDX();
-      SERIAL_ECHOLNPGM("Encoder ", idx, ": ");
+      SERIAL_ECHOLNPAIR("Encoder ", idx, ": ");
       encoders[idx].get_raw_count();
       encoders[idx].passes_test(true);
     }
@@ -261,32 +261,32 @@ class I2CPositionEncodersMgr {
 
     static void report_error_count(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
-      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(axis_codes[axis]), " axis is ", encoders[idx].get_error_count());
+      SERIAL_ECHOLNPAIR("Error count on ", AS_CHAR(axis_codes[axis]), " axis is ", encoders[idx].get_error_count());
     }
 
     static void reset_error_count(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_error_count(0);
-      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(axis_codes[axis]), " axis has been reset.");
+      SERIAL_ECHOLNPAIR("Error count on ", AS_CHAR(axis_codes[axis]), " axis has been reset.");
     }
 
     static void enable_ec(const int8_t idx, const bool enabled, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_ec_enabled(enabled);
-      SERIAL_ECHOPGM("Error correction on ", AS_CHAR(axis_codes[axis]));
+      SERIAL_ECHOPAIR("Error correction on ", AS_CHAR(axis_codes[axis]));
       SERIAL_ECHO_TERNARY(encoders[idx].get_ec_enabled(), " axis is ", "en", "dis", "abled.\n");
     }
 
     static void set_ec_threshold(const int8_t idx, const float newThreshold, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_ec_threshold(newThreshold);
-      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis set to ", newThreshold, "mm.");
+      SERIAL_ECHOLNPAIR("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis set to ", newThreshold, "mm.");
     }
 
     static void get_ec_threshold(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
       const float threshold = encoders[idx].get_ec_threshold();
-      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis is ", threshold, "mm.");
+      SERIAL_ECHOLNPAIR("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis is ", threshold, "mm.");
     }
 
     static int8_t idx_from_axis(const AxisEnum axis) {
diff --git a/Marlin/src/feature/ethernet.cpp b/Marlin/src/feature/ethernet.cpp
index c5bfa93..d4a95fa 100644
--- a/Marlin/src/feature/ethernet.cpp
+++ b/Marlin/src/feature/ethernet.cpp
@@ -147,7 +147,7 @@ void MarlinEthernet::check() {
           " | Author: " STRING_CONFIG_H_AUTHOR
         );
       #endif
-      telnetClient.println(" Compiled: " __DATE__);
+      telnetClient.println("Compiled: " __DATE__);
 
       SERIAL_ECHOLNPGM("Client connected");
       have_telnet_client = true;
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 26817b9..41dbf43 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -36,7 +36,7 @@ FWRetract fwretract; // Single instance - this calls the constructor
 #include "../module/planner.h"
 #include "../module/stepper.h"
 
-#include "../gcode/gcode.h"
+#include "../gcode/parser.h"
 
 #if ENABLED(RETRACT_SYNC_MIXING)
   #include "mixing.h"
@@ -106,20 +106,20 @@ void FWRetract::retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool sw
   #endif
 
   /* // debugging
-    SERIAL_ECHOLNPGM(
+    SERIAL_ECHOLNPAIR(
       "retracting ", AS_DIGIT(retracting),
       " swapping ", swapping,
       " active extruder ", active_extruder
     );
     LOOP_L_N(i, EXTRUDERS) {
-      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
+      SERIAL_ECHOLNPAIR("retracted[", i, "] ", AS_DIGIT(retracted[i]));
       #if HAS_MULTI_EXTRUDER
-        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
+        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
       #endif
     }
-    SERIAL_ECHOLNPGM("current_position.z ", current_position.z);
-    SERIAL_ECHOLNPGM("current_position.e ", current_position.e);
-    SERIAL_ECHOLNPGM("current_hop ", current_hop);
+    SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
+    SERIAL_ECHOLNPAIR("current_position.e ", current_position.e);
+    SERIAL_ECHOLNPAIR("current_hop ", current_hop);
   //*/
 
   const float base_retract = TERN1(RETRACT_SYNC_MIXING, (MIXING_STEPPERS))
@@ -181,18 +181,18 @@ void FWRetract::retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool sw
   #endif
 
   /* // debugging
-    SERIAL_ECHOLNPGM("retracting ", AS_DIGIT(retracting));
-    SERIAL_ECHOLNPGM("swapping ", AS_DIGIT(swapping));
-    SERIAL_ECHOLNPGM("active_extruder ", active_extruder);
+    SERIAL_ECHOLNPAIR("retracting ", AS_DIGIT(retracting));
+    SERIAL_ECHOLNPAIR("swapping ", AS_DIGIT(swapping));
+    SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
     LOOP_L_N(i, EXTRUDERS) {
-      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
+      SERIAL_ECHOLNPAIR("retracted[", i, "] ", AS_DIGIT(retracted[i]));
       #if HAS_MULTI_EXTRUDER
-        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
+        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
       #endif
     }
-    SERIAL_ECHOLNPGM("current_position.z ", current_position.z);
-    SERIAL_ECHOLNPGM("current_position.e ", current_position.e);
-    SERIAL_ECHOLNPGM("current_hop ", current_hop);
+    SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
+    SERIAL_ECHOLNPAIR("current_position.e ", current_position.e);
+    SERIAL_ECHOLNPAIR("current_hop ", current_hop);
   //*/
 }
 
@@ -214,8 +214,9 @@ void FWRetract::M207() {
   if (parser.seenval('W')) settings.swap_retract_length   = parser.value_axis_units(E_AXIS);
 }
 
-void FWRetract::M207_report() {
-  SERIAL_ECHOLNPGM_P(
+void FWRetract::M207_report(const bool forReplay/*=false*/) {
+  if (!forReplay) { SERIAL_ECHO_MSG("; Retract: S<length> F<units/m> Z<lift>"); SERIAL_ECHO_START(); }
+  SERIAL_ECHOLNPAIR_P(
       PSTR("  M207 S"), LINEAR_UNIT(settings.retract_length)
     , PSTR(" W"), LINEAR_UNIT(settings.swap_retract_length)
     , PSTR(" F"), LINEAR_UNIT(MMS_TO_MMM(settings.retract_feedrate_mm_s))
@@ -239,8 +240,9 @@ void FWRetract::M208() {
   if (parser.seen('W')) settings.swap_retract_recover_extra         = parser.value_axis_units(E_AXIS);
 }
 
-void FWRetract::M208_report() {
-  SERIAL_ECHOLNPGM(
+void FWRetract::M208_report(const bool forReplay/*=false*/) {
+  if (!forReplay) { SERIAL_ECHO_MSG("; Recover: S<length> F<units/m>"); SERIAL_ECHO_START(); }
+  SERIAL_ECHOLNPAIR(
       "  M208 S", LINEAR_UNIT(settings.retract_recover_extra)
     , " W", LINEAR_UNIT(settings.swap_retract_recover_extra)
     , " F", LINEAR_UNIT(MMS_TO_MMM(settings.retract_recover_feedrate_mm_s))
@@ -260,8 +262,9 @@ void FWRetract::M208_report() {
       enable_autoretract(parser.value_bool());
   }
 
-  void FWRetract::M209_report() {
-    SERIAL_ECHOLNPGM("  M209 S", AS_DIGIT(autoretract_enabled));
+  void FWRetract::M209_report(const bool forReplay/*=false*/) {
+    if (!forReplay) { SERIAL_ECHO_MSG("; Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover"); SERIAL_ECHO_START(); }
+    SERIAL_ECHOLNPAIR("  M209 S", AS_DIGIT(autoretract_enabled));
   }
 
 #endif // FWRETRACT_AUTORETRACT
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index 9b0ff19..cd93e9c 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -76,13 +76,13 @@ public:
 
   static void retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool swapping = false));
 
-  static void M207_report();
   static void M207();
-  static void M208_report();
+  static void M207_report(const bool forReplay=false);
   static void M208();
+  static void M208_report(const bool forReplay=false);
   #if ENABLED(FWRETRACT_AUTORETRACT)
-    static void M209_report();
     static void M209();
+    static void M209_report(const bool forReplay=false);
   #endif
 };
 
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index 7f91c15..d8e6cef 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -68,13 +68,13 @@ Joystick joystick;
   void Joystick::report() {
     SERIAL_ECHOPGM("Joystick");
     #if HAS_JOY_ADC_X
-      SERIAL_ECHOPGM_P(SP_X_STR, JOY_X(x.raw));
+      SERIAL_ECHOPAIR_P(SP_X_STR, JOY_X(x.raw));
     #endif
     #if HAS_JOY_ADC_Y
-      SERIAL_ECHOPGM_P(SP_Y_STR, JOY_Y(y.raw));
+      SERIAL_ECHOPAIR_P(SP_Y_STR, JOY_Y(y.raw));
     #endif
     #if HAS_JOY_ADC_Z
-      SERIAL_ECHOPGM_P(SP_Z_STR, JOY_Z(z.raw));
+      SERIAL_ECHOPAIR_P(SP_Z_STR, JOY_Z(z.raw));
     #endif
     #if HAS_JOY_ADC_EN
       SERIAL_ECHO_TERNARY(READ(JOY_EN_PIN), " EN=", "HIGH (dis", "LOW (en", "abled)");
diff --git a/Marlin/src/feature/leds/pca9533.cpp b/Marlin/src/feature/leds/pca9533.cpp
index 914db21..0fd4d66 100644
--- a/Marlin/src/feature/leds/pca9533.cpp
+++ b/Marlin/src/feature/leds/pca9533.cpp
@@ -36,7 +36,7 @@ void PCA9533_init() {
   PCA9533_reset();
 }
 
-static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0) {
+static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0){
   uint8_t data[6] = { PCA9533_REG_PSC0 | PCA9533_REGM_AI, psc0, pwm0, psc1, pwm1, ls0 };
   Wire.beginTransmission(PCA9533_Addr >> 1);
   Wire.write(data, 6);
@@ -44,7 +44,7 @@ static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1,
   delayMicroseconds(1);
 }
 
-static void PCA9533_writeRegister(uint8_t reg, uint8_t val) {
+static void PCA9533_writeRegister(uint8_t reg, uint8_t val){
   uint8_t data[2] = { reg, val };
   Wire.beginTransmission(PCA9533_Addr >> 1);
   Wire.write(data, 2);
diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index e13c6f5..200e6b5 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -130,7 +130,7 @@ void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/
     SERIAL_ECHOPGM_P(func);
     SERIAL_CHAR('(');
     SERIAL_ECHO(v1);
-    if (v2 > 0) SERIAL_ECHOPGM(", ", v2);
+    if (v2 > 0) SERIAL_ECHOPAIR(", ", v2);
     SERIAL_CHAR(')');
     SERIAL_EOL();
   #else
diff --git a/Marlin/src/feature/meatpack.cpp b/Marlin/src/feature/meatpack.cpp
index 2edcd74..6803a0d 100644
--- a/Marlin/src/feature/meatpack.cpp
+++ b/Marlin/src/feature/meatpack.cpp
@@ -140,7 +140,7 @@ void MeatPack::handle_output_char(const uint8_t c) {
   #if ENABLED(MP_DEBUG)
     if (chars_decoded < 1024) {
       ++chars_decoded;
-      DEBUG_ECHOLNPGM("RB: ", AS_CHAR(c));
+      DEBUG_ECHOLNPAIR("RB: ", AS_CHAR(c));
     }
   #endif
 }
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index 9ebc901..4823ac2 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -106,32 +106,11 @@ void Mixer::reset_vtools() {
       MIXER_STEPPER_LOOP(i)
         color[t][i] = (i == 0) ? COLOR_A_MASK : 0;
   #endif
-
-  // MIXING_PRESETS: Set a variety of obvious mixes as presets
-  #if ENABLED(MIXING_PRESETS) && WITHIN(MIXING_STEPPERS, 2, 3)
-    #if MIXING_STEPPERS == 2
-      if (MIXING_VIRTUAL_TOOLS > 2) { collector[0] = 1; collector[1] = 1; mixer.normalize(2); } // 1:1
-      if (MIXING_VIRTUAL_TOOLS > 3) { collector[0] = 3;                   mixer.normalize(3); } // 3:1
-      if (MIXING_VIRTUAL_TOOLS > 4) { collector[0] = 1; collector[1] = 3; mixer.normalize(4); } // 1:3
-      if (MIXING_VIRTUAL_TOOLS > 5) {                   collector[1] = 2; mixer.normalize(5); } // 1:2
-      if (MIXING_VIRTUAL_TOOLS > 6) { collector[0] = 2; collector[1] = 1; mixer.normalize(6); } // 2:1
-      if (MIXING_VIRTUAL_TOOLS > 7) { collector[0] = 3; collector[1] = 2; mixer.normalize(7); } // 3:2
-    #else
-      if (MIXING_VIRTUAL_TOOLS > 3) { collector[0] = 1; collector[1] = 1; collector[2] = 1; mixer.normalize(3); } // 1:1:1
-      if (MIXING_VIRTUAL_TOOLS > 4) {                   collector[1] = 3; collector[2] = 0; mixer.normalize(4); } // 1:3:0
-      if (MIXING_VIRTUAL_TOOLS > 5) { collector[0] = 0;                   collector[2] = 1; mixer.normalize(5); } // 0:3:1
-      if (MIXING_VIRTUAL_TOOLS > 6) {                   collector[1] = 1;                   mixer.normalize(6); } // 0:1:1
-      if (MIXING_VIRTUAL_TOOLS > 7) { collector[0] = 1;                   collector[2] = 0; mixer.normalize(7); } // 1:1:0
-    #endif
-    ZERO(collector);
-  #endif
 }
 
 // called at boot
 void Mixer::init() {
 
-  ZERO(collector);
-
   reset_vtools();
 
   #if HAS_MIXER_SYNC_CHANNEL
@@ -140,6 +119,8 @@ void Mixer::init() {
       color[MIXER_AUTORETRACT_TOOL][i] = COLOR_A_MASK;
   #endif
 
+  ZERO(collector);
+
   #if EITHER(HAS_DUAL_MIXING, GRADIENT_MIX)
     update_mix_from_vtool();
   #endif
@@ -154,11 +135,11 @@ void Mixer::refresh_collector(const float proportion/*=1.0*/, const uint8_t t/*=
     cmax = _MAX(cmax, v);
     csum += v;
   }
-  //SERIAL_ECHOPGM("Mixer::refresh_collector(", proportion, ", ", t, ") cmax=", cmax, "  csum=", csum, "  color");
+  //SERIAL_ECHOPAIR("Mixer::refresh_collector(", proportion, ", ", t, ") cmax=", cmax, "  csum=", csum, "  color");
   const float inv_prop = proportion / csum;
   MIXER_STEPPER_LOOP(i) {
     c[i] = color[t][i] * inv_prop;
-    //SERIAL_ECHOPGM(" [", t, "][", i, "] = ", color[t][i], " (", c[i], ")  ");
+    //SERIAL_ECHOPAIR(" [", t, "][", i, "] = ", color[t][i], " (", c[i], ")  ");
   }
   //SERIAL_EOL();
 }
@@ -169,12 +150,14 @@ void Mixer::refresh_collector(const float proportion/*=1.0*/, const uint8_t t/*=
   #include "../module/planner.h"
 
   gradient_t Mixer::gradient = {
-    false,                      // enabled
-    {0},                        // color (array)
-    0, 0,                       // start_z, end_z
-    0, 1,                       // start_vtool, end_vtool
-    {0}, {0}                    // start_mix[], end_mix[]
-    OPTARG(GRADIENT_VTOOL, -1)  // vtool_index
+    false,    // enabled
+    {0},      // color (array)
+    0, 0,     // start_z, end_z
+    0, 1,     // start_vtool, end_vtool
+    {0}, {0}  // start_mix[], end_mix[]
+    #if ENABLED(GRADIENT_VTOOL)
+      , -1    // vtool_index
+    #endif
   };
 
   float Mixer::prev_z; // = 0
diff --git a/Marlin/src/feature/mixing.h b/Marlin/src/feature/mixing.h
index f700c7b..573b61c 100644
--- a/Marlin/src/feature/mixing.h
+++ b/Marlin/src/feature/mixing.h
@@ -152,7 +152,7 @@ class Mixer {
       MIXER_STEPPER_LOOP(i) mix[i] = mixer_perc_t(100.0f * color[j][i] / ctot);
 
       #ifdef MIXER_NORMALIZER_DEBUG
-        SERIAL_ECHOPGM("V-tool ", j, " [ ");
+        SERIAL_ECHOPAIR("V-tool ", j, " [ ");
         SERIAL_ECHOLIST_N(MIXING_STEPPERS, color[j][0], color[j][1], color[j][2], color[j][3], color[j][4], color[j][5]);
         SERIAL_ECHOPGM(" ] to Mix [ ");
         SERIAL_ECHOLIST_N(MIXING_STEPPERS, mix[0], mix[1], mix[2], mix[3], mix[4], mix[5]);
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index cf03eaf..1acd26f 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -169,7 +169,7 @@ void MMU2::mmu_loop() {
       if (rx_ok()) {
         sscanf(rx_buffer, "%huok\n", &version);
 
-        DEBUG_ECHOLNPGM("MMU => ", version, "\nMMU <= 'S2'");
+        DEBUG_ECHOLNPAIR("MMU => ", version, "\nMMU <= 'S2'");
 
         MMU2_COMMAND("S2");   // Read Build Number
         state = -3;
@@ -180,7 +180,7 @@ void MMU2::mmu_loop() {
       if (rx_ok()) {
         sscanf(rx_buffer, "%huok\n", &buildnr);
 
-        DEBUG_ECHOLNPGM("MMU => ", buildnr);
+        DEBUG_ECHOLNPAIR("MMU => ", buildnr);
 
         check_version();
 
@@ -217,7 +217,7 @@ void MMU2::mmu_loop() {
       if (rx_ok()) {
         sscanf(rx_buffer, "%hhuok\n", &finda);
 
-        DEBUG_ECHOLNPGM("MMU => ", finda, "\nMMU - ENABLED");
+        DEBUG_ECHOLNPAIR("MMU => ", finda, "\nMMU - ENABLED");
 
         _enabled = true;
         state = 1;
@@ -230,7 +230,7 @@ void MMU2::mmu_loop() {
         if (WITHIN(cmd, MMU_CMD_T0, MMU_CMD_T0 + EXTRUDERS - 1)) {
           // tool change
           int filament = cmd - MMU_CMD_T0;
-          DEBUG_ECHOLNPGM("MMU <= T", filament);
+          DEBUG_ECHOLNPAIR("MMU <= T", filament);
           tx_printf_P(PSTR("T%d\n"), filament);
           TERN_(MMU_EXTRUDER_SENSOR, mmu_idl_sens = 1); // enable idler sensor, if any
           state = 3; // wait for response
@@ -238,7 +238,7 @@ void MMU2::mmu_loop() {
         else if (WITHIN(cmd, MMU_CMD_L0, MMU_CMD_L0 + EXTRUDERS - 1)) {
           // load
           int filament = cmd - MMU_CMD_L0;
-          DEBUG_ECHOLNPGM("MMU <= L", filament);
+          DEBUG_ECHOLNPAIR("MMU <= L", filament);
           tx_printf_P(PSTR("L%d\n"), filament);
           state = 3; // wait for response
         }
@@ -258,7 +258,7 @@ void MMU2::mmu_loop() {
         else if (WITHIN(cmd, MMU_CMD_E0, MMU_CMD_E0 + EXTRUDERS - 1)) {
           // eject filament
           int filament = cmd - MMU_CMD_E0;
-          DEBUG_ECHOLNPGM("MMU <= E", filament);
+          DEBUG_ECHOLNPAIR("MMU <= E", filament);
           tx_printf_P(PSTR("E%d\n"), filament);
           state = 3; // wait for response
         }
@@ -271,7 +271,7 @@ void MMU2::mmu_loop() {
         else if (WITHIN(cmd, MMU_CMD_F0, MMU_CMD_F0 + EXTRUDERS - 1)) {
           // filament type
           int filament = cmd - MMU_CMD_F0;
-          DEBUG_ECHOLNPGM("MMU <= F", filament, " ", cmd_arg);
+          DEBUG_ECHOLNPAIR("MMU <= F", filament, " ", cmd_arg);
           tx_printf_P(PSTR("F%d %d\n"), filament, cmd_arg);
           state = 3; // wait for response
         }
@@ -647,7 +647,7 @@ static void mmu2_not_responding() {
 
   void MMU2::mmu_continue_loading() {
     for (uint8_t i = 0; i < MMU_LOADING_ATTEMPTS_NR; i++) {
-      DEBUG_ECHOLNPGM("Additional load attempt #", i);
+      DEBUG_ECHOLNPAIR("Additional load attempt #", i);
       if (FILAMENT_PRESENT()) break;
       command(MMU_CMD_C0);
       manage_response(true, true);
@@ -962,7 +962,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
     BUZZ(200, 404);
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover")));
-    TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
+    wait_for_user_response();
     BUZZ(200, 404);
     BUZZ(200, 404);
 
@@ -1025,7 +1025,7 @@ void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
     const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("E step ", es, "/", fr_mm_m);
+    DEBUG_ECHOLNPAIR("E step ", es, "/", fr_mm_m);
 
     current_position.e += es;
     line_to_current_position(MMM_TO_MMS(fr_mm_m));
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 6dfd19a..94c564a 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -53,8 +53,6 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #include "../lcd/marlinui.h"
@@ -132,7 +130,7 @@ fil_change_settings_t fc_settings[EXTRUDERS];
  */
 static bool ensure_safe_temperature(const bool wait=true, const PauseMode mode=PAUSE_MODE_SAME) {
   DEBUG_SECTION(est, "ensure_safe_temperature", true);
-  DEBUG_ECHOLNPGM("... wait:", wait, " mode:", mode);
+  DEBUG_ECHOLNPAIR("... wait:", wait, " mode:", mode);
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder))
@@ -178,7 +176,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
                    DXC_ARGS
 ) {
   DEBUG_SECTION(lf, "load_filament", true);
-  DEBUG_ECHOLNPGM("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " showlcd:", show_lcd, " pauseforuser:", pause_for_user, " pausemode:", mode DXC_SAY);
+  DEBUG_ECHOLNPAIR("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " showlcd:", show_lcd, " pauseforuser:", pause_for_user, " pausemode:", mode DXC_SAY);
 
   if (!ensure_safe_temperature(false, mode)) {
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_STATUS, mode);
@@ -193,26 +191,15 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     KEEPALIVE_STATE(PAUSED_FOR_USER);
     wait_for_user = true;    // LCD click or M108 will clear this
-
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Load Filament")));
-
     #if ENABLED(HOST_PROMPT_SUPPORT)
       const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, active_extruder);
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Load Filament T"), tool, CONTINUE_STR);
     #endif
 
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Load Filament")));
+
     while (wait_for_user) {
       impatient_beep(max_beep_count);
-      #if BOTH(FILAMENT_CHANGE_RESUME_ON_INSERT, FILAMENT_RUNOUT_SENSOR)
-        #if ENABLED(MULTI_FILAMENT_SENSOR)
-          #define _CASE_INSERTED(N) case N-1: if (READ(FIL_RUNOUT##N##_PIN) != FIL_RUNOUT##N##_STATE) wait_for_user = false; break;
-          switch (active_extruder) {
-            REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_INSERTED)
-          }
-        #else
-          if (READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_STATE) wait_for_user = false;
-        #endif
-      #endif
       idle_no_sleep();
     }
   }
@@ -225,8 +212,6 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
     set_duplication_enabled(false, DXC_ext);
   #endif
 
-  TERN_(BELTPRINTER, do_blocking_move_to_xy(0.00, 50.00));
-
   // Slow Load filament
   if (slow_load_length) unscaled_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
 
@@ -252,9 +237,8 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_PURGE);
 
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE)));
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR));
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging...")));
     wait_for_user = true; // A click or M108 breaks the purge_length loop
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
       unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
@@ -278,7 +262,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
           // Show "Purge More" / "Resume" menu and wait for reply
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
-          #if EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD_ENHANCED)
+          #if HAS_LCD_MENU
             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
           #else
             pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
@@ -288,7 +272,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
       #endif
 
       // Keep looping if "Purge More" was selected
-    } while (TERN0(M600_PURGE_MORE_RESUMABLE, pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE));
+    } while (TERN0(M600_PURGE_MORE_RESUMABLE, show_lcd && pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE));
 
   #endif
   TERN_(HOST_PROMPT_SUPPORT, host_action_prompt_end());
@@ -325,7 +309,7 @@ bool unload_filament(const_float_t unload_length, const bool show_lcd/*=false*/,
                      #endif
 ) {
   DEBUG_SECTION(uf, "unload_filament", true);
-  DEBUG_ECHOLNPGM("... unloadlen:", unload_length, " showlcd:", show_lcd, " mode:", mode
+  DEBUG_ECHOLNPAIR("... unloadlen:", unload_length, " showlcd:", show_lcd, " mode:", mode
     #if BOTH(FILAMENT_UNLOAD_ALL_EXTRUDERS, MIXING_EXTRUDER)
       , " mixmult:", mix_multiplier
     #endif
@@ -389,7 +373,7 @@ uint8_t did_pause_print = 0;
 
 bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool show_lcd/*=false*/, const_float_t unload_length/*=0*/ DXC_ARGS) {
   DEBUG_SECTION(pp, "pause_print", true);
-  DEBUG_ECHOLNPGM("... park.x:", park_point.x, " y:", park_point.y, " z:", park_point.z, " unloadlen:", unload_length, " showlcd:", show_lcd DXC_SAY);
+  DEBUG_ECHOLNPAIR("... park.x:", park_point.x, " y:", park_point.y, " z:", park_point.z, " unloadlen:", unload_length, " showlcd:", show_lcd DXC_SAY);
 
   UNUSED(show_lcd);
 
@@ -440,7 +424,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
 
   // Initial retract before move to filament change position
   if (retract && thermalManager.hotEnoughToExtrude(active_extruder)) {
-    DEBUG_ECHOLNPGM("... retract:", retract);
+    DEBUG_ECHOLNPAIR("... retract:", retract);
     unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
   }
 
@@ -482,7 +466,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
 
 void show_continue_prompt(const bool is_reload) {
   DEBUG_SECTION(scp, "pause_print", true);
-  DEBUG_ECHOLNPGM("... is_reload:", is_reload);
+  DEBUG_ECHOLNPAIR("... is_reload:", is_reload);
 
   ui.pause_show_message(is_reload ? PAUSE_MESSAGE_INSERT : PAUSE_MESSAGE_WAITING);
   SERIAL_ECHO_START();
@@ -491,7 +475,7 @@ void show_continue_prompt(const bool is_reload) {
 
 void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
   DEBUG_SECTION(wfc, "wait_for_confirmation", true);
-  DEBUG_ECHOLNPGM("... is_reload:", is_reload, " maxbeep:", max_beep_count DXC_SAY);
+  DEBUG_ECHOLNPAIR("... is_reload:", is_reload, " maxbeep:", max_beep_count DXC_SAY);
 
   bool nozzle_timed_out = false;
 
@@ -532,14 +516,12 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_HEATER_TIMEOUT)));
 
-      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(0, true)); // Wait for LCD click or M108
+      wait_for_user_response(0, true); // Wait for LCD click or M108
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, GET_TEXT(MSG_REHEATING)));
 
       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING)));
 
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status_P(GET_TEXT(MSG_REHEATING)));
-
       // Re-enable the heaters if they timed out
       HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);
 
@@ -553,14 +535,11 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       const millis_t nozzle_timeout = SEC_TO_MS(PAUSE_PARK_NOZZLE_TIMEOUT);
 
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
-
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_REHEATDONE), CONTINUE_STR));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status_P(GET_TEXT(MSG_REHEATDONE)));
-
-      IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
-
+      wait_for_user = true;
       nozzle_timed_out = false;
+
       first_impatient_beep(max_beep_count);
     }
     idle_no_sleep();
@@ -592,10 +571,10 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
  */
 void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_length/*=0*/, const_float_t purge_length/*=ADVANCED_PAUSE_PURGE_LENGTH*/, const int8_t max_beep_count/*=0*/, const celsius_t targetTemp/*=0*/ DXC_ARGS) {
   DEBUG_SECTION(rp, "resume_print", true);
-  DEBUG_ECHOLNPGM("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " targetTemp:", targetTemp DXC_SAY);
+  DEBUG_ECHOLNPAIR("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " targetTemp:", targetTemp DXC_SAY);
 
   /*
-  SERIAL_ECHOLNPGM(
+  SERIAL_ECHOLNPAIR(
     "start of resume_print()\ndual_x_carriage_mode:", dual_x_carriage_mode,
     "\nextruder_duplication_enabled:", extruder_duplication_enabled,
     "\nactive_extruder:", active_extruder,
@@ -626,7 +605,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
   ui.pause_show_message(PAUSE_MESSAGE_RESUME);
 
   // Check Temperature before moving hotend
-  ensure_safe_temperature(DISABLED(BELTPRINTER));
+  ensure_safe_temperature();
 
   // Retract to prevent oozing
   unscaled_e_move(-(PAUSE_PARK_RETRACT_LENGTH), feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
@@ -693,7 +672,6 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
   TERN_(HAS_LCD_MENU, ui.return_to_status());
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen());
 }
 
 #endif // ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index b86249f..9b173d6 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -26,7 +26,10 @@
 
 #include "../inc/MarlinConfig.h"
 
+#if ENABLED(AUTO_POWER_CONTROL)
+
 #include "power.h"
+#include "../module/temperature.h"
 #include "../module/stepper/indirection.h"
 #include "../MarlinCore.h"
 
@@ -38,183 +41,133 @@
   #include "../gcode/gcode.h"
 #endif
 
-#if EITHER(PSU_CONTROL, AUTO_POWER_CONTROL)
-
-Power powerManager;
-bool Power::psu_on;
-
-#if ENABLED(AUTO_POWER_CONTROL)
-  #include "../module/temperature.h"
-
-  #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
-    #include "controllerfan.h"
-  #endif
-
-  millis_t Power::lastPowerOn;
+#if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
+  #include "controllerfan.h"
 #endif
 
-/**
- * Initialize pins & state for the power manager.
- *
- */
-void Power::init() {
-  psu_on = ENABLED(PSU_DEFAULT_OFF);              // Set opposite state to get full power_off/on
-  TERN(PSU_DEFAULT_OFF, power_off(), power_on());
+Power powerManager;
+
+millis_t Power::lastPowerOn;
+
+bool Power::is_power_needed() {
+
+  if (printJobOngoing() || printingIsPaused()) return true;
+
+  #if ENABLED(AUTO_POWER_FANS)
+    FANS_LOOP(i) if (thermalManager.fan_speed[i]) return true;
+  #endif
+
+  #if ENABLED(AUTO_POWER_E_FANS)
+    HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
+  #endif
+
+  #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
+    if (controllerFan.state()) return true;
+  #endif
+
+  if (TERN0(AUTO_POWER_CHAMBER_FAN, thermalManager.chamberfan_speed))
+    return true;
+
+  if (TERN0(AUTO_POWER_COOLER_FAN, thermalManager.coolerfan_speed))
+    return true;
+
+  // If any of the drivers or the bed are enabled...
+  if (X_ENABLE_READ() == X_ENABLE_ON || Y_ENABLE_READ() == Y_ENABLE_ON || Z_ENABLE_READ() == Z_ENABLE_ON
+    #if HAS_X2_ENABLE
+      || X2_ENABLE_READ() == X_ENABLE_ON
+    #endif
+    #if HAS_Y2_ENABLE
+      || Y2_ENABLE_READ() == Y_ENABLE_ON
+    #endif
+    #if HAS_Z2_ENABLE
+      || Z2_ENABLE_READ() == Z_ENABLE_ON
+    #endif
+    #if E_STEPPERS
+      #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
+      REPEAT(E_STEPPERS, _OR_ENABLED_E)
+    #endif
+  ) return true;
+
+  #if HAS_HOTEND
+    HOTEND_LOOP() if (thermalManager.degTargetHotend(e) > 0 || thermalManager.temp_hotend[e].soft_pwm_amount > 0) return true;
+  #endif
+
+  if (TERN0(HAS_HEATED_BED, thermalManager.degTargetBed() > 0 || thermalManager.temp_bed.soft_pwm_amount > 0)) return true;
+
+  #if HAS_HOTEND && AUTO_POWER_E_TEMP
+    HOTEND_LOOP() if (thermalManager.degHotend(e) >= (AUTO_POWER_E_TEMP)) return true;
+  #endif
+
+  #if HAS_HEATED_CHAMBER && AUTO_POWER_CHAMBER_TEMP
+    if (thermalManager.degChamber() >= (AUTO_POWER_CHAMBER_TEMP)) return true;
+  #endif
+
+  #if HAS_COOLER && AUTO_POWER_COOLER_TEMP
+    if (thermalManager.degCooler() >= (AUTO_POWER_COOLER_TEMP)) return true;
+  #endif
+
+  return false;
+}
+
+#ifndef POWER_TIMEOUT
+  #define POWER_TIMEOUT 0
+#endif
+
+void Power::check(const bool pause) {
+  static bool _pause = false;
+  static millis_t nextPowerCheck = 0;
+  const millis_t now = millis();
+  #if POWER_TIMEOUT > 0
+    if (pause != _pause) {
+      lastPowerOn = now + !now;
+      _pause = pause;
+    }
+    if (pause) return;
+  #endif
+  if (ELAPSED(now, nextPowerCheck)) {
+    nextPowerCheck = now + 2500UL;
+    if (is_power_needed())
+      power_on();
+    else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(now, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT))))
+      power_off();
+  }
 }
 
-/**
- * Power on if the power is currently off.
- * Restores stepper drivers and processes any PSU_POWERUP_GCODE.
- *
- */
 void Power::power_on() {
-  #if ENABLED(AUTO_POWER_CONTROL)
-    const millis_t now = millis();
-    lastPowerOn = now + !now;
-  #endif
-
-  if (psu_on) return;
-
-  OUT_WRITE(PS_ON_PIN, PSU_ACTIVE_STATE);
-  psu_on = true;
-  safe_delay(PSU_POWERUP_DELAY);
-  restore_stepper_drivers();
-  TERN_(HAS_TRINAMIC_CONFIG, safe_delay(PSU_POWERUP_DELAY));
-
-  #ifdef PSU_POWERUP_GCODE
-    GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWERUP_GCODE));
-  #endif
+  const millis_t now = millis();
+  lastPowerOn = now + !now;
+  if (!powersupply_on) {
+    PSU_PIN_ON();
+    safe_delay(PSU_POWERUP_DELAY);
+    restore_stepper_drivers();
+    TERN_(HAS_TRINAMIC_CONFIG, safe_delay(PSU_POWERUP_DELAY));
+    #ifdef PSU_POWERUP_GCODE
+      GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWERUP_GCODE));
+    #endif
+  }
 }
 
-/**
- * Power off if the power is currently on.
- * Processes any PSU_POWEROFF_GCODE and makes a PS_OFF_SOUND if enabled.
- *
- */
 void Power::power_off() {
-  if (!psu_on) return;
+  if (powersupply_on) {
+    #ifdef PSU_POWEROFF_GCODE
+      GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWEROFF_GCODE));
+    #endif
 
-  #ifdef PSU_POWEROFF_GCODE
-    GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWEROFF_GCODE));
-  #endif
+    #if ENABLED(PS_OFF_SOUND)
+      BUZZ(1000, 659);
+    #endif
 
-  #if ENABLED(PS_OFF_SOUND)
-    BUZZ(1000, 659);
-  #endif
-
-  OUT_WRITE(PS_ON_PIN, !PSU_ACTIVE_STATE);
-  psu_on = false;
+    PSU_PIN_OFF();
+  }
 }
 
-
-#if ENABLED(AUTO_POWER_CONTROL)
-
-  #ifndef POWER_TIMEOUT
-    #define POWER_TIMEOUT 0
-  #endif
-
-  /**
-   * Check all conditions that would signal power needing to be on.
-   *
-   * @returns bool  if power is needed
-   */
-  bool Power::is_power_needed() {
-
-    if (printJobOngoing() || printingIsPaused()) return true;
-
-    #if ENABLED(AUTO_POWER_FANS)
-      FANS_LOOP(i) if (thermalManager.fan_speed[i]) return true;
-    #endif
-
-    #if ENABLED(AUTO_POWER_E_FANS)
-      HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
-    #endif
-
-    #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
-      if (controllerFan.state()) return true;
-    #endif
-
-    if (TERN0(AUTO_POWER_CHAMBER_FAN, thermalManager.chamberfan_speed))
-      return true;
-
-    if (TERN0(AUTO_POWER_COOLER_FAN, thermalManager.coolerfan_speed))
-      return true;
-
-    // If any of the drivers or the bed are enabled...
-    if (X_ENABLE_READ() == X_ENABLE_ON || Y_ENABLE_READ() == Y_ENABLE_ON || Z_ENABLE_READ() == Z_ENABLE_ON
-      #if HAS_X2_ENABLE
-        || X2_ENABLE_READ() == X_ENABLE_ON
-      #endif
-      #if HAS_Y2_ENABLE
-        || Y2_ENABLE_READ() == Y_ENABLE_ON
-      #endif
-      #if HAS_Z2_ENABLE
-        || Z2_ENABLE_READ() == Z_ENABLE_ON
-      #endif
-      #if E_STEPPERS
-        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
-        REPEAT(E_STEPPERS, _OR_ENABLED_E)
-      #endif
-    ) return true;
-
-    #if HAS_HOTEND
-      HOTEND_LOOP() if (thermalManager.degTargetHotend(e) > 0 || thermalManager.temp_hotend[e].soft_pwm_amount > 0) return true;
-    #endif
-
-    if (TERN0(HAS_HEATED_BED, thermalManager.degTargetBed() > 0 || thermalManager.temp_bed.soft_pwm_amount > 0)) return true;
-
-    #if HAS_HOTEND && AUTO_POWER_E_TEMP
-      HOTEND_LOOP() if (thermalManager.degHotend(e) >= (AUTO_POWER_E_TEMP)) return true;
-    #endif
-
-    #if HAS_HEATED_CHAMBER && AUTO_POWER_CHAMBER_TEMP
-      if (thermalManager.degChamber() >= (AUTO_POWER_CHAMBER_TEMP)) return true;
-    #endif
-
-    #if HAS_COOLER && AUTO_POWER_COOLER_TEMP
-      if (thermalManager.degCooler() >= (AUTO_POWER_COOLER_TEMP)) return true;
-    #endif
-
-    return false;
-  }
-
-  /**
-   * Check if we should power off automatically (POWER_TIMEOUT elapsed, !is_power_needed).
-   *
-   * @param pause  pause the 'timer'
-   */
-  void Power::check(const bool pause) {
-    static millis_t nextPowerCheck = 0;
-    const millis_t now = millis();
-    #if POWER_TIMEOUT > 0
-      static bool _pause = false;
-      if (pause != _pause) {
-        lastPowerOn = now + !now;
-        _pause = pause;
-      }
-      if (pause) return;
-    #endif
-    if (ELAPSED(now, nextPowerCheck)) {
-      nextPowerCheck = now + 2500UL;
-      if (is_power_needed())
-        power_on();
-      else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(now, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT))))
-        power_off();
-    }
-  }
-
-  #if POWER_OFF_DELAY > 0
-
-    /**
-     * Power off with a delay. Power off is triggered by check() after the delay.
-     *
-     */
-    void Power::power_off_soon() {
-      lastPowerOn = millis() - SEC_TO_MS(POWER_TIMEOUT) + SEC_TO_MS(POWER_OFF_DELAY);
-    }
-
+void Power::power_off_soon() {
+  #if POWER_OFF_DELAY
+    lastPowerOn = millis() - SEC_TO_MS(POWER_TIMEOUT) + SEC_TO_MS(POWER_OFF_DELAY);
+    //if (!lastPowerOn) ++lastPowerOn;
+  #else
+    power_off();
   #endif
+}
 
 #endif // AUTO_POWER_CONTROL
-
-#endif // PSU_CONTROL || AUTO_POWER_CONTROL
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 7f5a97e..bca5432 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -25,32 +25,17 @@
  * power.h - power control
  */
 
-#if ENABLED(AUTO_POWER_CONTROL)
-  #include "../core/millis_t.h"
-#endif
+#include "../core/millis_t.h"
 
 class Power {
   public:
-    static bool psu_on;
-
-    static void init();
+    static void check(const bool pause);
     static void power_on();
     static void power_off();
-
-  #if ENABLED(AUTO_POWER_CONTROL) && POWER_OFF_DELAY > 0
     static void power_off_soon();
-  #else
-    static inline void power_off_soon() { power_off(); }
-  #endif
-
-  #if ENABLED(AUTO_POWER_CONTROL)
-    static void check(const bool pause);
-
-    private:
-      static millis_t lastPowerOn;
-      static bool is_power_needed();
-
-  #endif
+  private:
+    static millis_t lastPowerOn;
+    static bool is_power_needed();
 };
 
 extern Power powerManager;
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 159121b..a512022 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -40,7 +40,7 @@ uint8_t PrintJobRecovery::queue_index_r;
 uint32_t PrintJobRecovery::cmd_sdpos, // = 0
          PrintJobRecovery::sdpos[BUFSIZE];
 
-#if HAS_DWIN_E3V2_BASIC
+#if ENABLED(DWIN_CREALITY_LCD)
   bool PrintJobRecovery::dwin_flag; // = false
 #endif
 
@@ -386,7 +386,7 @@ void PrintJobRecovery::resume() {
           ), dtostrf(z_now, 1, 3, str_1));
     gcode.process_subcommands_now(cmd);
 
-  #elif DISABLED(BELTPRINTER)
+  #else
 
     #if ENABLED(POWER_LOSS_RECOVER_ZHOME) && defined(POWER_LOSS_ZHOME_POS)
       #define HOMING_Z_DOWN 1
@@ -577,7 +577,7 @@ void PrintJobRecovery::resume() {
 
   void PrintJobRecovery::debug(PGM_P const prefix) {
     DEBUG_ECHOPGM_P(prefix);
-    DEBUG_ECHOLNPGM(" Job Recovery Info...\nvalid_head:", info.valid_head, " valid_foot:", info.valid_foot);
+    DEBUG_ECHOLNPAIR(" Job Recovery Info...\nvalid_head:", info.valid_head, " valid_foot:", info.valid_foot);
     if (info.valid_head) {
       if (info.valid_head == info.valid_foot) {
         DEBUG_ECHOPGM("current_position: ");
@@ -587,14 +587,14 @@ void PrintJobRecovery::resume() {
         }
         DEBUG_EOL();
 
-        DEBUG_ECHOLNPGM("feedrate: ", info.feedrate);
+        DEBUG_ECHOLNPAIR("feedrate: ", info.feedrate);
 
-        DEBUG_ECHOLNPGM("zraise: ", info.zraise, " ", info.flag.raised ? "(before)" : "");
+        DEBUG_ECHOLNPAIR("zraise: ", info.zraise, " ", info.flag.raised ? "(before)" : "");
 
         #if ENABLED(GCODE_REPEAT_MARKERS)
-          DEBUG_ECHOLNPGM("repeat index: ", info.stored_repeat.index);
+          DEBUG_ECHOLNPAIR("repeat index: ", info.stored_repeat.index);
           LOOP_L_N(i, info.stored_repeat.index)
-            DEBUG_ECHOLNPGM("..... sdpos: ", info.stored_repeat.marker.sdpos, " count: ", info.stored_repeat.marker.counter);
+            DEBUG_ECHOLNPAIR("..... sdpos: ", info.stored_repeat.marker.sdpos, " count: ", info.stored_repeat.marker.counter);
         #endif
 
         #if HAS_HOME_OFFSET
@@ -616,12 +616,12 @@ void PrintJobRecovery::resume() {
         #endif
 
         #if HAS_MULTI_EXTRUDER
-          DEBUG_ECHOLNPGM("active_extruder: ", info.active_extruder);
+          DEBUG_ECHOLNPAIR("active_extruder: ", info.active_extruder);
         #endif
 
         #if DISABLED(NO_VOLUMETRICS)
           DEBUG_ECHOPGM("filament_size:");
-          LOOP_L_N(i, EXTRUDERS) DEBUG_ECHOLNPGM(" ", info.filament_size[i]);
+          LOOP_L_N(i, EXTRUDERS) DEBUG_ECHOLNPAIR(" ", info.filament_size[i]);
           DEBUG_EOL();
         #endif
 
@@ -635,7 +635,7 @@ void PrintJobRecovery::resume() {
         #endif
 
         #if HAS_HEATED_BED
-          DEBUG_ECHOLNPGM("target_temperature_bed: ", info.target_temperature_bed);
+          DEBUG_ECHOLNPAIR("target_temperature_bed: ", info.target_temperature_bed);
         #endif
 
         #if HAS_FAN
@@ -648,7 +648,7 @@ void PrintJobRecovery::resume() {
         #endif
 
         #if HAS_LEVELING
-          DEBUG_ECHOLNPGM("leveling: ", info.flag.leveling ? "ON" : "OFF", "  fade: ", info.fade);
+          DEBUG_ECHOLNPAIR("leveling: ", info.flag.leveling ? "ON" : "OFF", "  fade: ", info.fade);
         #endif
 
         #if ENABLED(FWRETRACT)
@@ -658,17 +658,17 @@ void PrintJobRecovery::resume() {
             if (e < EXTRUDERS - 1) DEBUG_CHAR(',');
           }
           DEBUG_EOL();
-          DEBUG_ECHOLNPGM("retract_hop: ", info.retract_hop);
+          DEBUG_ECHOLNPAIR("retract_hop: ", info.retract_hop);
         #endif
 
         // Mixing extruder and gradient
         #if BOTH(MIXING_EXTRUDER, GRADIENT_MIX)
-          DEBUG_ECHOLNPGM("gradient: ", info.gradient.enabled ? "ON" : "OFF");
+          DEBUG_ECHOLNPAIR("gradient: ", info.gradient.enabled ? "ON" : "OFF");
         #endif
 
-        DEBUG_ECHOLNPGM("sd_filename: ", info.sd_filename);
-        DEBUG_ECHOLNPGM("sdpos: ", info.sdpos);
-        DEBUG_ECHOLNPGM("print_job_elapsed: ", info.print_job_elapsed);
+        DEBUG_ECHOLNPAIR("sd_filename: ", info.sd_filename);
+        DEBUG_ECHOLNPAIR("sdpos: ", info.sdpos);
+        DEBUG_ECHOLNPAIR("print_job_elapsed: ", info.print_job_elapsed);
 
         DEBUG_ECHOPGM("axis_relative:");
         if (TEST(info.axis_relative, REL_X)) DEBUG_ECHOPGM(" REL_X");
@@ -679,9 +679,9 @@ void PrintJobRecovery::resume() {
         if (TEST(info.axis_relative, E_MODE_REL)) DEBUG_ECHOPGM(" E_MODE_REL");
         DEBUG_EOL();
 
-        DEBUG_ECHOLNPGM("flag.dryrun: ", AS_DIGIT(info.flag.dryrun));
-        DEBUG_ECHOLNPGM("flag.allow_cold_extrusion: ", AS_DIGIT(info.flag.allow_cold_extrusion));
-        DEBUG_ECHOLNPGM("flag.volumetric_enabled: ", AS_DIGIT(info.flag.volumetric_enabled));
+        DEBUG_ECHOLNPAIR("flag.dryrun: ", AS_DIGIT(info.flag.dryrun));
+        DEBUG_ECHOLNPAIR("flag.allow_cold_extrusion: ", AS_DIGIT(info.flag.allow_cold_extrusion));
+        DEBUG_ECHOLNPAIR("flag.volumetric_enabled: ", AS_DIGIT(info.flag.volumetric_enabled));
       }
       else
         DEBUG_ECHOLNPGM("INVALID DATA");
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 6a13c92..d3ecc6c 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -145,7 +145,7 @@ class PrintJobRecovery {
     static uint32_t cmd_sdpos,        //!< SD position of the next command
                     sdpos[BUFSIZE];   //!< SD positions of queued commands
 
-    #if HAS_DWIN_E3V2_BASIC
+    #if ENABLED(DWIN_CREALITY_LCD)
       static bool dwin_flag;
     #endif
 
diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index 68984fe..e39896d 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -38,12 +38,16 @@ int16_t ProbeTempComp::z_offsets_probe[cali_info_init[TSI_PROBE].measurements],
 
 int16_t *ProbeTempComp::sensor_z_offsets[TSI_COUNT] = {
   ProbeTempComp::z_offsets_probe, ProbeTempComp::z_offsets_bed
-  OPTARG(USE_TEMP_EXT_COMPENSATION, ProbeTempComp::z_offsets_ext)
+  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
+    , ProbeTempComp::z_offsets_ext
+  #endif
 };
 
 const temp_calib_t ProbeTempComp::cali_info[TSI_COUNT] = {
   cali_info_init[TSI_PROBE], cali_info_init[TSI_BED]
-  OPTARG(USE_TEMP_EXT_COMPENSATION, cali_info_init[TSI_EXT])
+  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
+    , cali_info_init[TSI_EXT]
+  #endif
 };
 
 constexpr xyz_pos_t ProbeTempComp::park_point;
@@ -75,7 +79,7 @@ void ProbeTempComp::print_offsets() {
         #endif
         PSTR("Probe")
       );
-      SERIAL_ECHOLNPGM(
+      SERIAL_ECHOLNPAIR(
         " temp: ", temp,
         "C; Offset: ", i < 0 ? 0.0f : sensor_z_offsets[s][i], " um"
       );
@@ -117,7 +121,7 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
   // Extrapolate
   float k, d;
   if (calib_idx < measurements) {
-    SERIAL_ECHOLNPGM("Got ", calib_idx, " measurements. ");
+    SERIAL_ECHOLNPAIR("Got ", calib_idx, " measurements. ");
     if (linear_regression(tsi, k, d)) {
       SERIAL_ECHOPGM("Applying linear extrapolation");
       calib_idx--;
diff --git a/Marlin/src/feature/repeat.cpp b/Marlin/src/feature/repeat.cpp
index 165f71f..11e4dd6 100644
--- a/Marlin/src/feature/repeat.cpp
+++ b/Marlin/src/feature/repeat.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(GCODE_REPEAT_MARKERS)
@@ -44,7 +43,7 @@ void Repeat::add_marker(const uint32_t sdpos, const uint16_t count) {
     marker[index].sdpos = sdpos;
     marker[index].counter = count ?: -1;
     index++;
-    DEBUG_ECHOLNPGM("Add Marker ", index, " at ", sdpos, " (", count, ")");
+    DEBUG_ECHOLNPAIR("Add Marker ", index, " at ", sdpos, " (", count, ")");
   }
 }
 
@@ -54,14 +53,14 @@ void Repeat::loop() {
   else {
     const uint8_t ind = index - 1;      // Active marker's index
     if (!marker[ind].counter) {         // Did its counter run out?
-      DEBUG_ECHOLNPGM("Pass Marker ", index);
+      DEBUG_ECHOLNPAIR("Pass Marker ", index);
       index--;                          //  Carry on. Previous marker on the next 'M808'.
     }
     else {
       card.setIndex(marker[ind].sdpos); // Loop back to the marker.
       if (marker[ind].counter > 0)      // Ignore a negative (or zero) counter.
         --marker[ind].counter;          // Decrement the counter. If zero this 'M808' will be skipped next time.
-      DEBUG_ECHOLNPGM("Goto Marker ", index, " at ", marker[ind].sdpos, " (", marker[ind].counter, ")");
+      DEBUG_ECHOLNPAIR("Goto Marker ", index, " at ", marker[ind].sdpos, " (", marker[ind].counter, ")");
     }
   }
 }
@@ -70,7 +69,7 @@ void Repeat::cancel() { LOOP_L_N(i, index) marker[i].counter = 0; }
 
 void Repeat::early_parse_M808(char * const cmd) {
   if (is_command_M808(cmd)) {
-    DEBUG_ECHOLNPGM("Parsing \"", cmd, "\"");
+    DEBUG_ECHOLNPAIR("Parsing \"", cmd, "\"");
     parser.parse(cmd);
     if (parser.seen('L'))
       add_marker(card.getIndex(), parser.value_ushort());
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 1c56378..531ca10 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -68,8 +68,6 @@ bool FilamentMonitorBase::enabled = true,
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 void event_filament_runout(const uint8_t extruder) {
@@ -88,7 +86,6 @@ void event_filament_runout(const uint8_t extruder) {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getTool(extruder)));
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_FilamentRunout(extruder));
 
   #if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR)
     const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder);
@@ -132,7 +129,7 @@ void event_filament_runout(const uint8_t extruder) {
       char script[strlen(FILAMENT_RUNOUT_SCRIPT) + 1];
       sprintf_P(script, PSTR(FILAMENT_RUNOUT_SCRIPT), tool);
       #if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
-        SERIAL_ECHOLNPGM("Runout Command: ", script);
+        SERIAL_ECHOLNPAIR("Runout Command: ", script);
       #endif
       queue.inject(script);
     #else
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index d88e81d..93eb59c 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -145,7 +145,7 @@ class TFilamentMonitor : public FilamentMonitorBase {
           if (runout_flags) {
             SERIAL_ECHOPGM("Runout Sensors: ");
             LOOP_L_N(i, 8) SERIAL_ECHO('0' + TEST(runout_flags, i));
-            SERIAL_ECHOPGM(" -> ", extruder);
+            SERIAL_ECHOPAIR(" -> ", extruder);
             if (ran_out) SERIAL_ECHOPGM(" RUN OUT");
             SERIAL_EOL();
           }
@@ -317,7 +317,7 @@ class FilamentSensorBase {
             static uint8_t was_out; // = 0
             if (out != TEST(was_out, s)) {
               TBI(was_out, s);
-              SERIAL_ECHOLNPGM_P(PSTR("Filament Sensor "), '0' + s, out ? PSTR(" OUT") : PSTR(" IN"));
+              SERIAL_ECHOLNPAIR_P(PSTR("Filament Sensor "), '0' + s, out ? PSTR(" OUT") : PSTR(" IN"));
             }
           #endif
         }
@@ -352,7 +352,7 @@ class FilamentSensorBase {
           if (ELAPSED(ms, t)) {
             t = millis() + 1000UL;
             LOOP_L_N(i, NUM_RUNOUT_SENSORS)
-              SERIAL_ECHOPGM_P(i ? PSTR(", ") : PSTR("Remaining mm: "), runout_mm_countdown[i]);
+              SERIAL_ECHOPAIR_P(i ? PSTR(", ") : PSTR("Remaining mm: "), runout_mm_countdown[i]);
             SERIAL_EOL();
           }
         #endif
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index ea6fc49..539fafe 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -52,9 +52,9 @@ cutter_power_t SpindleLaser::menuPower,                               // Power s
 #endif
 #define SPINDLE_LASER_PWM_OFF TERN(SPINDLE_LASER_PWM_INVERT, 255, 0)
 
-/**
- * Init the cutter to a safe OFF state
- */
+//
+// Init the cutter to a safe OFF state
+//
 void SpindleLaser::init() {
   #if ENABLED(SPINDLE_SERVO)
     MOVE_SERVO(SPINDLE_SERVO_NR, SPINDLE_SERVO_MIN);
@@ -64,7 +64,7 @@ void SpindleLaser::init() {
   #if ENABLED(SPINDLE_CHANGE_DIR)
     OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0);         // Init rotation to clockwise (M3)
   #endif
-  #if ENABLED(SPINDLE_LASER_USE_PWM)
+  #if ENABLED(SPINDLE_LASER_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);
     analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
@@ -83,11 +83,9 @@ void SpindleLaser::init() {
   #endif
 }
 
-#if ENABLED(SPINDLE_LASER_USE_PWM)
+#if ENABLED(SPINDLE_LASER_PWM)
   /**
    * Set the cutter PWM directly to the given ocr value
-   *
-   * @param ocr Power value
    */
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
     #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
@@ -107,21 +105,17 @@ void SpindleLaser::init() {
     WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE); // Cutter OFF
     _set_ocr(0);
   }
-#endif // SPINDLE_LASER_USE_PWM
+#endif
 
-/**
- * Apply power for laser/spindle
- *
- * Apply cutter power value for PWM, Servo, and on/off pin.
- *
- * @param opwr Power value. Range 0 to MAX. When 0 disable spindle/laser.
- */
+//
+// Set cutter ON/OFF state (and PWM) to the given cutter power value
+//
 void SpindleLaser::apply_power(const uint8_t opwr) {
   static uint8_t last_power_applied = 0;
   if (opwr == last_power_applied) return;
   last_power_applied = opwr;
   power = opwr;
-  #if ENABLED(SPINDLE_LASER_USE_PWM)
+  #if ENABLED(SPINDLE_LASER_PWM)
     if (cutter.unitPower == 0 && CUTTER_UNIT_IS(RPM)) {
       ocr_off();
       isReady = false;
@@ -143,10 +137,10 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
 }
 
 #if ENABLED(SPINDLE_CHANGE_DIR)
-  /**
-   * Set the spindle direction and apply immediately
-   * Stop on direction change if SPINDLE_STOP_ON_DIR_CHANGE is enabled
-   */
+  //
+  // Set the spindle direction and apply immediately
+  // Stop on direction change if SPINDLE_STOP_ON_DIR_CHANGE is enabled
+  //
   void SpindleLaser::set_reverse(const bool reverse) {
     const bool dir_state = (reverse == SPINDLE_INVERT_DIR); // Forward (M3) HIGH when not inverted
     if (TERN0(SPINDLE_STOP_ON_DIR_CHANGE, enabled()) && READ(SPINDLE_DIR_PIN) != dir_state) disable();
@@ -155,17 +149,25 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
 #endif
 
 #if ENABLED(AIR_EVACUATION)
+
   // Enable / disable Cutter Vacuum or Laser Blower motor
   void SpindleLaser::air_evac_enable()  { WRITE(AIR_EVACUATION_PIN,  AIR_EVACUATION_ACTIVE); } // Turn ON
+
   void SpindleLaser::air_evac_disable() { WRITE(AIR_EVACUATION_PIN, !AIR_EVACUATION_ACTIVE); } // Turn OFF
+
   void SpindleLaser::air_evac_toggle()  { TOGGLE(AIR_EVACUATION_PIN); } // Toggle state
-#endif
+
+#endif // AIR_EVACUATION
 
 #if ENABLED(AIR_ASSIST)
+
   // Enable / disable air assist
   void SpindleLaser::air_assist_enable()  { WRITE(AIR_ASSIST_PIN,  AIR_ASSIST_PIN); } // Turn ON
+
   void SpindleLaser::air_assist_disable() { WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_PIN); } // Turn OFF
+
   void SpindleLaser::air_assist_toggle()  { TOGGLE(AIR_ASSIST_PIN); } // Toggle state
-#endif
+
+#endif // AIR_ASSIST
 
 #endif // HAS_CUTTER
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index ba82c4d..da228cf 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -123,7 +123,7 @@ public:
   FORCE_INLINE static void refresh() { apply_power(power); }
   FORCE_INLINE static void set_power(const uint8_t upwr) { power = upwr; refresh(); }
 
-  #if ENABLED(SPINDLE_LASER_USE_PWM)
+  #if ENABLED(SPINDLE_LASER_PWM)
 
     private:
 
@@ -132,50 +132,54 @@ public:
     public:
 
     static void set_ocr(const uint8_t ocr);
-    static inline void ocr_set_power(const uint8_t ocr) { power = ocr; set_ocr(ocr); }
+    static inline void set_ocr_power(const uint8_t ocr) { power = ocr; set_ocr(ocr); }
     static void ocr_off();
-
-    /**
-     * Update output for power->OCR translation
-     */
+    // Used to update output for power->OCR translation
     static inline uint8_t upower_to_ocr(const cutter_power_t upwr) {
-      return uint8_t(
+      return (
         #if CUTTER_UNIT_IS(PWM255)
-          upwr
+          uint8_t(upwr)
         #elif CUTTER_UNIT_IS(PERCENT)
           pct_to_ocr(upwr)
         #else
-          pct_to_ocr(cpwr_to_pct(upwr))
+          uint8_t(pct_to_ocr(cpwr_to_pct(upwr)))
         #endif
       );
     }
 
-    /**
-     * Correct power to configured range
-     */
+    // Correct power to configured range
     static inline cutter_power_t power_to_range(const cutter_power_t pwr) {
-      return power_to_range(pwr, _CUTTER_POWER(CUTTER_POWER_UNIT));
+      return power_to_range(pwr, (
+        #if CUTTER_UNIT_IS(PWM255)
+          0
+        #elif CUTTER_UNIT_IS(PERCENT)
+          1
+        #elif CUTTER_UNIT_IS(RPM)
+          2
+        #else
+          #error "CUTTER_UNIT_IS(unknown)"
+        #endif
+      ));
     }
-
     static inline cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) {
       if (pwr <= 0) return 0;
       cutter_power_t upwr;
       switch (pwrUnit) {
-        case _CUTTER_POWER_PWM255:
+        case 0:                                                 // PWM
           upwr = cutter_power_t(
               (pwr < pct_to_ocr(min_pct)) ? pct_to_ocr(min_pct) // Use minimum if set below
             : (pwr > pct_to_ocr(max_pct)) ? pct_to_ocr(max_pct) // Use maximum if set above
             :  pwr
           );
           break;
-        case _CUTTER_POWER_PERCENT:
+        case 1:                                                 // PERCENT
           upwr = cutter_power_t(
               (pwr < min_pct) ? min_pct                         // Use minimum if set below
             : (pwr > max_pct) ? max_pct                         // Use maximum if set above
             :  pwr                                              // PCT
           );
           break;
-        case _CUTTER_POWER_RPM:
+        case 2:                                                 // RPM
           upwr = cutter_power_t(
               (pwr < SPEED_POWER_MIN) ? SPEED_POWER_MIN         // Use minimum if set below
             : (pwr > SPEED_POWER_MAX) ? SPEED_POWER_MAX         // Use maximum if set above
@@ -186,34 +190,14 @@ public:
       }
       return upwr;
     }
-  #endif // SPINDLE_LASER_USE_PWM
 
-  /**
-   * Enable/Disable spindle/laser
-   * @param enable true = enable; false = disable
-   */
+  #endif // SPINDLE_LASER_PWM
+
   static inline void set_enabled(const bool enable) {
-    uint8_t value = 0;
-    if (enable) {
-      #if ENABLED(SPINDLE_LASER_USE_PWM)
-        if (power)
-          value = power;
-        else if (unitPower)
-          value = upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP));
-      #else
-        value = 255;
-      #endif
-    }
-    set_power(value);
+    set_power(enable ? TERN(SPINDLE_LASER_PWM, (power ?: (unitPower ? upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP)) : 0)), 255) : 0);
   }
 
-  static inline void disable() { isReady = false; set_enabled(false); }
-
-  /**
-   * Wait for spindle to spin up or spin down
-   *
-   * @param on true = state to on; false = state to off.
-   */
+  // Wait for spindle to spin up or spin down
   static inline void power_delay(const bool on) {
     #if DISABLED(LASER_POWER_INLINE)
       safe_delay(on ? SPINDLE_LASER_POWERUP_DELAY : SPINDLE_LASER_POWERDOWN_DELAY);
@@ -246,10 +230,12 @@ public:
     }
   #endif
 
+  static inline void disable() { isReady = false; set_enabled(false); }
+
   #if HAS_LCD_MENU
     static inline void enable_with_dir(const bool reverse) {
       isReady = true;
-      const uint8_t ocr = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
+      const uint8_t ocr = TERN(SPINDLE_LASER_PWM, upower_to_ocr(menuPower), 255);
       if (menuPower)
         power = ocr;
       else
@@ -262,7 +248,7 @@ public:
     FORCE_INLINE static void enable_reverse() { enable_with_dir(true); }
     FORCE_INLINE static void enable_same_dir() { enable_with_dir(is_reverse()); }
 
-    #if ENABLED(SPINDLE_LASER_USE_PWM)
+    #if ENABLED(SPINDLE_LASER_PWM)
       static inline void update_from_mpower() {
         if (isReady) power = upower_to_ocr(menuPower);
         unitPower = menuPower;
@@ -308,14 +294,14 @@ public:
         isReady = false;
         unitPower = menuPower = 0;
         planner.laser_inline.status.isPlanned = false;
-        TERN(SPINDLE_LASER_USE_PWM, inline_ocr_power, inline_power)(0);
+        TERN(SPINDLE_LASER_PWM, inline_ocr_power, inline_power)(0);
       }
     }
 
     // Set the power for subsequent movement blocks
     static void inline_power(const cutter_power_t upwr) {
       unitPower = menuPower = upwr;
-      #if ENABLED(SPINDLE_LASER_USE_PWM)
+      #if ENABLED(SPINDLE_LASER_PWM)
         #if ENABLED(SPEED_POWER_RELATIVE) && !CUTTER_UNIT_IS(RPM) // relative mode does not turn laser off at 0, except for RPM
           planner.laser_inline.status.isEnabled = true;
           planner.laser_inline.power = upower_to_ocr(upwr);
@@ -332,14 +318,14 @@ public:
 
     static inline void inline_direction(const bool) { /* never */ }
 
-    #if ENABLED(SPINDLE_LASER_USE_PWM)
+    #if ENABLED(SPINDLE_LASER_PWM)
       static inline void inline_ocr_power(const uint8_t ocrpwr) {
         isReady = ocrpwr > 0;
         planner.laser_inline.status.isEnabled = ocrpwr > 0;
         planner.laser_inline.power = ocrpwr;
       }
     #endif
-  #endif // LASER_POWER_INLINE
+  #endif  // LASER_POWER_INLINE
 
   static inline void kill() {
     TERN_(LASER_POWER_INLINE, inline_disable());
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 97fedf1..99cfd99 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -226,7 +226,7 @@
     SERIAL_ECHO(timestamp);
     SERIAL_ECHOPGM(": ");
     st.printLabel();
-    SERIAL_ECHOLNPGM(" driver overtemperature warning! (", st.getMilliamps(), "mA)");
+    SERIAL_ECHOLNPAIR(" driver overtemperature warning! (", st.getMilliamps(), "mA)");
   }
 
   template<typename TMC>
@@ -271,7 +271,7 @@
           st.rms_current(I_rms);
           #if ENABLED(REPORT_CURRENT_CHANGE)
             st.printLabel();
-            SERIAL_ECHOLNPGM(" current decreased to ", I_rms);
+            SERIAL_ECHOLNPAIR(" current decreased to ", I_rms);
           #endif
         }
       }
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 1f7d5cf..8778048 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -300,7 +300,7 @@ class TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC266
 template<typename TMC>
 void tmc_print_current(TMC &st) {
   st.printLabel();
-  SERIAL_ECHOLNPGM(" driver current: ", st.getMilliamps());
+  SERIAL_ECHOLNPAIR(" driver current: ", st.getMilliamps());
 }
 
 #if ENABLED(MONITOR_DRIVER_STATUS)
@@ -322,7 +322,7 @@ void tmc_print_current(TMC &st) {
   template<typename TMC>
   void tmc_print_pwmthrs(TMC &st) {
     st.printLabel();
-    SERIAL_ECHOLNPGM(" stealthChop max speed: ", st.get_pwm_thrs());
+    SERIAL_ECHOLNPAIR(" stealthChop max speed: ", st.get_pwm_thrs());
   }
 #endif
 #if USE_SENSORLESS
diff --git a/Marlin/src/feature/tramming.h b/Marlin/src/feature/tramming.h
index 925659e..eb27fe8 100644
--- a/Marlin/src/feature/tramming.h
+++ b/Marlin/src/feature/tramming.h
@@ -28,12 +28,12 @@
   #error "TRAMMING_SCREW_THREAD must be equal to 30, 31, 40, 41, 50, or 51."
 #endif
 
-constexpr xy_pos_t tramming_points[] = TRAMMING_POINT_XY;
+constexpr xy_pos_t screws_tilt_adjust_pos[] = TRAMMING_POINT_XY;
 
-#define G35_PROBE_COUNT COUNT(tramming_points)
+#define G35_PROBE_COUNT COUNT(screws_tilt_adjust_pos)
 static_assert(WITHIN(G35_PROBE_COUNT, 3, 6), "TRAMMING_POINT_XY requires between 3 and 6 XY positions.");
 
-#define VALIDATE_TRAMMING_POINT(N) static_assert(N >= G35_PROBE_COUNT || Probe::build_time::can_reach(tramming_points[N]), \
+#define VALIDATE_TRAMMING_POINT(N) static_assert(N >= G35_PROBE_COUNT || Probe::build_time::can_reach(screws_tilt_adjust_pos[N]), \
   "TRAMMING_POINT_XY point " STRINGIFY(N) " is not reachable with the default NOZZLE_TO_PROBE offset and PROBING_MARGIN.")
 VALIDATE_TRAMMING_POINT(0); VALIDATE_TRAMMING_POINT(1); VALIDATE_TRAMMING_POINT(2); VALIDATE_TRAMMING_POINT(3); VALIDATE_TRAMMING_POINT(4); VALIDATE_TRAMMING_POINT(5);
 
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index 5f5209c..7552245 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -84,7 +84,7 @@ void TWIBus::send() {
 void TWIBus::echoprefix(uint8_t bytes, const char pref[], uint8_t adr) {
   SERIAL_ECHO_START();
   SERIAL_ECHOPGM_P(pref);
-  SERIAL_ECHOPGM(": from:", adr, " bytes:", bytes, " data:");
+  SERIAL_ECHOPAIR(": from:", adr, " bytes:", bytes, " data:");
 }
 
 // static
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index ba14e6f..8821971 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -539,7 +539,7 @@ void GcodeSuite::G26() {
 
     if (bedtemp) {
       if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) {
-        SERIAL_ECHOLNPGM("?Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C).");
+        SERIAL_ECHOLNPAIR("?Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C).");
         return;
       }
       g26.bed_temp = bedtemp;
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 8d5c057..3d75a76 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -103,22 +103,22 @@ void GcodeSuite::G35() {
     // Users of G35 might have a badly misaligned bed, so raise Z by the
     // length of the deployed pin (BLTOUCH stroke < 7mm)
     do_blocking_move_to_z(SUM_TERN(BLTOUCH_HS_MODE, Z_CLEARANCE_BETWEEN_PROBES, 7));
-    const float z_probed_height = probe.probe_at_point(tramming_points[i], PROBE_PT_RAISE, 0, true);
+    const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[i], PROBE_PT_RAISE, 0, true);
 
     if (isnan(z_probed_height)) {
-      SERIAL_ECHOPGM("G35 failed at point ", i + 1, " (");
+      SERIAL_ECHOPAIR("G35 failed at point ", i + 1, " (");
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       SERIAL_CHAR(')');
-      SERIAL_ECHOLNPGM_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y);
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y);
       err_break = true;
       break;
     }
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOPGM("Probing point ", i + 1, " (");
+      DEBUG_ECHOPAIR("Probing point ", i + 1, " (");
       DEBUG_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       DEBUG_CHAR(')');
-      DEBUG_ECHOLNPGM_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y, SP_Z_STR, z_probed_height);
+      DEBUG_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y, SP_Z_STR, z_probed_height);
     }
 
     z_measured[i] = z_probed_height;
@@ -138,9 +138,9 @@ void GcodeSuite::G35() {
 
       SERIAL_ECHOPGM("Turn ");
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
-      SERIAL_ECHOPGM(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", ABS(full_turns), " turns");
-      if (minutes) SERIAL_ECHOPGM(" and ", ABS(minutes), " minutes");
-      if (ENABLED(REPORT_TRAMMING_MM)) SERIAL_ECHOPGM(" (", -diff, "mm)");
+      SERIAL_ECHOPAIR(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", ABS(full_turns), " turns");
+      if (minutes) SERIAL_ECHOPAIR(" and ", ABS(minutes), " minutes");
+      if (ENABLED(REPORT_TRAMMING_MM)) SERIAL_ECHOPAIR(" (", -diff, "mm)");
       SERIAL_EOL();
     }
   }
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 1110ce7..703e73b 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -76,9 +76,9 @@ void GcodeSuite::M420() {
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y)));
       }
       SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
-      SERIAL_ECHOPGM(" (", x_min);
+      SERIAL_ECHOPAIR(" (", x_min);
       SERIAL_CHAR(','); SERIAL_ECHO(y_min);
-      SERIAL_ECHOPGM(")-(", x_max);
+      SERIAL_ECHOPAIR(")-(", x_max);
       SERIAL_CHAR(','); SERIAL_ECHO(y_max);
       SERIAL_ECHOLNPGM(")");
     }
@@ -108,7 +108,7 @@ void GcodeSuite::M420() {
 
         if (!WITHIN(storage_slot, 0, a - 1)) {
           SERIAL_ECHOLNPGM("?Invalid storage slot.");
-          SERIAL_ECHOLNPGM("?Use 0 to ", a - 1);
+          SERIAL_ECHOLNPAIR("?Use 0 to ", a - 1);
           return;
         }
 
@@ -128,7 +128,7 @@ void GcodeSuite::M420() {
       ubl.display_map(parser.byteval('T'));
       SERIAL_ECHOPGM("Mesh is ");
       if (!ubl.mesh_is_valid()) SERIAL_ECHOPGM("in");
-      SERIAL_ECHOLNPGM("valid\nStorage slot: ", ubl.storage_slot);
+      SERIAL_ECHOLNPAIR("valid\nStorage slot: ", ubl.storage_slot);
     }
 
   #endif // AUTO_BED_LEVELING_UBL
@@ -242,18 +242,4 @@ void GcodeSuite::M420() {
     report_current_position();
 }
 
-void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(
-    TERN(MESH_BED_LEVELING, "Mesh Bed Leveling", TERN(AUTO_BED_LEVELING_UBL, "Unified Bed Leveling", "Auto Bed Leveling"))
-  ));
-  SERIAL_ECHOPGM_P(
-    PSTR("  M420 S"), planner.leveling_active
-    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-      , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
-    #endif
-    , " ; Leveling "
-  );
-  serialprintln_onoff(planner.leveling_active);
-}
-
 #endif // HAS_LEVELING
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 0eb13db..29009c6 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -58,10 +58,10 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD)
+#endif
+
+#if ENABLED(DWIN_CREALITY_LCD)
   #include "../../../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if HAS_MULTI_HOTEND
@@ -379,7 +379,7 @@ G29_TYPE GcodeSuite::G29() {
 
       if (!probe.good_bounds(abl.probe_position_lf, abl.probe_position_rb)) {
         if (DEBUGGING(LEVELING)) {
-          DEBUG_ECHOLNPGM("G29 L", abl.probe_position_lf.x, " R", abl.probe_position_rb.x,
+          DEBUG_ECHOLNPAIR("G29 L", abl.probe_position_lf.x, " R", abl.probe_position_rb.x,
                               " F", abl.probe_position_lf.y, " B", abl.probe_position_rb.y);
         }
         SERIAL_ECHOLNPGM("? (L,R,F,B) out of bounds.");
@@ -403,9 +403,10 @@ G29_TYPE GcodeSuite::G29() {
     #if ENABLED(AUTO_BED_LEVELING_3POINT)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> 3-point Leveling");
       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points
-    #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshLevelingStart());
+    #endif
+
+    #if BOTH(AUTO_BED_LEVELING_BILINEAR, EXTENSIBLE_UI)
+      ExtUI::onMeshLevelingStart();
     #endif
 
     if (!faux) {
@@ -470,7 +471,7 @@ G29_TYPE GcodeSuite::G29() {
     if (abl.verbose_level || seenQ) {
       SERIAL_ECHOPGM("Manual G29 ");
       if (g29_in_progress)
-        SERIAL_ECHOLNPGM("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points), " of ", abl.abl_points);
+        SERIAL_ECHOLNPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points), " of ", abl.abl_points);
       else
         SERIAL_ECHOLNPGM("idle");
     }
@@ -513,7 +514,7 @@ G29_TYPE GcodeSuite::G29() {
         z_values[abl.meshCount.x][abl.meshCount.y] = newz;
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, newz));
 
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, abl.measured_z + abl.Z_offset);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, abl.measured_z + abl.Z_offset);
 
       #endif
     }
@@ -635,8 +636,8 @@ G29_TYPE GcodeSuite::G29() {
           // Avoid probing outside the round or hexagonal area
           if (TERN0(IS_KINEMATIC, !probe.can_reach(abl.probePos))) continue;
 
-          if (abl.verbose_level) SERIAL_ECHOLNPGM("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
-          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), int(pt_index), int(abl.abl_points)));
+          if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
+          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), int(pt_index), int(abl.abl_points)));
 
           abl.measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(abl.probePos, raise_after, abl.verbose_level);
 
@@ -680,8 +681,8 @@ G29_TYPE GcodeSuite::G29() {
       // Probe at 3 arbitrary points
 
       LOOP_L_N(i, 3) {
-        if (abl.verbose_level) SERIAL_ECHOLNPGM("Probing point ", i + 1, "/3.");
-        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_POINT), int(i + 1)));
+        if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing point ", i + 1, "/3.");
+        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i + 1)));
 
         // Retain the last probe position
         abl.probePos = xy_pos_t(points[i]);
@@ -842,7 +843,7 @@ G29_TYPE GcodeSuite::G29() {
           && NEAR(current_position.y, abl.probePos.y - probe.offset_xy.y)
         ) {
           const float simple_z = current_position.z - abl.measured_z;
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Probed Z", simple_z, "  Matrix Z", converted.z, "  Discrepancy ", simple_z - converted.z);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probed Z", simple_z, "  Matrix Z", converted.z, "  Discrepancy ", simple_z - converted.z);
           converted.z = simple_z;
         }
 
@@ -855,14 +856,14 @@ G29_TYPE GcodeSuite::G29() {
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
       if (!abl.dryrun) {
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("G29 uncorrected Z:", current_position.z);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("G29 uncorrected Z:", current_position.z);
 
         // Unapply the offset because it is going to be immediately applied
         // and cause compensation movement in Z
         const float fade_scaling_factor = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.fade_scaling_factor_for_z(current_position.z), 1);
         current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position);
 
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(" corrected Z:", current_position.z);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(" corrected Z:", current_position.z);
       }
 
     #endif // ABL_PLANAR
@@ -877,15 +878,19 @@ G29_TYPE GcodeSuite::G29() {
   // Sync the planner from the current_position
   if (planner.leveling_active) sync_plan_position();
 
-  TERN_(HAS_BED_PROBE, probe.move_z_after_probing());
+  #if HAS_BED_PROBE
+    probe.move_z_after_probing();
+  #endif
 
   #ifdef Z_PROBE_END_SCRIPT
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
     planner.synchronize();
     process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
   #endif
 
-  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedLeveling());
+  #if ENABLED(DWIN_CREALITY_LCD)
+    DWIN_CompletedLeveling();
+  #endif
 
   report_current_position();
 
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 11e503f..984e008 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -40,8 +40,6 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
@@ -173,7 +171,7 @@ void GcodeSuite::G29() {
       if (parser.seenval('I')) {
         ix = parser.value_int();
         if (!WITHIN(ix, 0, (GRID_MAX_POINTS_X) - 1)) {
-          SERIAL_ECHOLNPGM("I out of range (0-", (GRID_MAX_POINTS_X) - 1, ")");
+          SERIAL_ECHOLNPAIR("I out of range (0-", (GRID_MAX_POINTS_X) - 1, ")");
           return;
         }
       }
@@ -183,7 +181,7 @@ void GcodeSuite::G29() {
       if (parser.seenval('J')) {
         iy = parser.value_int();
         if (!WITHIN(iy, 0, (GRID_MAX_POINTS_Y) - 1)) {
-          SERIAL_ECHOLNPGM("J out of range (0-", (GRID_MAX_POINTS_Y) - 1, ")");
+          SERIAL_ECHOLNPAIR("J out of range (0-", (GRID_MAX_POINTS_Y) - 1, ")");
           return;
         }
       }
@@ -193,7 +191,6 @@ void GcodeSuite::G29() {
       if (parser.seenval('Z')) {
         mbl.z_values[ix][iy] = parser.value_linear_units();
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, mbl.z_values[ix][iy]));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy]));
       }
       else
         return echo_not_entered('Z');
@@ -213,8 +210,8 @@ void GcodeSuite::G29() {
   } // switch(state)
 
   if (state == MeshNext) {
-    SERIAL_ECHOLNPGM("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
-    if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
+    SERIAL_ECHOLNPAIR("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
+    if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
   }
 
   report_current_position();
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index e6f0ef1..f1e1b76 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -33,8 +33,6 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 /**
@@ -69,7 +67,6 @@ void GcodeSuite::M421() {
     float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point
     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL
     TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));          // Ping ExtUI in case it's showing the mesh
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ij.x, ij.y, zval));
   }
 }
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index dc93ba3..f78106b 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -46,13 +46,12 @@
 #endif
 
 #include "../../lcd/marlinui.h"
+#if ENABLED(DWIN_CREALITY_LCD)
+  #include "../../lcd/e3v2/creality/dwin.h"
+#endif
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if HAS_L64XX                         // set L6470 absolute position registers to counts
@@ -239,7 +238,7 @@ void GcodeSuite::G28() {
     return;
   }
 
-  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_StartHoming());
+  TERN_(DWIN_CREALITY_LCD, DWIN_StartHoming());
   TERN_(EXTENSIBLE_UI, ExtUI::onHomingStart());
 
   planner.synchronize();          // Wait for planner moves to finish!
@@ -269,8 +268,8 @@ void GcodeSuite::G28() {
   #endif
 
   #if HAS_HOMING_CURRENT
-    auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b) {
-      DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPGM(" current: ", a, " -> ", b);
+    auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b){
+      DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
     };
     #if HAS_CURRENT_HOME(X)
       const int16_t tmc_save_current_X = stepperX.getMilliamps();
@@ -371,7 +370,7 @@ void GcodeSuite::G28() {
 
     if (z_homing_height && (LINEAR_AXIS_GANG(doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Raise Z (before homing) by ", z_homing_height);
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
       TERN_(BLTOUCH, bltouch.init());
     }
@@ -523,7 +522,7 @@ void GcodeSuite::G28() {
 
   ui.refresh();
 
-  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedHoming());
+  TERN_(DWIN_CREALITY_LCD, DWIN_CompletedHoming());
   TERN_(EXTENSIBLE_UI, ExtUI::onHomingComplete());
 
   report_current_position();
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 8867c16..a897a10 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -69,8 +69,6 @@ enum CalEnum : char {                        // the 7 main calibration points -
 
 float lcd_probe_pt(const xy_pos_t &xy);
 
-float dcr;
-
 void ac_home() {
   endstops.enable(true);
   TERN_(SENSORLESS_HOMING, probe.set_homing_current(true));
@@ -109,14 +107,14 @@ void print_signed_float(PGM_P const prefix, const_float_t f) {
  *  - Print the delta settings
  */
 static void print_calibration_settings(const bool end_stops, const bool tower_angles) {
-  SERIAL_ECHOPGM(".Height:", delta_height);
+  SERIAL_ECHOPAIR(".Height:", delta_height);
   if (end_stops) {
     print_signed_float(PSTR("Ex"), delta_endstop_adj.a);
     print_signed_float(PSTR("Ey"), delta_endstop_adj.b);
     print_signed_float(PSTR("Ez"), delta_endstop_adj.c);
   }
   if (end_stops && tower_angles) {
-    SERIAL_ECHOPGM("  Radius:", delta_radius);
+    SERIAL_ECHOPAIR("  Radius:", delta_radius);
     SERIAL_EOL();
     SERIAL_CHAR('.');
     SERIAL_ECHO_SP(13);
@@ -127,7 +125,7 @@ static void print_calibration_settings(const bool end_stops, const bool tower_an
     print_signed_float(PSTR("Tz"), delta_tower_angle_trim.c);
   }
   if ((!end_stops && tower_angles) || (end_stops && !tower_angles)) { // XOR
-    SERIAL_ECHOPGM("  Radius:", delta_radius);
+    SERIAL_ECHOPAIR("  Radius:", delta_radius);
   }
   SERIAL_EOL();
 }
@@ -177,9 +175,9 @@ static float std_dev_points(float z_pt[NPP + 1], const bool _0p_cal, const bool
 /**
  *  - Probe a point
  */
-static float calibration_probe(const xy_pos_t &xy, const bool stow, const bool probe_at_offset) {
+static float calibration_probe(const xy_pos_t &xy, const bool stow) {
   #if HAS_BED_PROBE
-    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true, probe_at_offset);
+    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true, false);
   #else
     UNUSED(stow);
     return lcd_probe_pt(xy);
@@ -189,7 +187,7 @@ static float calibration_probe(const xy_pos_t &xy, const bool stow, const bool p
 /**
  *  - Probe a grid
  */
-static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_points, const bool towers_set, const bool stow_after_each, const bool probe_at_offset) {
+static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_points, const bool towers_set, const bool stow_after_each) {
   const bool _0p_calibration      = probe_points == 0,
              _1p_calibration      = probe_points == 1 || probe_points == -1,
              _4p_calibration      = probe_points == 2,
@@ -211,9 +209,11 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
 
   if (!_0p_calibration) {
 
+    const float dcr = delta_calibration_radius();
+
     if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
       const xy_pos_t center{0};
-      z_pt[CEN] += calibration_probe(center, stow_after_each, probe_at_offset);
+      z_pt[CEN] += calibration_probe(center, stow_after_each);
       if (isnan(z_pt[CEN])) return false;
     }
 
@@ -224,7 +224,7 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
         const float a = RADIANS(210 + (360 / NPP) *  (rad - 1)),
                     r = dcr * 0.1;
         const xy_pos_t vec = { cos(a), sin(a) };
-        z_pt[CEN] += calibration_probe(vec * r, stow_after_each, probe_at_offset);
+        z_pt[CEN] += calibration_probe(vec * r, stow_after_each);
         if (isnan(z_pt[CEN])) return false;
      }
       z_pt[CEN] /= float(_7p_2_intermediates ? 7 : probe_points);
@@ -249,7 +249,7 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
                       r = dcr * (1 - 0.1 * (zig_zag ? offset - circle : circle)),
                       interpol = FMOD(rad, 1);
           const xy_pos_t vec = { cos(a), sin(a) };
-          const float z_temp = calibration_probe(vec * r, stow_after_each, probe_at_offset);
+          const float z_temp = calibration_probe(vec * r, stow_after_each);
           if (isnan(z_temp)) return false;
           // split probe point to neighbouring calibration points
           z_pt[uint8_t(LROUND(rad - interpol + NPP - 1)) % NPP + 1] += z_temp * sq(cos(RADIANS(interpol * 90)));
@@ -276,6 +276,7 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
 static void reverse_kinematics_probe_points(float z_pt[NPP + 1], abc_float_t mm_at_pt_axis[NPP + 1]) {
   xyz_pos_t pos{0};
 
+  const float dcr = delta_calibration_radius();
   LOOP_CAL_ALL(rad) {
     const float a = RADIANS(210 + (360 / NPP) *  (rad - 1)),
                 r = (rad == CEN ? 0.0f : dcr);
@@ -286,7 +287,7 @@ static void reverse_kinematics_probe_points(float z_pt[NPP + 1], abc_float_t mm_
 }
 
 static void forward_kinematics_probe_points(abc_float_t mm_at_pt_axis[NPP + 1], float z_pt[NPP + 1]) {
-  const float r_quot = dcr / delta_radius;
+  const float r_quot = delta_calibration_radius() / delta_radius;
 
   #define ZPP(N,I,A) (((1.0f + r_quot * (N)) / 3.0f) * mm_at_pt_axis[I].A)
   #define Z00(I, A) ZPP( 0, I, A)
@@ -327,7 +328,7 @@ static void calc_kinematics_diff_probe_points(float z_pt[NPP + 1], abc_float_t d
 }
 
 static float auto_tune_h() {
-  const float r_quot = dcr / delta_radius;
+  const float r_quot = delta_calibration_radius() / delta_radius;
   return RECIPROCAL(r_quot / (2.0f / 3.0f));  // (2/3)/CR
 }
 
@@ -372,8 +373,6 @@ static float auto_tune_a() {
  *      P3       Probe all positions: center, towers and opposite towers. Calibrate all.
  *      P4-P10   Probe all positions at different intermediate locations and average them.
  *
- *   Rn.nn  override default calibration Radius
- *
  *   T   Don't calibrate tower angle corrections
  *
  *   Cn.nn  Calibration precision; when omitted calibrates to maximum precision
@@ -388,8 +387,6 @@ static float auto_tune_a() {
  *
  *   E   Engage the probe for each point
  *
- *   O   Probe at offset points (this is wrong but it seems to work)
- *
  * With SENSORLESS_PROBING:
  *   Use these flags to calibrate stall sensitivity: (e.g., `G33 P1 Y Z` to calibrate X only.)
  *   X   Don't activate stallguard on X.
@@ -406,27 +403,7 @@ void GcodeSuite::G33() {
     return;
   }
 
-  const bool probe_at_offset = TERN0(HAS_PROBE_XY_OFFSET, parser.boolval('O')),
-                  towers_set = !parser.seen_test('T');
-
-  float max_dcr = dcr = DELTA_PRINTABLE_RADIUS;
-  #if HAS_PROBE_XY_OFFSET
-    // For offset probes the calibration radius is set to a safe but non-optimal value
-    dcr -= HYPOT(probe.offset_xy.x, probe.offset_xy.y);
-    if (probe_at_offset) {
-      // With probe positions both probe and nozzle need to be within the printable area
-      max_dcr = dcr;
-    }
-    // else with nozzle positions there is a risk of the probe being outside the bed
-    // but as long the nozzle stays within the printable area there is no risk of
-    // the effector crashing into the towers.
-  #endif
-
-  if (parser.seenval('R')) dcr = parser.value_float();
-  if (!WITHIN(dcr, 0, max_dcr)) {
-    SERIAL_ECHOLNPGM("?calibration (R)adius implausible.");
-    return;
-  }
+  const bool towers_set = !parser.seen_test('T');
 
   const float calibration_precision = parser.floatval('C', 0.0f);
   if (calibration_precision < 0) {
@@ -448,7 +425,7 @@ void GcodeSuite::G33() {
 
   const bool stow_after_each = parser.seen_test('E');
 
-  #if HAS_DELTA_SENSORLESS_PROBING
+  #if ENABLED(SENSORLESS_PROBING)
     probe.test_sensitivity.x = !parser.seen_test('X');
     TERN_(HAS_Y_AXIS, probe.test_sensitivity.y = !parser.seen_test('Y'));
     TERN_(HAS_Z_AXIS, probe.test_sensitivity.z = !parser.seen_test('Z'));
@@ -476,6 +453,18 @@ void GcodeSuite::G33() {
 
   SERIAL_ECHOLNPGM("G33 Auto Calibrate");
 
+  const float dcr = delta_calibration_radius();
+
+  if (!_1p_calibration && !_0p_calibration) { // test if the outer radius is reachable
+    LOOP_CAL_RAD(axis) {
+      const float a = RADIANS(210 + (360 / NPP) *  (axis - 1));
+      if (!position_is_reachable(cos(a) * dcr, sin(a) * dcr)) {
+        SERIAL_ECHOLNPGM("?Bed calibration radius implausible.");
+        return;
+      }
+    }
+  }
+
   // Report settings
   PGM_P const checkingac = PSTR("Checking... AC");
   SERIAL_ECHOPGM_P(checkingac);
@@ -498,7 +487,7 @@ void GcodeSuite::G33() {
 
     // Probe the points
     zero_std_dev_old = zero_std_dev;
-    if (!probe_calibration_points(z_at_pt, probe_points, towers_set, stow_after_each, probe_at_offset)) {
+    if (!probe_calibration_points(z_at_pt, probe_points, towers_set, stow_after_each)) {
       SERIAL_ECHOLNPGM("Correct delta settings with M665 and M666");
       return ac_cleanup(TERN_(HAS_MULTI_HOTEND, old_tool_index));
     }
@@ -537,11 +526,11 @@ void GcodeSuite::G33() {
       #define Z0(I) ZP(0, I)
 
       // calculate factors
-      if (_7p_9_center) dcr *= 0.9f;
+      if (_7p_9_center) calibration_radius_factor = 0.9f;
       h_factor = auto_tune_h();
       r_factor = auto_tune_r();
       a_factor = auto_tune_a();
-      dcr /= 0.9f;
+      calibration_radius_factor = 1.0f;
 
       switch (probe_points) {
         case 0:
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index dd1dd56..50f3419 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -201,7 +201,7 @@ void GcodeSuite::G34() {
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
 
         const int iter = iteration + 1;
-        SERIAL_ECHOLNPGM("\nG34 Iteration: ", iter);
+        SERIAL_ECHOLNPAIR("\nG34 Iteration: ", iter);
         #if HAS_STATUS_MESSAGE
           char str[iter_str_len + 2 + 1];
           sprintf_P(str, msg_iteration, iter);
@@ -221,7 +221,7 @@ void GcodeSuite::G34() {
           if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
 
           if (DEBUGGING(LEVELING))
-            DEBUG_ECHOLNPGM_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
+            DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
 
           // Probe a Z height for each stepper.
           // Probing sanity check is disabled, as it would trigger even in normal cases because
@@ -238,7 +238,7 @@ void GcodeSuite::G34() {
           // the next iteration of probing. This allows adjustments to be made away from the bed.
           z_measured[iprobe] = z_probed_height + Z_CLEARANCE_BETWEEN_PROBES;
 
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", iprobe + 1, " measured position is ", z_measured[iprobe]);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", iprobe + 1, " measured position is ", z_measured[iprobe]);
 
           // Remember the minimum measurement to calculate the correction later on
           z_measured_min = _MIN(z_measured_min, z_measured[iprobe]);
@@ -267,7 +267,7 @@ void GcodeSuite::G34() {
           linear_fit_data lfd;
           incremental_LSF_reset(&lfd);
           LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
-            SERIAL_ECHOLNPGM("PROBEPT_", i, ": ", z_measured[i]);
+            SERIAL_ECHOLNPAIR("PROBEPT_", i, ": ", z_measured[i]);
             incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
           }
           finish_incremental_LSF(&lfd);
@@ -278,7 +278,7 @@ void GcodeSuite::G34() {
             z_measured_min = _MIN(z_measured_min, z_measured[i]);
           }
 
-          SERIAL_ECHOLNPGM(
+          SERIAL_ECHOLNPAIR(
             LIST_N(DOUBLE(NUM_Z_STEPPER_DRIVERS),
               "Calculated Z1=", z_measured[0],
                         " Z2=", z_measured[1],
@@ -288,7 +288,7 @@ void GcodeSuite::G34() {
           );
         #endif
 
-        SERIAL_ECHOLNPGM("\n"
+        SERIAL_ECHOLNPAIR("\n"
           "Z2-Z1=", ABS(z_measured[1] - z_measured[0])
           #if TRIPLE_Z
             , " Z3-Z2=", ABS(z_measured[2] - z_measured[1])
@@ -372,8 +372,8 @@ void GcodeSuite::G34() {
 
             // Check for less accuracy compared to last move
             if (decreasing_accuracy(last_z_align_move[zstepper], z_align_abs)) {
-              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " last_z_align_move = ", last_z_align_move[zstepper]);
-              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " z_align_abs = ", z_align_abs);
+              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " last_z_align_move = ", last_z_align_move[zstepper]);
+              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " z_align_abs = ", z_align_abs);
               adjustment_reverse = !adjustment_reverse;
             }
 
@@ -385,7 +385,7 @@ void GcodeSuite::G34() {
           // Stop early if all measured points achieve accuracy target
           if (z_align_abs > z_auto_align_accuracy) success_break = false;
 
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " corrected by ", z_align_move);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " corrected by ", z_align_move);
 
           // Lock all steppers except one
           stepper.set_all_z_lock(true, zstepper);
@@ -395,7 +395,7 @@ void GcodeSuite::G34() {
             // Will match reversed Z steppers on dual steppers. Triple will need more work to map.
             if (adjustment_reverse) {
               z_align_move = -z_align_move;
-              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " correction reversed to ", z_align_move);
+              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " correction reversed to ", z_align_move);
             }
           #endif
 
@@ -421,7 +421,7 @@ void GcodeSuite::G34() {
       if (err_break)
         SERIAL_ECHOLNPGM("G34 aborted.");
       else {
-        SERIAL_ECHOLNPGM("Did ", iteration + (iteration != z_auto_align_iterations), " of ", z_auto_align_iterations);
+        SERIAL_ECHOLNPAIR("Did ", iteration + (iteration != z_auto_align_iterations), " of ", z_auto_align_iterations);
         SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
       }
 
@@ -475,13 +475,21 @@ void GcodeSuite::G34() {
  */
 void GcodeSuite::M422() {
 
-  if (!parser.seen_any()) return M422_report();
-
   if (parser.seen('R')) {
     z_stepper_align.reset_to_default();
     return;
   }
 
+  if (!parser.seen_any()) {
+    LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
+      SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + 1, SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
+    #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
+        SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + 1, SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
+    #endif
+    return;
+  }
+
   const bool is_probe_point = parser.seen('S');
 
   if (TERN0(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS, is_probe_point && parser.seen('W'))) {
@@ -537,26 +545,4 @@ void GcodeSuite::M422() {
   pos_dest[position_index] = pos;
 }
 
-void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_Z_AUTO_ALIGN));
-  LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
-    report_echo_start(forReplay);
-    SERIAL_ECHOLNPGM_P(
-      PSTR("  M422 S"), i + 1,
-      SP_X_STR, z_stepper_align.xy[i].x,
-      SP_Y_STR, z_stepper_align.xy[i].y
-    );
-  }
-  #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-    LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
-      report_echo_start(forReplay);
-      SERIAL_ECHOLNPGM_P(
-        PSTR("  M422 W"), i + 1,
-        SP_X_STR, z_stepper_align.stepper_xy[i].x,
-        SP_Y_STR, z_stepper_align.stepper_xy[i].y
-      );
-    }
-  #endif
-}
-
 #endif // Z_STEPPER_AUTO_ALIGN
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 23a66dd..c8efea8 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -354,44 +354,44 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   inline void report_measured_faces(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Sides:");
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
-      SERIAL_ECHOLNPGM("  Top: ", m.obj_side[TOP]);
+      SERIAL_ECHOLNPAIR("  Top: ", m.obj_side[TOP]);
     #endif
     #if ENABLED(CALIBRATION_MEASURE_LEFT)
-      SERIAL_ECHOLNPGM("  Left: ", m.obj_side[LEFT]);
+      SERIAL_ECHOLNPAIR("  Left: ", m.obj_side[LEFT]);
     #endif
     #if ENABLED(CALIBRATION_MEASURE_RIGHT)
-      SERIAL_ECHOLNPGM("  Right: ", m.obj_side[RIGHT]);
+      SERIAL_ECHOLNPAIR("  Right: ", m.obj_side[RIGHT]);
     #endif
     #if HAS_Y_AXIS
       #if ENABLED(CALIBRATION_MEASURE_FRONT)
-        SERIAL_ECHOLNPGM("  Front: ", m.obj_side[FRONT]);
+        SERIAL_ECHOLNPAIR("  Front: ", m.obj_side[FRONT]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_BACK)
-        SERIAL_ECHOLNPGM("  Back: ", m.obj_side[BACK]);
+        SERIAL_ECHOLNPAIR("  Back: ", m.obj_side[BACK]);
       #endif
     #endif
     #if LINEAR_AXES >= 4
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
-        SERIAL_ECHOLNPGM("  " STR_I_MIN ": ", m.obj_side[IMINIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.obj_side[IMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_IMAX)
-        SERIAL_ECHOLNPGM("  " STR_I_MAX ": ", m.obj_side[IMAXIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.obj_side[IMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 5
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
-        SERIAL_ECHOLNPGM("  " STR_J_MIN ": ", m.obj_side[JMINIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.obj_side[JMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_JMAX)
-        SERIAL_ECHOLNPGM("  " STR_J_MAX ": ", m.obj_side[JMAXIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.obj_side[JMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 6
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
-        SERIAL_ECHOLNPGM("  " STR_K_MIN ": ", m.obj_side[KMINIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.obj_side[KMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_KMAX)
-        SERIAL_ECHOLNPGM("  " STR_K_MAX ": ", m.obj_side[KMAXIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_K_MAX ": ", m.obj_side[KMAXIMUM]);
       #endif
     #endif
     SERIAL_EOL();
@@ -400,20 +400,20 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   inline void report_measured_center(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Center:");
     #if HAS_X_CENTER
-      SERIAL_ECHOLNPGM_P(SP_X_STR, m.obj_center.x);
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, m.obj_center.x);
     #endif
     #if HAS_Y_CENTER
-      SERIAL_ECHOLNPGM_P(SP_Y_STR, m.obj_center.y);
+      SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.obj_center.y);
     #endif
-    SERIAL_ECHOLNPGM_P(SP_Z_STR, m.obj_center.z);
+    SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.obj_center.z);
     #if HAS_I_CENTER
-      SERIAL_ECHOLNPGM_P(SP_I_STR, m.obj_center.i);
+      SERIAL_ECHOLNPAIR_P(SP_I_STR, m.obj_center.i);
     #endif
     #if HAS_J_CENTER
-      SERIAL_ECHOLNPGM_P(SP_J_STR, m.obj_center.j);
+      SERIAL_ECHOLNPAIR_P(SP_J_STR, m.obj_center.j);
     #endif
     #if HAS_K_CENTER
-      SERIAL_ECHOLNPGM_P(SP_K_STR, m.obj_center.k);
+      SERIAL_ECHOLNPAIR_P(SP_K_STR, m.obj_center.k);
     #endif
     SERIAL_EOL();
   }
@@ -422,45 +422,45 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     SERIAL_ECHOLNPGM("Backlash:");
     #if AXIS_CAN_CALIBRATE(X)
       #if ENABLED(CALIBRATION_MEASURE_LEFT)
-        SERIAL_ECHOLNPGM("  Left: ", m.backlash[LEFT]);
+        SERIAL_ECHOLNPAIR("  Left: ", m.backlash[LEFT]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_RIGHT)
-        SERIAL_ECHOLNPGM("  Right: ", m.backlash[RIGHT]);
+        SERIAL_ECHOLNPAIR("  Right: ", m.backlash[RIGHT]);
       #endif
     #endif
     #if HAS_Y_AXIS && AXIS_CAN_CALIBRATE(Y)
       #if ENABLED(CALIBRATION_MEASURE_FRONT)
-        SERIAL_ECHOLNPGM("  Front: ", m.backlash[FRONT]);
+        SERIAL_ECHOLNPAIR("  Front: ", m.backlash[FRONT]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_BACK)
-        SERIAL_ECHOLNPGM("  Back: ", m.backlash[BACK]);
+        SERIAL_ECHOLNPAIR("  Back: ", m.backlash[BACK]);
       #endif
     #endif
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
-      SERIAL_ECHOLNPGM("  Top: ", m.backlash[TOP]);
+      SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     #endif
     #if LINEAR_AXES >= 4 && AXIS_CAN_CALIBRATE(I)
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
-        SERIAL_ECHOLNPGM("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_IMAX)
-        SERIAL_ECHOLNPGM("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 5 && AXIS_CAN_CALIBRATE(J)
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
-        SERIAL_ECHOLNPGM("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_JMAX)
-        SERIAL_ECHOLNPGM("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 6 && AXIS_CAN_CALIBRATE(K)
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
-        SERIAL_ECHOLNPGM("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_KMAX)
-        SERIAL_ECHOLNPGM("  " STR_K_MAX ": ", m.backlash[KMAXIMUM]);
+        SERIAL_ECHOLNPAIR("  " STR_K_MAX ": ", m.backlash[KMAXIMUM]);
       #endif
     #endif
     SERIAL_EOL();
@@ -471,22 +471,22 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     SERIAL_ECHO(active_extruder);
     SERIAL_ECHOLNPGM(" Positional Error:");
     #if HAS_X_CENTER && AXIS_CAN_CALIBRATE(X)
-      SERIAL_ECHOLNPGM_P(SP_X_STR, m.pos_error.x);
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, m.pos_error.x);
     #endif
     #if HAS_Y_CENTER && AXIS_CAN_CALIBRATE(Y)
-      SERIAL_ECHOLNPGM_P(SP_Y_STR, m.pos_error.y);
+      SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.pos_error.y);
     #endif
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
-      SERIAL_ECHOLNPGM_P(SP_Z_STR, m.pos_error.z);
+      SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
     #endif
     #if HAS_I_CENTER && AXIS_CAN_CALIBRATE(I)
-      SERIAL_ECHOLNPGM_P(SP_I_STR, m.pos_error.i);
+      SERIAL_ECHOLNPAIR_P(SP_I_STR, m.pos_error.i);
     #endif
     #if HAS_J_CENTER && AXIS_CAN_CALIBRATE(J)
-      SERIAL_ECHOLNPGM_P(SP_J_STR, m.pos_error.j);
+      SERIAL_ECHOLNPAIR_P(SP_J_STR, m.pos_error.j);
     #endif
     #if HAS_K_CENTER && AXIS_CAN_CALIBRATE(K)
-      SERIAL_ECHOLNPGM_P(SP_Z_STR, m.pos_error.z);
+      SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
     #endif
     SERIAL_EOL();
   }
@@ -494,10 +494,10 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   inline void report_measured_nozzle_dimensions(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Nozzle Tip Outer Dimensions:");
     #if HAS_X_CENTER
-      SERIAL_ECHOLNPGM_P(SP_X_STR, m.nozzle_outer_dimension.x);
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, m.nozzle_outer_dimension.x);
     #endif
     #if HAS_Y_CENTER
-      SERIAL_ECHOLNPGM_P(SP_Y_STR, m.nozzle_outer_dimension.y);
+      SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.nozzle_outer_dimension.y);
     #endif
     SERIAL_EOL();
     UNUSED(m);
@@ -509,7 +509,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     //
     inline void report_hotend_offsets() {
       LOOP_S_L_N(e, 1, HOTENDS)
-        SERIAL_ECHOLNPGM_P(PSTR("T"), e, PSTR(" Hotend Offset X"), hotend_offset[e].x, SP_Y_STR, hotend_offset[e].y, SP_Z_STR, hotend_offset[e].z);
+        SERIAL_ECHOLNPAIR_P(PSTR("T"), e, PSTR(" Hotend Offset X"), hotend_offset[e].x, SP_Y_STR, hotend_offset[e].y, SP_Z_STR, hotend_offset[e].z);
     }
   #endif
 
diff --git a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
index 170958c..2d1b944 100644
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
@@ -171,7 +171,7 @@ void GcodeSuite::G76() {
   millis_t next_temp_report = millis() + 1000;
 
   auto report_targets = [&](const celsius_t tb, const celsius_t tp) {
-    SERIAL_ECHOLNPGM("Target Bed:", tb, " Probe:", tp);
+    SERIAL_ECHOLNPAIR("Target Bed:", tb, " Probe:", tp);
   };
 
   if (do_bed_cal) {
@@ -211,7 +211,7 @@ void GcodeSuite::G76() {
       if (isnan(measured_z) || target_bed > (BED_MAX_TARGET)) break;
     }
 
-    SERIAL_ECHOLNPGM("Retrieved measurements: ", temp_comp.get_index());
+    SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
     if (temp_comp.finish_calibration(TSI_BED)) {
       say_successfully_calibrated();
       SERIAL_ECHOLNPGM(" bed.");
@@ -255,7 +255,7 @@ void GcodeSuite::G76() {
       do_blocking_move_to(noz_pos_xyz);
 
       say_waiting_for_probe_heating();
-      SERIAL_ECHOLNPGM(" Bed:", target_bed, " Probe:", target_probe);
+      SERIAL_ECHOLNPAIR(" Bed:", target_bed, " Probe:", target_probe);
       const millis_t probe_timeout_ms = millis() + SEC_TO_MS(900UL);
       while (thermalManager.degProbe() < target_probe) {
         if (report_temps(next_temp_report, probe_timeout_ms)) {
@@ -270,7 +270,7 @@ void GcodeSuite::G76() {
       if (isnan(measured_z) || target_probe > cali_info_init[TSI_PROBE].end_temp) break;
     }
 
-    SERIAL_ECHOLNPGM("Retrieved measurements: ", temp_comp.get_index());
+    SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
     if (temp_comp.finish_calibration(TSI_PROBE))
       say_successfully_calibrated();
     else
@@ -325,7 +325,7 @@ void GcodeSuite::M871() {
                                 TSI_PROBE
                               );
     if (idx > 0 && temp_comp.set_offset(mod, idx - 1, offset_val))
-      SERIAL_ECHOLNPGM("Set value: ", offset_val);
+      SERIAL_ECHOLNPAIR("Set value: ", offset_val);
     else
       SERIAL_ECHOLNPGM("!Invalid index. Failed to set value (note: value at index 0 is constant).");
 
diff --git a/Marlin/src/gcode/calibrate/M100.cpp b/Marlin/src/gcode/calibrate/M100.cpp
index 0e2d429..ee572e0 100644
--- a/Marlin/src/gcode/calibrate/M100.cpp
+++ b/Marlin/src/gcode/calibrate/M100.cpp
@@ -202,7 +202,7 @@ inline int check_for_free_memory_corruption(PGM_P const title) {
   char *start_free_memory = free_memory_start, *end_free_memory = free_memory_end;
   int n = end_free_memory - start_free_memory;
 
-  SERIAL_ECHOLNPGM("\nfmc() n=", n,
+  SERIAL_ECHOLNPAIR("\nfmc() n=", n,
                     "\nfree_memory_start=", hex_address(free_memory_start),
                     "  end=", hex_address(end_free_memory));
 
@@ -227,15 +227,15 @@ inline int check_for_free_memory_corruption(PGM_P const title) {
     if (start_free_memory[i] == TEST_BYTE) {
       int32_t j = count_test_bytes(start_free_memory + i);
       if (j > 8) {
-        //SERIAL_ECHOPGM("Found ", j);
-        //SERIAL_ECHOLNPGM(" bytes free at ", hex_address(start_free_memory + i));
+        //SERIAL_ECHOPAIR("Found ", j);
+        //SERIAL_ECHOLNPAIR(" bytes free at ", hex_address(start_free_memory + i));
         i += j;
         block_cnt++;
-        SERIAL_ECHOLNPGM(" (", block_cnt, ") found=", j);
+        SERIAL_ECHOLNPAIR(" (", block_cnt, ") found=", j);
       }
     }
   }
-  SERIAL_ECHOPGM("  block_found=", block_cnt);
+  SERIAL_ECHOPAIR("  block_found=", block_cnt);
 
   if (block_cnt != 1)
     SERIAL_ECHOLNPGM("\nMemory Corruption detected in free memory area.");
@@ -267,7 +267,7 @@ inline void free_memory_pool_report(char * const start_free_memory, const int32_
     if (*addr == TEST_BYTE) {
       const int32_t j = count_test_bytes(addr);
       if (j > 8) {
-        SERIAL_ECHOLNPGM("Found ", j, " bytes free at ", hex_address(addr));
+        SERIAL_ECHOLNPAIR("Found ", j, " bytes free at ", hex_address(addr));
         if (j > max_cnt) {
           max_cnt  = j;
           max_addr = addr;
@@ -277,11 +277,11 @@ inline void free_memory_pool_report(char * const start_free_memory, const int32_
       }
     }
   }
-  if (block_cnt > 1) SERIAL_ECHOLNPGM(
+  if (block_cnt > 1) SERIAL_ECHOLNPAIR(
     "\nMemory Corruption detected in free memory area."
     "\nLargest free block is ", max_cnt, " bytes at ", hex_address(max_addr)
   );
-  SERIAL_ECHOLNPGM("check_for_free_memory_corruption() = ", check_for_free_memory_corruption(PSTR("M100 F ")));
+  SERIAL_ECHOLNPAIR("check_for_free_memory_corruption() = ", check_for_free_memory_corruption(PSTR("M100 F ")));
 }
 
 #if ENABLED(M100_FREE_MEMORY_CORRUPTOR)
@@ -299,7 +299,7 @@ inline void free_memory_pool_report(char * const start_free_memory, const int32_
     for (uint32_t i = 1; i <= size; i++) {
       char * const addr = start_free_memory + i * j;
       *addr = i;
-      SERIAL_ECHOPGM("\nCorrupting address: ", hex_address(addr));
+      SERIAL_ECHOPAIR("\nCorrupting address: ", hex_address(addr));
     }
     SERIAL_EOL();
   }
@@ -327,8 +327,8 @@ inline void init_free_memory(char *start_free_memory, int32_t size) {
 
   for (int32_t i = 0; i < size; i++) {
     if (start_free_memory[i] != TEST_BYTE) {
-      SERIAL_ECHOPGM("? address : ", hex_address(start_free_memory + i));
-      SERIAL_ECHOLNPGM("=", hex_byte(start_free_memory[i]));
+      SERIAL_ECHOPAIR("? address : ", hex_address(start_free_memory + i));
+      SERIAL_ECHOLNPAIR("=", hex_byte(start_free_memory[i]));
       SERIAL_EOL();
     }
   }
@@ -340,14 +340,14 @@ inline void init_free_memory(char *start_free_memory, int32_t size) {
 void GcodeSuite::M100() {
   char *sp = top_of_stack();
   if (!free_memory_end) free_memory_end = sp - MEMORY_END_CORRECTION;
-                  SERIAL_ECHOPGM("\nbss_end               : ", hex_address(end_bss));
-  if (heaplimit)  SERIAL_ECHOPGM("\n__heaplimit           : ", hex_address(heaplimit));
-                  SERIAL_ECHOPGM("\nfree_memory_start     : ", hex_address(free_memory_start));
-  if (stacklimit) SERIAL_ECHOPGM("\n__stacklimit          : ", hex_address(stacklimit));
-                  SERIAL_ECHOPGM("\nfree_memory_end       : ", hex_address(free_memory_end));
+                  SERIAL_ECHOPAIR("\nbss_end               : ", hex_address(end_bss));
+  if (heaplimit)  SERIAL_ECHOPAIR("\n__heaplimit           : ", hex_address(heaplimit));
+                  SERIAL_ECHOPAIR("\nfree_memory_start     : ", hex_address(free_memory_start));
+  if (stacklimit) SERIAL_ECHOPAIR("\n__stacklimit          : ", hex_address(stacklimit));
+                  SERIAL_ECHOPAIR("\nfree_memory_end       : ", hex_address(free_memory_end));
   if (MEMORY_END_CORRECTION)
-                  SERIAL_ECHOPGM("\nMEMORY_END_CORRECTION : ", MEMORY_END_CORRECTION);
-                  SERIAL_ECHOLNPGM("\nStack Pointer       : ", hex_address(sp));
+                  SERIAL_ECHOPAIR("\nMEMORY_END_CORRECTION : ", MEMORY_END_CORRECTION);
+                  SERIAL_ECHOLNPAIR("\nStack Pointer       : ", hex_address(sp));
 
   // Always init on the first invocation of M100
   static bool m100_not_initialized = true;
diff --git a/Marlin/src/gcode/calibrate/M12.cpp b/Marlin/src/gcode/calibrate/M12.cpp
index 191ff22..da24454 100644
--- a/Marlin/src/gcode/calibrate/M12.cpp
+++ b/Marlin/src/gcode/calibrate/M12.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../inc/MarlinConfigPre.h"
 
 #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 1d314a3..f30de00 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -86,7 +86,7 @@ void GcodeSuite::M425() {
     SERIAL_ECHOPGM("Backlash Correction ");
     if (!backlash.correction) SERIAL_ECHOPGM("in");
     SERIAL_ECHOLNPGM("active:");
-    SERIAL_ECHOLNPGM("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
+    SERIAL_ECHOLNPAIR("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
     LOOP_LINEAR_AXES(a) if (axis_can_calibrate(a)) {
       SERIAL_CHAR(' ', AXIS_CHAR(a));
@@ -95,7 +95,7 @@ void GcodeSuite::M425() {
     }
 
     #ifdef BACKLASH_SMOOTHING_MM
-      SERIAL_ECHOLNPGM("  Smoothing (mm):                 S", backlash.smoothing_mm);
+      SERIAL_ECHOLNPAIR("  Smoothing (mm):                 S", backlash.smoothing_mm);
     #endif
 
     #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
@@ -113,22 +113,4 @@ void GcodeSuite::M425() {
   }
 }
 
-void GcodeSuite::M425_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_BACKLASH_COMPENSATION));
-  SERIAL_ECHOLNPGM_P(
-    PSTR("  M425 F"), backlash.get_correction()
-    #ifdef BACKLASH_SMOOTHING_MM
-      , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
-    #endif
-    , LIST_N(DOUBLE(LINEAR_AXES),
-        SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x),
-        SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y),
-        SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z),
-        SP_I_STR, LINEAR_UNIT(backlash.distance_mm.i),
-        SP_J_STR, LINEAR_UNIT(backlash.distance_mm.j),
-        SP_K_STR, LINEAR_UNIT(backlash.distance_mm.k)
-      )
-  );
-}
-
 #endif // BACKLASH_GCODE
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 9db90c7..19b11f6 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -162,7 +162,7 @@ void GcodeSuite::M48() {
           #endif
         );
         if (verbose_level > 3) {
-          SERIAL_ECHOPGM("Start radius:", radius, " angle:", angle, " dir:");
+          SERIAL_ECHOPAIR("Start radius:", radius, " angle:", angle, " dir:");
           if (dir > 0) SERIAL_CHAR('C');
           SERIAL_ECHOLNPGM("CW");
         }
@@ -200,7 +200,7 @@ void GcodeSuite::M48() {
             while (!probe.can_reach(next_pos)) {
               next_pos *= 0.8f;
               if (verbose_level > 3)
-                SERIAL_ECHOLNPGM_P(PSTR("Moving inward: X"), next_pos.x, SP_Y_STR, next_pos.y);
+                SERIAL_ECHOLNPAIR_P(PSTR("Moving inward: X"), next_pos.x, SP_Y_STR, next_pos.y);
             }
           #elif HAS_ENDSTOPS
             // For a rectangular bed just keep the probe in bounds
@@ -209,7 +209,7 @@ void GcodeSuite::M48() {
           #endif
 
           if (verbose_level > 3)
-            SERIAL_ECHOLNPGM_P(PSTR("Going to: X"), next_pos.x, SP_Y_STR, next_pos.y);
+            SERIAL_ECHOLNPAIR_P(PSTR("Going to: X"), next_pos.x, SP_Y_STR, next_pos.y);
 
           do_blocking_move_to_xy(next_pos);
         } // n_legs loop
@@ -241,7 +241,7 @@ void GcodeSuite::M48() {
 
       if (verbose_level > 1) {
         SERIAL_ECHO(n + 1);
-        SERIAL_ECHOPGM(" of ", n_samples);
+        SERIAL_ECHOPAIR(" of ", n_samples);
         SERIAL_ECHOPAIR_F(": z: ", pz, 3);
         SERIAL_CHAR(' ');
         dev_report(verbose_level > 2, mean, sigma, min, max);
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index 09b5ec8..0d0c414 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -30,7 +30,6 @@
 #if ENABLED(DELTA)
 
   #include "../../module/delta.h"
-
   /**
    * M665: Set delta configurations
    *
@@ -46,8 +45,6 @@
    *    C = Gamma (Tower 3) diagonal rod trim
    */
   void GcodeSuite::M665() {
-    if (!parser.seen_any()) return M665_report();
-
     if (parser.seenval('H')) delta_height              = parser.value_linear_units();
     if (parser.seenval('L')) delta_diagonal_rod        = parser.value_linear_units();
     if (parser.seenval('R')) delta_radius              = parser.value_linear_units();
@@ -61,22 +58,6 @@
     recalc_delta_settings();
   }
 
-  void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_DELTA_SETTINGS));
-    SERIAL_ECHOLNPGM_P(
-        PSTR("  M665 L"), LINEAR_UNIT(delta_diagonal_rod)
-      , PSTR(" R"), LINEAR_UNIT(delta_radius)
-      , PSTR(" H"), LINEAR_UNIT(delta_height)
-      , PSTR(" S"), segments_per_second
-      , SP_X_STR, LINEAR_UNIT(delta_tower_angle_trim.a)
-      , SP_Y_STR, LINEAR_UNIT(delta_tower_angle_trim.b)
-      , SP_Z_STR, LINEAR_UNIT(delta_tower_angle_trim.c)
-      , PSTR(" A"), LINEAR_UNIT(delta_diagonal_rod_trim.a)
-      , PSTR(" B"), LINEAR_UNIT(delta_diagonal_rod_trim.b)
-      , PSTR(" C"), LINEAR_UNIT(delta_diagonal_rod_trim.c)
-    );
-  }
-
 #elif IS_SCARA
 
   #include "../../module/scara.h"
@@ -87,9 +68,6 @@
    * Parameters:
    *
    *   S[segments-per-second] - Segments-per-second
-   *
-   * Without NO_WORKSPACE_OFFSETS:
-   *
    *   P[theta-psi-offset]    - Theta-Psi offset, added to the shoulder (A/X) angle
    *   T[theta-offset]        - Theta     offset, added to the elbow    (B/Y) angle
    *   Z[z-offset]            - Z offset, added to Z
@@ -98,8 +76,6 @@
    *   B, T, and Y are all aliases for the elbow angle
    */
   void GcodeSuite::M665() {
-    if (!parser.seen_any()) return M665_report();
-
     if (parser.seenval('S')) segments_per_second = parser.value_float();
 
     #if HAS_SCARA_OFFSET
@@ -131,18 +107,6 @@
     #endif // HAS_SCARA_OFFSET
   }
 
-  void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_SCARA_SETTINGS " (" STR_SCARA_S TERN_(HAS_SCARA_OFFSET, " " STR_SCARA_P_T_Z) ")"));
-    SERIAL_ECHOLNPGM_P(
-      PSTR("  M665 S"), segments_per_second
-      #if HAS_SCARA_OFFSET
-        , SP_P_STR, scara_home_offset.a
-        , SP_T_STR, scara_home_offset.b
-        , SP_Z_STR, LINEAR_UNIT(scara_home_offset.z)
-      #endif
-    );
-  }
-
 #endif
 
 #endif // IS_KINEMATIC
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index c4149c2..872344e 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -36,6 +36,38 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../core/debug_out.h"
 
+void M666_report(const bool forReplay=true) {
+  if (!forReplay) { SERIAL_ECHOLNPGM("; Endstop adjustment:"); SERIAL_ECHO_START(); }
+  #if ENABLED(DELTA)
+    SERIAL_ECHOLNPAIR_P(
+        PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
+      , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
+      , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
+    );
+  #else
+    SERIAL_ECHOPGM("  M666");
+    #if ENABLED(X_DUAL_ENDSTOPS)
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
+    #endif
+    #if ENABLED(Y_DUAL_ENDSTOPS)
+      SERIAL_ECHOLNPAIR_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
+    #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      #if NUM_Z_STEPPER_DRIVERS >= 3
+        SERIAL_ECHOPAIR(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        if (!forReplay) SERIAL_ECHO_START();
+        SERIAL_ECHOPAIR("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        #if NUM_Z_STEPPER_DRIVERS >= 4
+          if (!forReplay) SERIAL_ECHO_START();
+          SERIAL_ECHOPAIR("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
+        #endif
+      #else
+        SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
+      #endif
+    #endif
+  #endif
+}
+
 #if ENABLED(DELTA)
 
   /**
@@ -52,23 +84,14 @@
           is_err = true;
         else {
           delta_endstop_adj[i] = v;
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("delta_endstop_adj[", AS_CHAR(AXIS_CHAR(i)), "] = ", v);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", AS_CHAR(AXIS_CHAR(i)), "] = ", v);
         }
       }
     }
-    if (is_err) SERIAL_ECHOLNPGM("?M666 offsets must be <= 0");
+    if (is_err) SERIAL_ECHOLNPAIR("?M666 offsets must be <= 0");
     if (!is_set) M666_report();
   }
 
-  void GcodeSuite::M666_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
-    SERIAL_ECHOLNPGM_P(
-        PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
-      , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
-      , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
-    );
-  }
-
 #else
 
   /**
@@ -82,8 +105,6 @@
    *       Set All: M666 Z<offset>
    */
   void GcodeSuite::M666() {
-    if (!parser.seen_any()) return M666_report();
-
     #if ENABLED(X_DUAL_ENDSTOPS)
       if (parser.seenval('X')) endstops.x2_endstop_adj = parser.value_linear_units();
     #endif
@@ -102,30 +123,7 @@
         #endif
       }
     #endif
-  }
-
-  void GcodeSuite::M666_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
-    SERIAL_ECHOPGM("  M666");
-    #if ENABLED(X_DUAL_ENDSTOPS)
-      SERIAL_ECHOLNPGM_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
-    #endif
-    #if ENABLED(Y_DUAL_ENDSTOPS)
-      SERIAL_ECHOLNPGM_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
-    #endif
-    #if ENABLED(Z_MULTI_ENDSTOPS)
-      #if NUM_Z_STEPPER_DRIVERS >= 3
-        SERIAL_ECHOPGM(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
-        report_echo_start(forReplay);
-        SERIAL_ECHOPGM("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
-        #if NUM_Z_STEPPER_DRIVERS >= 4
-          report_echo_start(forReplay);
-          SERIAL_ECHOPGM("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
-        #endif
-      #else
-        SERIAL_ECHOLNPGM_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
-      #endif
-    #endif
+    if (!parser.seen("XYZ")) M666_report();
   }
 
 #endif // HAS_EXTRA_ENDSTOPS
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index c4361b8..73b18ad 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -36,11 +36,10 @@
  *  K[yz_factor] - New YZ skew factor
  */
 void GcodeSuite::M852() {
-  if (!parser.seen("SIJK")) return M852_report();
+  uint8_t ijk = 0, badval = 0, setval = 0;
 
-  uint8_t badval = 0, setval = 0;
-
-  if (parser.seenval('I') || parser.seenval('S')) {
+  if (parser.seen('I') || parser.seen('S')) {
+    ++ijk;
     const float value = parser.value_linear_units();
     if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
       if (planner.skew_factor.xy != value) {
@@ -54,7 +53,8 @@ void GcodeSuite::M852() {
 
   #if ENABLED(SKEW_CORRECTION_FOR_Z)
 
-    if (parser.seenval('J')) {
+    if (parser.seen('J')) {
+      ++ijk;
       const float value = parser.value_linear_units();
       if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
         if (planner.skew_factor.xz != value) {
@@ -66,7 +66,8 @@ void GcodeSuite::M852() {
         ++badval;
     }
 
-    if (parser.seenval('K')) {
+    if (parser.seen('K')) {
+      ++ijk;
       const float value = parser.value_linear_units();
       if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
         if (planner.skew_factor.yz != value) {
@@ -89,18 +90,17 @@ void GcodeSuite::M852() {
     sync_plan_position();
     report_current_position();
   }
-}
 
-void GcodeSuite::M852_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_SKEW_FACTOR));
-  SERIAL_ECHOPAIR_F("  M851 I", planner.skew_factor.xy, 6);
-  #if ENABLED(SKEW_CORRECTION_FOR_Z)
-    SERIAL_ECHOPAIR_F(" J", planner.skew_factor.xz, 6);
-    SERIAL_ECHOPAIR_F(" K", planner.skew_factor.yz, 6);
-    SERIAL_ECHOLNPGM(" ; XY, XZ, YZ");
-  #else
-    SERIAL_ECHOLNPGM(" ; XY");
-  #endif
+  if (!ijk) {
+    SERIAL_ECHO_START();
+    SERIAL_ECHOPGM("Skew Factor");
+    SERIAL_ECHOPAIR_F(" XY: ", planner.skew_factor.xy, 6);
+    #if ENABLED(SKEW_CORRECTION_FOR_Z)
+      SERIAL_ECHOPAIR_F(" XZ: ", planner.skew_factor.xz, 6);
+      SERIAL_ECHOPAIR_F(" YZ: ", planner.skew_factor.yz, 6);
+    #endif
+    SERIAL_EOL();
+  }
 }
 
 #endif // SKEW_CORRECTION_GCODE
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 2880bd9..a2bcb8b 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -32,14 +32,9 @@
    *    T<extruder> - Optional extruder number. Current extruder if omitted.
    *    D<linear>   - Set filament diameter and enable. D0 disables volumetric.
    *    S<bool>     - Turn volumetric ON or OFF.
-   *
-   * With VOLUMETRIC_EXTRUDER_LIMIT:
-   *
    *    L<float>    - Volumetric extruder limit (in mm^3/sec). L0 disables the limit.
    */
   void GcodeSuite::M200() {
-    if (!parser.seen("DST" TERN_(VOLUMETRIC_EXTRUDER_LIMIT, "L")))
-      return M200_report();
 
     const int8_t target_extruder = get_target_extruder_from_command();
     if (target_extruder < 0) return;
@@ -74,37 +69,6 @@
     planner.calculate_volumetric_multipliers();
   }
 
-  void GcodeSuite::M200_report(const bool forReplay/*=true*/) {
-    if (!forReplay) {
-      report_heading(forReplay, PSTR(STR_FILAMENT_SETTINGS), false);
-      if (!parser.volumetric_enabled) SERIAL_ECHOPGM(" (Disabled):");
-      SERIAL_EOL();
-      report_echo_start(forReplay);
-    }
-
-    #if EXTRUDERS == 1
-    {
-      SERIAL_ECHOLNPGM(
-        "  M200 S", parser.volumetric_enabled, " D", LINEAR_UNIT(planner.filament_size[0])
-        #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
-          , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0])
-        #endif
-      );
-    }
-    #else
-      SERIAL_ECHOLNPGM("  M200 S", parser.volumetric_enabled);
-      LOOP_L_N(i, EXTRUDERS) {
-        report_echo_start(forReplay);
-        SERIAL_ECHOLNPGM(
-          "  M200 T", i, " D", LINEAR_UNIT(planner.filament_size[i])
-          #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
-            , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
-          #endif
-        );
-      }
-    #endif
-  }
-
 #endif // !NO_VOLUMETRICS
 
 /**
@@ -113,8 +77,6 @@
  *       With multiple extruders use T to specify which one.
  */
 void GcodeSuite::M201() {
-  if (!parser.seen("T" LOGICAL_AXES_STRING))
-    return M201_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
@@ -132,40 +94,12 @@ void GcodeSuite::M201() {
   }
 }
 
-void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_MAX_ACCELERATION));
-  SERIAL_ECHOLNPGM_P(
-    LIST_N(DOUBLE(LINEAR_AXES),
-      PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
-      SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
-      SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS]),
-      SP_I_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS]),
-      SP_J_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS]),
-      SP_K_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS])
-    )
-    #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
-      , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
-    #endif
-  );
-  #if ENABLED(DISTINCT_E_FACTORS)
-    LOOP_L_N(i, E_STEPPERS) {
-      report_echo_start(forReplay);
-      SERIAL_ECHOLNPGM_P(
-          PSTR("  M201 T"), i
-        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
-      );
-    }
-  #endif
-}
-
 /**
  * M203: Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in units/sec
  *
  *       With multiple extruders use T to specify which one.
  */
 void GcodeSuite::M203() {
-  if (!parser.seen("T" LOGICAL_AXES_STRING))
-    return M203_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
@@ -177,32 +111,6 @@ void GcodeSuite::M203() {
     }
 }
 
-void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_MAX_FEEDRATES));
-  SERIAL_ECHOLNPGM_P(
-    LIST_N(DOUBLE(LINEAR_AXES),
-      PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
-      SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
-      SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS]),
-      SP_I_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[I_AXIS]),
-      SP_J_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[J_AXIS]),
-      SP_K_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[K_AXIS])
-    )
-    #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
-      , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
-    #endif
-  );
-  #if ENABLED(DISTINCT_E_FACTORS)
-    LOOP_L_N(i, E_STEPPERS) {
-      SERIAL_ECHO_START();
-      SERIAL_ECHOLNPGM_P(
-          PSTR("  M203 T"), i
-        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
-      );
-    }
-  #endif
-}
-
 /**
  * M204: Set Accelerations in units/sec^2 (M204 P1200 R3000 T3000)
  *
@@ -211,8 +119,11 @@ void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
  *    T = Travel (non printing) moves
  */
 void GcodeSuite::M204() {
-  if (!parser.seen("PRST"))
-    return M204_report();
+  if (!parser.seen("PRST")) {
+    SERIAL_ECHOPAIR("Acceleration: P", planner.settings.acceleration);
+    SERIAL_ECHOPAIR(" R", planner.settings.retract_acceleration);
+    SERIAL_ECHOLNPAIR_P(SP_T_STR, planner.settings.travel_acceleration);
+  }
   else {
     //planner.synchronize();
     // 'S' for legacy compatibility. Should NOT BE USED for new development
@@ -223,15 +134,6 @@ void GcodeSuite::M204() {
   }
 }
 
-void GcodeSuite::M204_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_ACCELERATION_P_R_T));
-  SERIAL_ECHOLNPGM_P(
-      PSTR("  M204 P"), LINEAR_UNIT(planner.settings.acceleration)
-    , PSTR(" R"), LINEAR_UNIT(planner.settings.retract_acceleration)
-    , SP_T_STR, LINEAR_UNIT(planner.settings.travel_acceleration)
-  );
-}
-
 /**
  * M205: Set Advanced Settings
  *
@@ -245,8 +147,7 @@ void GcodeSuite::M204_report(const bool forReplay/*=true*/) {
  *    J = Junction Deviation (mm) (If not using CLASSIC_JERK)
  */
 void GcodeSuite::M205() {
-  if (!parser.seen("BST" TERN_(HAS_JUNCTION_DEVIATION, "J") TERN_(HAS_CLASSIC_JERK, "XYZE")))
-    return M205_report();
+  if (!parser.seen("BST" TERN_(HAS_JUNCTION_DEVIATION, "J") TERN_(HAS_CLASSIC_JERK, "XYZE"))) return;
 
   //planner.synchronize();
   if (parser.seenval('B')) planner.settings.min_segment_time_us = parser.value_ulong();
@@ -283,34 +184,3 @@ void GcodeSuite::M205() {
     #endif
   #endif // HAS_CLASSIC_JERK
 }
-
-void GcodeSuite::M205_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(
-    "Advanced (B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
-    TERN_(HAS_JUNCTION_DEVIATION, " J<junc_dev>")
-    TERN_(HAS_CLASSIC_JERK, " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>")
-    TERN_(HAS_CLASSIC_E_JERK, " E<max_e_jerk>")
-    ")"
-  ));
-  SERIAL_ECHOLNPGM_P(
-      PSTR("  M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
-    , PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
-    , SP_T_STR, LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
-    #if HAS_JUNCTION_DEVIATION
-      , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
-    #endif
-    #if HAS_CLASSIC_JERK
-      , LIST_N(DOUBLE(LINEAR_AXES),
-        SP_X_STR, LINEAR_UNIT(planner.max_jerk.x),
-        SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y),
-        SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z),
-        SP_I_STR, LINEAR_UNIT(planner.max_jerk.i),
-        SP_J_STR, LINEAR_UNIT(planner.max_jerk.j),
-        SP_K_STR, LINEAR_UNIT(planner.max_jerk.k)
-      )
-      #if HAS_CLASSIC_E_JERK
-        , SP_E_STR, LINEAR_UNIT(planner.max_jerk.e)
-      #endif
-    #endif
-  );
-}
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 11d8c43..2035ae5 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -33,6 +33,44 @@
 
 #include "../../MarlinCore.h" // for SP_X_STR, etc.
 
+void M217_report(const bool eeprom=false) {
+
+  #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
+    SERIAL_ECHOPGM_P(eeprom ? PSTR("  M217") : PSTR("Toolchange:"));
+    SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length));
+    SERIAL_ECHOPAIR_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
+                      SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
+                      SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
+    SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
+                    " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
+                    " F", toolchange_settings.fan_speed,
+                    " G", toolchange_settings.fan_time);
+
+    #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
+      SERIAL_ECHOPAIR(" A", migration.automode);
+      SERIAL_ECHOPAIR(" L", LINEAR_UNIT(migration.last));
+    #endif
+
+    #if ENABLED(TOOLCHANGE_PARK)
+      SERIAL_ECHOPAIR(" W", LINEAR_UNIT(toolchange_settings.enable_park));
+      SERIAL_ECHOPAIR_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
+      SERIAL_ECHOPAIR_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
+    #endif
+
+    #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
+      SERIAL_ECHOPAIR(" V", LINEAR_UNIT(enable_first_prime));
+    #endif
+
+  #else
+
+    UNUSED(eeprom);
+
+  #endif
+
+  SERIAL_ECHOPAIR_P(SP_Z_STR, LINEAR_UNIT(toolchange_settings.z_raise));
+  SERIAL_EOL();
+}
+
 /**
  * M217 - Set SINGLENOZZLE toolchange parameters
  *
@@ -130,39 +168,4 @@ void GcodeSuite::M217() {
   M217_report();
 }
 
-void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_TOOL_CHANGING));
-
-  SERIAL_ECHOPGM("  M217");
-
-  #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-    SERIAL_ECHOPGM(" S", LINEAR_UNIT(toolchange_settings.swap_length));
-    SERIAL_ECHOPGM_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
-                      SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
-                      SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
-    SERIAL_ECHOPGM(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
-                    " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
-                    " F", toolchange_settings.fan_speed,
-                    " G", toolchange_settings.fan_time);
-
-    #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
-      SERIAL_ECHOPGM(" A", migration.automode);
-      SERIAL_ECHOPGM(" L", LINEAR_UNIT(migration.last));
-    #endif
-
-    #if ENABLED(TOOLCHANGE_PARK)
-      SERIAL_ECHOPGM(" W", LINEAR_UNIT(toolchange_settings.enable_park));
-      SERIAL_ECHOPGM_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
-      SERIAL_ECHOPGM_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
-    #endif
-
-    #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
-      SERIAL_ECHOPGM(" V", LINEAR_UNIT(enable_first_prime));
-    #endif
-
-  #endif
-
-  SERIAL_ECHOLNPGM_P(SP_Z_STR, LINEAR_UNIT(toolchange_settings.z_raise));
-}
-
 #endif // HAS_MULTI_EXTRUDER
diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp
index c95cd6c..7701320 100644
--- a/Marlin/src/gcode/config/M218.cpp
+++ b/Marlin/src/gcode/config/M218.cpp
@@ -41,8 +41,6 @@
  */
 void GcodeSuite::M218() {
 
-  if (!parser.seen_any()) return M218_report();
-
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
 
@@ -50,23 +48,24 @@ void GcodeSuite::M218() {
   if (parser.seenval('Y')) hotend_offset[target_extruder].y = parser.value_linear_units();
   if (parser.seenval('Z')) hotend_offset[target_extruder].z = parser.value_linear_units();
 
+  if (!parser.seen("XYZ")) {
+    SERIAL_ECHO_START();
+    SERIAL_ECHOPGM(STR_HOTEND_OFFSET);
+    HOTEND_LOOP() {
+      SERIAL_CHAR(' ');
+      SERIAL_ECHO(hotend_offset[e].x);
+      SERIAL_CHAR(',');
+      SERIAL_ECHO(hotend_offset[e].y);
+      SERIAL_CHAR(',');
+      SERIAL_ECHO_F(hotend_offset[e].z, 3);
+    }
+    SERIAL_EOL();
+  }
+
   #if ENABLED(DELTA)
     if (target_extruder == active_extruder)
       do_blocking_move_to_xy(current_position, planner.settings.max_feedrate_mm_s[X_AXIS]);
   #endif
 }
 
-void GcodeSuite::M218_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_HOTEND_OFFSETS));
-  LOOP_S_L_N(e, 1, HOTENDS) {
-    report_echo_start(forReplay);
-    SERIAL_ECHOPGM_P(
-      PSTR("  M218 T"), e,
-      SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
-      SP_Y_STR, LINEAR_UNIT(hotend_offset[e].y)
-    );
-    SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(hotend_offset[e].z), 3);
-  }
-}
-
 #endif // HAS_HOTEND_OFFSET
diff --git a/Marlin/src/gcode/config/M220.cpp b/Marlin/src/gcode/config/M220.cpp
index c9070df..75339f1 100644
--- a/Marlin/src/gcode/config/M220.cpp
+++ b/Marlin/src/gcode/config/M220.cpp
@@ -44,7 +44,7 @@ void GcodeSuite::M220() {
   if (parser.seenval('S')) feedrate_percentage = parser.value_int();
 
   if (!parser.seen_any()) {
-    SERIAL_ECHOPGM("FR:", feedrate_percentage);
+    SERIAL_ECHOPAIR("FR:", feedrate_percentage);
     SERIAL_CHAR('%');
     SERIAL_EOL();
   }
diff --git a/Marlin/src/gcode/config/M221.cpp b/Marlin/src/gcode/config/M221.cpp
index f653ade..e380bfb 100644
--- a/Marlin/src/gcode/config/M221.cpp
+++ b/Marlin/src/gcode/config/M221.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M221() {
   else {
     SERIAL_ECHO_START();
     SERIAL_CHAR('E', '0' + target_extruder);
-    SERIAL_ECHOPGM(" Flow: ", planner.flow_percentage[target_extruder]);
+    SERIAL_ECHOPAIR(" Flow: ", planner.flow_percentage[target_extruder]);
     SERIAL_CHAR('%');
     SERIAL_EOL();
   }
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index ac91f08..eeb0fcc 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(EDITABLE_SERVO_ANGLES)
@@ -35,7 +34,6 @@
  *  U<angle> - Stowed Angle
  */
 void GcodeSuite::M281() {
-  if (!parser.seen_any()) return M281_report();
 
   if (!parser.seenval('P')) return;
 
@@ -47,32 +45,24 @@ void GcodeSuite::M281() {
         return;
       }
     #endif
-    if (parser.seen('L')) servo_angles[servo_index][0] = parser.value_int();
-    if (parser.seen('U')) servo_angles[servo_index][1] = parser.value_int();
+    bool angle_change = false;
+    if (parser.seen('L')) {
+      servo_angles[servo_index][0] = parser.value_int();
+      angle_change = true;
+    }
+    if (parser.seen('U')) {
+      servo_angles[servo_index][1] = parser.value_int();
+      angle_change = true;
+    }
+    if (!angle_change) {
+      SERIAL_ECHO_MSG(" Servo ", servo_index,
+                      " L", servo_angles[servo_index][0],
+                      " U", servo_angles[servo_index][1]);
+    }
   }
   else
     SERIAL_ERROR_MSG("Servo ", servo_index, " out of range");
-}
 
-void GcodeSuite::M281_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_SERVO_ANGLES));
-  LOOP_L_N(i, NUM_SERVOS) {
-    switch (i) {
-      default: break;
-      #if ENABLED(SWITCHING_EXTRUDER)
-        case SWITCHING_EXTRUDER_SERVO_NR:
-        #if EXTRUDERS > 3
-          case SWITCHING_EXTRUDER_E23_SERVO_NR:
-        #endif
-      #elif ENABLED(SWITCHING_NOZZLE)
-        case SWITCHING_NOZZLE_SERVO_NR:
-      #elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES))
-        case Z_PROBE_SERVO_NR:
-      #endif
-          report_echo_start(forReplay);
-          SERIAL_ECHOLNPGM("  M281 P", i, " L", servo_angles[i][0], " U", servo_angles[i][1]);
-    }
-  }
 }
 
 #endif // EDITABLE_SERVO_ANGLES
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index 19b4383..7b3f576 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -46,63 +46,46 @@
  *   F[float] Kf term
  */
 void GcodeSuite::M301() {
+
   // multi-extruder PID patch: M301 updates or prints a single extruder's PID values
   // default behavior (omitting E parameter) is to update for extruder 0 only
-  int8_t e = parser.byteval('E', -1); // extruder being updated
-
-  if (!parser.seen("PID" TERN_(PID_EXTRUSION_SCALING, "CL") TERN_(PID_FAN_SCALING, "F")))
-    return M301_report(true, e);
-
-  if (e == -1) e = 0;
+  const uint8_t e = parser.byteval('E'); // extruder being updated
 
   if (e < HOTENDS) { // catch bad input value
-
-    if (parser.seenval('P')) PID_PARAM(Kp, e) = parser.value_float();
-    if (parser.seenval('I')) PID_PARAM(Ki, e) = scalePID_i(parser.value_float());
-    if (parser.seenval('D')) PID_PARAM(Kd, e) = scalePID_d(parser.value_float());
-
+    if (parser.seen('P')) PID_PARAM(Kp, e) = parser.value_float();
+    if (parser.seen('I')) PID_PARAM(Ki, e) = scalePID_i(parser.value_float());
+    if (parser.seen('D')) PID_PARAM(Kd, e) = scalePID_d(parser.value_float());
     #if ENABLED(PID_EXTRUSION_SCALING)
-      if (parser.seenval('C')) PID_PARAM(Kc, e) = parser.value_float();
+      if (parser.seen('C')) PID_PARAM(Kc, e) = parser.value_float();
       if (parser.seenval('L')) thermalManager.lpq_len = parser.value_int();
       NOMORE(thermalManager.lpq_len, LPQ_MAX_LEN);
       NOLESS(thermalManager.lpq_len, 0);
     #endif
 
     #if ENABLED(PID_FAN_SCALING)
-      if (parser.seenval('F')) PID_PARAM(Kf, e) = parser.value_float();
+      if (parser.seen('F')) PID_PARAM(Kf, e) = parser.value_float();
     #endif
 
     thermalManager.updatePID();
+
+    SERIAL_ECHO_START();
+    #if ENABLED(PID_PARAMS_PER_HOTEND)
+      SERIAL_ECHOPAIR(" e:", e); // specify extruder in serial output
+    #endif
+    SERIAL_ECHOPAIR(" p:", PID_PARAM(Kp, e),
+                    " i:", unscalePID_i(PID_PARAM(Ki, e)),
+                    " d:", unscalePID_d(PID_PARAM(Kd, e)));
+    #if ENABLED(PID_EXTRUSION_SCALING)
+      SERIAL_ECHOPAIR(" c:", PID_PARAM(Kc, e));
+    #endif
+    #if ENABLED(PID_FAN_SCALING)
+      SERIAL_ECHOPAIR(" f:", PID_PARAM(Kf, e));
+    #endif
+
+    SERIAL_EOL();
   }
   else
     SERIAL_ERROR_MSG(STR_INVALID_EXTRUDER);
 }
 
-void GcodeSuite::M301_report(const bool forReplay/*=true*/, const int8_t eindex/*=-1*/) {
-  report_heading(forReplay, PSTR(STR_HOTEND_PID));
-  HOTEND_LOOP() {
-    if (e == eindex || eindex == -1) {
-      report_echo_start(forReplay);
-      SERIAL_ECHOPGM_P(
-        #if ENABLED(PID_PARAMS_PER_HOTEND)
-          PSTR("  M301 E"), e, SP_P_STR
-        #else
-          PSTR("  M301 P")
-        #endif
-        ,                          PID_PARAM(Kp, e)
-        , PSTR(" I"), unscalePID_i(PID_PARAM(Ki, e))
-        , PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
-      );
-      #if ENABLED(PID_EXTRUSION_SCALING)
-        SERIAL_ECHOPGM_P(SP_C_STR, PID_PARAM(Kc, e));
-        if (e == 0) SERIAL_ECHOPGM(" L", thermalManager.lpq_len);
-      #endif
-      #if ENABLED(PID_FAN_SCALING)
-        SERIAL_ECHOPGM(" F", PID_PARAM(Kf, e));
-      #endif
-      SERIAL_EOL();
-    }
-  }
-}
-
 #endif // PIDTEMP
diff --git a/Marlin/src/gcode/config/M302.cpp b/Marlin/src/gcode/config/M302.cpp
index 57c049e..e3ce5a1 100644
--- a/Marlin/src/gcode/config/M302.cpp
+++ b/Marlin/src/gcode/config/M302.cpp
@@ -56,7 +56,7 @@ void GcodeSuite::M302() {
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Cold extrudes are ");
     SERIAL_ECHOPGM_P(thermalManager.allow_cold_extrude ? PSTR("en") : PSTR("dis"));
-    SERIAL_ECHOLNPGM("abled (min temp ", thermalManager.extrude_min_temp, "C)");
+    SERIAL_ECHOLNPAIR("abled (min temp ", thermalManager.extrude_min_temp, "C)");
   }
 }
 
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index 05ee4ba..b1af5a5 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -35,19 +35,15 @@
  *  D<dval> - Set the D value
  */
 void GcodeSuite::M304() {
-  if (!parser.seen("PID")) return M304_report();
+
   if (parser.seen('P')) thermalManager.temp_bed.pid.Kp = parser.value_float();
   if (parser.seen('I')) thermalManager.temp_bed.pid.Ki = scalePID_i(parser.value_float());
   if (parser.seen('D')) thermalManager.temp_bed.pid.Kd = scalePID_d(parser.value_float());
-}
 
-void GcodeSuite::M304_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_BED_PID));
-  SERIAL_ECHO_MSG(
-      "  M304 P", thermalManager.temp_bed.pid.Kp
-    , " I", unscalePID_i(thermalManager.temp_bed.pid.Ki)
-    , " D", unscalePID_d(thermalManager.temp_bed.pid.Kd)
-  );
+  SERIAL_ECHO_MSG(" p:", thermalManager.temp_bed.pid.Kp,
+                  " i:", unscalePID_i(thermalManager.temp_bed.pid.Ki),
+                  " d:", unscalePID_d(thermalManager.temp_bed.pid.Kd));
+
 }
 
 #endif // PIDTEMPBED
diff --git a/Marlin/src/gcode/config/M305.cpp b/Marlin/src/gcode/config/M305.cpp
index 6957eef..10ef55c 100644
--- a/Marlin/src/gcode/config/M305.cpp
+++ b/Marlin/src/gcode/config/M305.cpp
@@ -70,10 +70,10 @@ void GcodeSuite::M305() {
   }                       // If not setting then report parameters
   else if (t_index < 0) { // ...all user thermistors
     LOOP_L_N(i, USER_THERMISTORS)
-      thermalManager.M305_report(i);
+      thermalManager.log_user_thermistor(i);
   }
   else                    // ...one user thermistor
-    thermalManager.M305_report(t_index);
+    thermalManager.log_user_thermistor(t_index);
 }
 
 #endif // HAS_USER_THERMISTORS
diff --git a/Marlin/src/gcode/config/M309.cpp b/Marlin/src/gcode/config/M309.cpp
index 01c4e62..2247481 100644
--- a/Marlin/src/gcode/config/M309.cpp
+++ b/Marlin/src/gcode/config/M309.cpp
@@ -35,19 +35,14 @@
  *  D<dval> - Set the D value
  */
 void GcodeSuite::M309() {
-  if (!parser.seen("PID")) return M309_report();
   if (parser.seen('P')) thermalManager.temp_chamber.pid.Kp = parser.value_float();
   if (parser.seen('I')) thermalManager.temp_chamber.pid.Ki = scalePID_i(parser.value_float());
   if (parser.seen('D')) thermalManager.temp_chamber.pid.Kd = scalePID_d(parser.value_float());
-}
 
-void GcodeSuite::M309_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_CHAMBER_PID));
-  SERIAL_ECHOLNPGM(
-      "  M309 P", thermalManager.temp_chamber.pid.Kp
-    , " I", unscalePID_i(thermalManager.temp_chamber.pid.Ki)
-    , " D", unscalePID_d(thermalManager.temp_chamber.pid.Kd)
-  );
+  SERIAL_ECHO_START();
+  SERIAL_ECHOLNPAIR(" p:", thermalManager.temp_chamber.pid.Kp,
+                    " i:", unscalePID_i(thermalManager.temp_chamber.pid.Ki),
+                    " d:", unscalePID_d(thermalManager.temp_chamber.pid.Kd));
 }
 
 #endif // PIDTEMPCHAMBER
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 08b45ef..84757e7 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -112,7 +112,7 @@ inline void toggle_pins() {
     }
     SERIAL_EOL();
   }
-  SERIAL_ECHOLNPGM(STR_DONE);
+  SERIAL_ECHOLNPGM("Done.");
 
 } // toggle_pins
 
@@ -130,7 +130,7 @@ inline void servo_probe_test() {
 
     const uint8_t probe_index = parser.byteval('P', Z_PROBE_SERVO_NR);
 
-    SERIAL_ECHOLNPGM("Servo probe test\n"
+    SERIAL_ECHOLNPAIR("Servo probe test\n"
                       ". using index:  ", probe_index,
                       ", deploy angle: ", servo_angles[probe_index][0],
                       ", stow angle:   ", servo_angles[probe_index][1]
@@ -143,7 +143,7 @@ inline void servo_probe_test() {
       #define PROBE_TEST_PIN Z_MIN_PIN
       constexpr bool probe_inverting = Z_MIN_ENDSTOP_INVERTING;
 
-      SERIAL_ECHOLNPGM(". Probe Z_MIN_PIN: ", PROBE_TEST_PIN);
+      SERIAL_ECHOLNPAIR(". Probe Z_MIN_PIN: ", PROBE_TEST_PIN);
       SERIAL_ECHOPGM(". Z_MIN_ENDSTOP_INVERTING: ");
 
     #else
@@ -151,7 +151,7 @@ inline void servo_probe_test() {
       #define PROBE_TEST_PIN Z_MIN_PROBE_PIN
       constexpr bool probe_inverting = Z_MIN_PROBE_ENDSTOP_INVERTING;
 
-      SERIAL_ECHOLNPGM(". Probe Z_MIN_PROBE_PIN: ", PROBE_TEST_PIN);
+      SERIAL_ECHOLNPAIR(". Probe Z_MIN_PROBE_PIN: ", PROBE_TEST_PIN);
       SERIAL_ECHOPGM(   ". Z_MIN_PROBE_ENDSTOP_INVERTING: ");
 
     #endif
@@ -211,11 +211,11 @@ inline void servo_probe_test() {
       if (deploy_state != stow_state) {
         SERIAL_ECHOLNPGM("= Mechanical Switch detected");
         if (deploy_state) {
-          SERIAL_ECHOLNPGM("  DEPLOYED state: HIGH (logic 1)",
+          SERIAL_ECHOLNPAIR("  DEPLOYED state: HIGH (logic 1)",
                             "  STOWED (triggered) state: LOW (logic 0)");
         }
         else {
-          SERIAL_ECHOLNPGM("  DEPLOYED state: LOW (logic 0)",
+          SERIAL_ECHOLNPAIR("  DEPLOYED state: LOW (logic 0)",
                             "  STOWED (triggered) state: HIGH (logic 1)");
         }
         #if ENABLED(BLTOUCH)
@@ -244,7 +244,7 @@ inline void servo_probe_test() {
         if (probe_counter == 15)
           SERIAL_ECHOLNPGM(": 30ms or more");
         else
-          SERIAL_ECHOLNPGM(" (+/- 4ms): ", probe_counter * 2);
+          SERIAL_ECHOLNPAIR(" (+/- 4ms): ", probe_counter * 2);
 
         if (probe_counter >= 4) {
           if (probe_counter == 15) {
diff --git a/Marlin/src/gcode/config/M575.cpp b/Marlin/src/gcode/config/M575.cpp
index 2c12428..7739510 100644
--- a/Marlin/src/gcode/config/M575.cpp
+++ b/Marlin/src/gcode/config/M575.cpp
@@ -53,13 +53,13 @@ void GcodeSuite::M575() {
     case 115200: case 250000: case 500000: case 1000000: {
       const int8_t port = parser.intval('P', -99);
       const bool set1 = (port == -99 || port == 0);
-      if (set1) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(0), " baud rate set to ", baud);
+      if (set1) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('0'), " baud rate set to ", baud);
       #if HAS_MULTI_SERIAL
         const bool set2 = (port == -99 || port == 1);
-        if (set2) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(1), " baud rate set to ", baud);
+        if (set2) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('1'), " baud rate set to ", baud);
         #ifdef SERIAL_PORT_3
           const bool set3 = (port == -99 || port == 2);
-          if (set3) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(2), " baud rate set to ", baud);
+          if (set3) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('2'), " baud rate set to ", baud);
         #endif
       #endif
 
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index ecc5e63..544c66a 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -23,6 +23,33 @@
 #include "../gcode.h"
 #include "../../module/planner.h"
 
+void report_M92(const bool echo=true, const int8_t e=-1) {
+  if (echo) SERIAL_ECHO_START(); else SERIAL_CHAR(' ');
+  SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES),
+    PSTR(" M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
+    SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
+    SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]),
+    SP_I_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[I_AXIS]),
+    SP_J_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[J_AXIS]),
+    SP_K_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]))
+  );
+  #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
+    SERIAL_ECHOPAIR_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
+  #endif
+  SERIAL_EOL();
+
+  #if ENABLED(DISTINCT_E_FACTORS)
+    LOOP_L_N(i, E_STEPPERS) {
+      if (e >= 0 && i != e) continue;
+      if (echo) SERIAL_ECHO_START(); else SERIAL_CHAR(' ');
+      SERIAL_ECHOLNPAIR_P(PSTR(" M92 T"), i,
+                        SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS_N(i)]));
+    }
+  #endif
+
+  UNUSED(e);
+}
+
 /**
  * M92: Set axis steps-per-unit for one or more axes, X, Y, Z, and E.
  *      (Follows the same syntax as G92)
@@ -31,11 +58,10 @@
  *
  *      If no argument is given print the current values.
  *
- * With MAGIC_NUMBERS_GCODE:
- *
- *   Use 'H' and/or 'L' to get ideal layer-height information.
- *   H<microsteps> - Specify micro-steps to use. Best guess if not supplied.
- *   L<linear>     - Desired layer height in current units. Nearest good heights are shown.
+ *    With MAGIC_NUMBERS_GCODE:
+ *      Use 'H' and/or 'L' to get ideal layer-height information.
+ *      'H' specifies micro-steps to use. We guess if it's not supplied.
+ *      'L' specifies a desired layer height. Nearest good heights are shown.
  */
 void GcodeSuite::M92() {
 
@@ -43,8 +69,10 @@ void GcodeSuite::M92() {
   if (target_extruder < 0) return;
 
   // No arguments? Show M92 report.
-  if (!parser.seen(LOGICAL_AXES_STRING TERN_(MAGIC_NUMBERS_GCODE, "HL")))
-    return M92_report(true, target_extruder);
+  if (!parser.seen(
+    LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)
+    TERN_(MAGIC_NUMBERS_GCODE, "HL")
+  )) return report_M92(true, target_extruder);
 
   LOOP_LOGICAL_AXES(i) {
     if (parser.seenval(axis_codes[i])) {
@@ -72,16 +100,16 @@ void GcodeSuite::M92() {
     #ifndef Z_MICROSTEPS
       #define Z_MICROSTEPS 16
     #endif
-    const float wanted = parser.linearval('L');
+    const float wanted = parser.floatval('L');
     if (parser.seen('H') || wanted) {
       const uint16_t argH = parser.ushortval('H'),
                      micro_steps = argH ?: Z_MICROSTEPS;
       const float z_full_step_mm = micro_steps * planner.steps_to_mm[Z_AXIS];
       SERIAL_ECHO_START();
-      SERIAL_ECHOPGM("{ micro_steps:", micro_steps, ", z_full_step_mm:", z_full_step_mm);
+      SERIAL_ECHOPAIR("{ micro_steps:", micro_steps, ", z_full_step_mm:", z_full_step_mm);
       if (wanted) {
         const float best = uint16_t(wanted / z_full_step_mm) * z_full_step_mm;
-        SERIAL_ECHOPGM(", best:[", best);
+        SERIAL_ECHOPAIR(", best:[", best);
         if (best != wanted) { SERIAL_CHAR(','); SERIAL_DECIMAL(best + z_full_step_mm); }
         SERIAL_CHAR(']');
       }
@@ -89,32 +117,3 @@ void GcodeSuite::M92() {
     }
   #endif
 }
-
-void GcodeSuite::M92_report(const bool forReplay/*=true*/, const int8_t e/*=-1*/) {
-  report_heading_etc(forReplay, PSTR(STR_STEPS_PER_UNIT));
-  SERIAL_ECHOPGM_P(LIST_N(DOUBLE(LINEAR_AXES),
-    PSTR("  M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
-    SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
-    SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]),
-    SP_I_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[I_AXIS]),
-    SP_J_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[J_AXIS]),
-    SP_K_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]))
-  );
-  #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
-    SERIAL_ECHOPGM_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
-  #endif
-  SERIAL_EOL();
-
-  #if ENABLED(DISTINCT_E_FACTORS)
-    LOOP_L_N(i, E_STEPPERS) {
-      if (e >= 0 && i != e) continue;
-      report_echo_start(forReplay);
-      SERIAL_ECHOLNPGM_P(
-        PSTR("  M92 T"), i,
-        SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS_N(i)])
-      );
-    }
-  #else
-    UNUSED(e);
-  #endif
-}
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index 69d20b4..e762e33 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -57,19 +57,19 @@ void GcodeSuite::M111() {
     SERIAL_ECHOPGM(STR_DEBUG_OFF);
     #if !defined(__AVR__) || !defined(USBCON)
       #if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
-        SERIAL_ECHOPGM("\nBuffer Overruns: ", MYSERIAL1.buffer_overruns());
+        SERIAL_ECHOPAIR("\nBuffer Overruns: ", MYSERIAL1.buffer_overruns());
       #endif
 
       #if ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS)
-        SERIAL_ECHOPGM("\nFraming Errors: ", MYSERIAL1.framing_errors());
+        SERIAL_ECHOPAIR("\nFraming Errors: ", MYSERIAL1.framing_errors());
       #endif
 
       #if ENABLED(SERIAL_STATS_DROPPED_RX)
-        SERIAL_ECHOPGM("\nDropped bytes: ", MYSERIAL1.dropped());
+        SERIAL_ECHOPAIR("\nDropped bytes: ", MYSERIAL1.dropped());
       #endif
 
       #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
-        SERIAL_ECHOPGM("\nMax RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
+        SERIAL_ECHOPAIR("\nMax RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
       #endif
     #endif // !__AVR__ || !USBCON
   }
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index e6e0f03..4ebb81c 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -33,7 +33,7 @@
  * M17: Enable stepper motors
  */
 void GcodeSuite::M17() {
-  if (parser.seen_axis()) {
+  if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
     LOGICAL_AXIS_CODE(
       if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) enable_e_steppers(),
       if (parser.seen_test('X'))        ENABLE_AXIS_X(),
@@ -59,7 +59,7 @@ void GcodeSuite::M18_M84() {
     stepper_inactive_time = parser.value_millis_from_seconds();
   }
   else {
-    if (parser.seen_axis()) {
+    if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
       planner.synchronize();
       LOGICAL_AXIS_CODE(
         if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) disable_e_steppers(),
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index a837d79..2ba777b 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -33,22 +33,14 @@
  * Usage: M211 S1 to enable, M211 S0 to disable, M211 alone for report
  */
 void GcodeSuite::M211() {
-  if (parser.seen('S'))
-    soft_endstop._enabled = parser.value_bool();
-  else
-    M211_report();
-}
-
-void GcodeSuite::M211_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_SOFT_ENDSTOPS));
-  SERIAL_ECHOPGM("  M211 S", AS_DIGIT(soft_endstop._enabled), " ; ");
-  serialprintln_onoff(soft_endstop._enabled);
-
-  report_echo_start(forReplay);
   const xyz_pos_t l_soft_min = soft_endstop.min.asLogical(),
                   l_soft_max = soft_endstop.max.asLogical();
+  SERIAL_ECHO_START();
+  SERIAL_ECHOPGM(STR_SOFT_ENDSTOPS);
+  if (parser.seen('S')) soft_endstop._enabled = parser.value_bool();
+  serialprint_onoff(soft_endstop._enabled);
   print_pos(l_soft_min, PSTR(STR_SOFT_MIN), PSTR(" "));
   print_pos(l_soft_max, PSTR(STR_SOFT_MAX));
 }
 
-#endif // HAS_SOFTWARE_ENDSTOPS
+#endif
diff --git a/Marlin/src/gcode/control/M280.cpp b/Marlin/src/gcode/control/M280.cpp
index f285adf..187c9a9 100644
--- a/Marlin/src/gcode/control/M280.cpp
+++ b/Marlin/src/gcode/control/M280.cpp
@@ -39,7 +39,7 @@ void GcodeSuite::M280() {
     if (parser.seen('S')) {
       const int a = parser.value_int();
       if (a == -1)
-        DETACH_SERVO(servo_index);
+        servo[servo_index].detach();
       else
         MOVE_SERVO(servo_index, a);
     }
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index ecae8b0..711bb7e 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -72,7 +72,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
       #if ENABLED(SPINDLE_SERVO)
         cutter.unitPower = spwr;
       #else
-        cutter.unitPower = TERN(SPINDLE_LASER_USE_PWM,
+        cutter.unitPower = TERN(SPINDLE_LASER_PWM,
                               cutter.power_to_range(cutter_power_t(round(spwr))),
                               spwr > 0 ? 255 : 0);
       #endif
@@ -86,7 +86,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
     if (parser.seen('I') == DISABLED(LASER_POWER_INLINE_INVERT)) {
       // Laser power in inline mode
       cutter.inline_direction(is_M4); // Should always be unused
-      #if ENABLED(SPINDLE_LASER_USE_PWM)
+      #if ENABLED(SPINDLE_LASER_PWM)
         if (parser.seen('O')) {
           cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
           cutter.inline_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
@@ -105,10 +105,10 @@ void GcodeSuite::M3_M4(const bool is_M4) {
   planner.synchronize();   // Wait for previous movement commands (G0/G0/G2/G3) to complete before changing power
   cutter.set_reverse(is_M4);
 
-  #if ENABLED(SPINDLE_LASER_USE_PWM)
+  #if ENABLED(SPINDLE_LASER_PWM)
     if (parser.seenval('O')) {
       cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
-      cutter.ocr_set_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
+      cutter.set_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
     }
     else
       cutter.set_power(cutter.upower_to_ocr(get_s_power()));
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index eead971..908260e 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -127,7 +127,7 @@ void GcodeSuite::M42() {
 
   #ifdef ARDUINO_ARCH_STM32
     // A simple I/O will be set to 0 by analogWrite()
-    if (pin_status <= 1 && !PWM_PIN(pin)) return;
+    if (pin_status <= 1) return;
   #endif
   analogWrite(pin, pin_status);
 }
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 08efaab..23d43dd 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -127,26 +127,26 @@
           case DXC_DUPLICATION_MODE:  DEBUG_ECHOPGM("DUPLICATION");  break;
           case DXC_MIRRORED_MODE:     DEBUG_ECHOPGM("MIRRORED");     break;
         }
-        DEBUG_ECHOPGM("\nActive Ext: ", active_extruder);
+        DEBUG_ECHOPAIR("\nActive Ext: ", active_extruder);
         if (!active_extruder_parked) DEBUG_ECHOPGM(" NOT ");
         DEBUG_ECHOPGM(" parked.");
-        DEBUG_ECHOPGM("\nactive_extruder_x_pos: ", current_position.x);
-        DEBUG_ECHOPGM("\ninactive_extruder_x: ", inactive_extruder_x);
-        DEBUG_ECHOPGM("\nextruder_duplication_enabled: ", extruder_duplication_enabled);
-        DEBUG_ECHOPGM("\nduplicate_extruder_x_offset: ", duplicate_extruder_x_offset);
-        DEBUG_ECHOPGM("\nduplicate_extruder_temp_offset: ", duplicate_extruder_temp_offset);
-        DEBUG_ECHOPGM("\ndelayed_move_time: ", delayed_move_time);
-        DEBUG_ECHOPGM("\nX1 Home X: ", x_home_pos(0), "\nX1_MIN_POS=", X1_MIN_POS, "\nX1_MAX_POS=", X1_MAX_POS);
-        DEBUG_ECHOPGM("\nX2 Home X: ", x_home_pos(1), "\nX2_MIN_POS=", X2_MIN_POS, "\nX2_MAX_POS=", X2_MAX_POS);
-        DEBUG_ECHOPGM("\nX2_HOME_DIR=", X2_HOME_DIR, "\nX2_HOME_POS=", X2_HOME_POS);
-        DEBUG_ECHOPGM("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE));
-        DEBUG_ECHOPGM("\toolchange_settings.z_raise=", toolchange_settings.z_raise);
-        DEBUG_ECHOPGM("\nDEFAULT_DUPLICATION_X_OFFSET=", DEFAULT_DUPLICATION_X_OFFSET);
+        DEBUG_ECHOPAIR("\nactive_extruder_x_pos: ", current_position.x);
+        DEBUG_ECHOPAIR("\ninactive_extruder_x: ", inactive_extruder_x);
+        DEBUG_ECHOPAIR("\nextruder_duplication_enabled: ", extruder_duplication_enabled);
+        DEBUG_ECHOPAIR("\nduplicate_extruder_x_offset: ", duplicate_extruder_x_offset);
+        DEBUG_ECHOPAIR("\nduplicate_extruder_temp_offset: ", duplicate_extruder_temp_offset);
+        DEBUG_ECHOPAIR("\ndelayed_move_time: ", delayed_move_time);
+        DEBUG_ECHOPAIR("\nX1 Home X: ", x_home_pos(0), "\nX1_MIN_POS=", X1_MIN_POS, "\nX1_MAX_POS=", X1_MAX_POS);
+        DEBUG_ECHOPAIR("\nX2 Home X: ", x_home_pos(1), "\nX2_MIN_POS=", X2_MIN_POS, "\nX2_MAX_POS=", X2_MAX_POS);
+        DEBUG_ECHOPAIR("\nX2_HOME_DIR=", X2_HOME_DIR, "\nX2_HOME_POS=", X2_HOME_POS);
+        DEBUG_ECHOPAIR("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE));
+        DEBUG_ECHOPAIR("\toolchange_settings.z_raise=", toolchange_settings.z_raise);
+        DEBUG_ECHOPAIR("\nDEFAULT_DUPLICATION_X_OFFSET=", DEFAULT_DUPLICATION_X_OFFSET);
         DEBUG_EOL();
 
         HOTEND_LOOP() {
-          DEBUG_ECHOPGM_P(SP_T_STR, e);
-          LOOP_LINEAR_AXES(a) DEBUG_ECHOPGM("  hotend_offset[", e, "].", AS_CHAR(AXIS_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
+          DEBUG_ECHOPAIR_P(SP_T_STR, e);
+          LOOP_LINEAR_AXES(a) DEBUG_ECHOPAIR("  hotend_offset[", e, "].", AS_CHAR(AXIS_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
           DEBUG_EOL();
         }
         DEBUG_EOL();
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 149613e..1b5ea2f 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -29,17 +29,25 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(PSU_CONTROL)
-  #include "../queue.h"
-  #include "../../feature/power.h"
-#endif
-
 #if HAS_SUICIDE
   #include "../../MarlinCore.h"
 #endif
 
 #if ENABLED(PSU_CONTROL)
 
+  #if ENABLED(AUTO_POWER_CONTROL)
+    #include "../../feature/power.h"
+  #else
+    void restore_stepper_drivers();
+  #endif
+
+  // Could be moved to a feature, but this is all the data
+  bool powersupply_on;
+
+  #if HAS_TRINAMIC_CONFIG
+    #include "../../feature/tmc_util.h"
+  #endif
+
   /**
    * M80   : Turn on the Power Supply
    * M80 S : Report the current state and exit
@@ -48,11 +56,11 @@
 
     // S: Report the current power supply state and exit
     if (parser.seen('S')) {
-      SERIAL_ECHOPGM_P(powerManager.psu_on ? PSTR("PS:1\n") : PSTR("PS:0\n"));
+      SERIAL_ECHOPGM_P(powersupply_on ? PSTR("PS:1\n") : PSTR("PS:0\n"));
       return;
     }
 
-    powerManager.power_on();
+    PSU_ON();
 
     /**
      * If you have a switch on suicide pin, this is useful
@@ -60,7 +68,13 @@
      * a print without suicide...
      */
     #if HAS_SUICIDE
-      OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
+      OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
+    #endif
+
+    #if DISABLED(AUTO_POWER_CONTROL)
+      safe_delay(PSU_POWERUP_DELAY);
+      restore_stepper_drivers();
+      TERN_(HAS_TRINAMIC_CONFIG, safe_delay(PSU_POWERUP_DELAY));
     #endif
 
     TERN_(HAS_LCD_MENU, ui.reset_status());
@@ -92,7 +106,7 @@ void GcodeSuite::M81() {
   #if HAS_SUICIDE
     suicide();
   #elif ENABLED(PSU_CONTROL)
-    powerManager.power_off_soon();
+    PSU_OFF_SOON();
   #endif
 
   LCD_MESSAGEPGM_P(PSTR(MACHINE_NAME " " STR_OFF "."));
diff --git a/Marlin/src/gcode/control/M993_M994.cpp b/Marlin/src/gcode/control/M993_M994.cpp
index 252792e..ff9ff85 100644
--- a/Marlin/src/gcode/control/M993_M994.cpp
+++ b/Marlin/src/gcode/control/M993_M994.cpp
@@ -37,7 +37,7 @@ void GcodeSuite::M993() {
   char fname[] = "spiflash.bin";
   card.openFileWrite(fname);
   if (!card.isFileOpen()) {
-    SERIAL_ECHOLNPGM("Failed to open ", fname, " to write.");
+    SERIAL_ECHOLNPAIR("Failed to open ", fname, " to write.");
     return;
   }
 
@@ -65,7 +65,7 @@ void GcodeSuite::M994() {
   char fname[] = "spiflash.bin";
   card.openFileRead(fname);
   if (!card.isFileOpen()) {
-    SERIAL_ECHOLNPGM("Failed to open ", fname, " to read.");
+    SERIAL_ECHOLNPAIR("Failed to open ", fname, " to read.");
     return;
   }
 
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index 73d795b..cdff96f 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -24,17 +24,11 @@
 
 #if ENABLED(PLATFORM_M997_SUPPORT)
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
-#endif
-
 /**
  * M997: Perform in-application firmware update
  */
 void GcodeSuite::M997() {
 
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_RebootScreen());
-
   flashFirmware(parser.intval('S'));
 
 }
diff --git a/Marlin/src/gcode/control/T.cpp b/Marlin/src/gcode/control/T.cpp
index 5e8f6b5..6a084d8 100644
--- a/Marlin/src/gcode/control/T.cpp
+++ b/Marlin/src/gcode/control/T.cpp
@@ -49,7 +49,7 @@
 void GcodeSuite::T(const int8_t tool_index) {
 
   DEBUG_SECTION(log_T, "T", DEBUGGING(LEVELING));
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("...(", tool_index, ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("...(", tool_index, ")");
 
   // Count this command as movement / activity
   reset_stepper_timeout();
diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp
index a06e98a..cd7833c 100644
--- a/Marlin/src/gcode/eeprom/M500-M504.cpp
+++ b/Marlin/src/gcode/eeprom/M500-M504.cpp
@@ -75,14 +75,14 @@ void GcodeSuite::M502() {
         if (dowrite) {
           val = parser.byteval('V');
           persistentStore.write_data(addr, &val);
-          SERIAL_ECHOLNPGM("Wrote address ", addr, " with ", val);
+          SERIAL_ECHOLNPAIR("Wrote address ", addr, " with ", val);
         }
         else {
           if (parser.seenval('T')) {
             const int endaddr = parser.value_ushort();
             while (addr <= endaddr) {
               persistentStore.read_data(addr, &val);
-              SERIAL_ECHOLNPGM("0x", hex_word(addr), ":", hex_byte(val));
+              SERIAL_ECHOLNPAIR("0x", hex_word(addr), ":", hex_byte(val));
               addr++;
               safe_delay(10);
             }
@@ -90,7 +90,7 @@ void GcodeSuite::M502() {
           }
           else {
             persistentStore.read_data(addr, &val);
-            SERIAL_ECHOLNPGM("Read address ", addr, " and got ", val);
+            SERIAL_ECHOLNPAIR("Read address ", addr, " and got ", val);
           }
         }
         return;
diff --git a/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin/src/gcode/feature/L6470/M122.cpp
index 1e5b37e..cfac427 100644
--- a/Marlin/src/gcode/feature/L6470/M122.cpp
+++ b/Marlin/src/gcode/feature/L6470/M122.cpp
@@ -68,7 +68,7 @@ inline void L6470_say_status(const L64XX_axis_t axis) {
     if (!(sh.STATUS_AXIS & sh.STATUS_AXIS_WRONG_CMD)) SERIAL_ECHOPGM("IN");
     SERIAL_ECHOPGM("VALID    ");
     SERIAL_ECHOPGM_P(sh.STATUS_AXIS & sh.STATUS_AXIS_NOTPERF_CMD ?  PSTR("COMPLETED    ") : PSTR("Not PERFORMED"));
-    SERIAL_ECHOPGM("\n...THERMAL: ", !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_SD) ? "SHUTDOWN       " : !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_WRN) ? "WARNING        " : "OK             ");
+    SERIAL_ECHOPAIR("\n...THERMAL: ", !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_SD) ? "SHUTDOWN       " : !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_WRN) ? "WARNING        " : "OK             ");
   }
   SERIAL_ECHOPGM("   OVERCURRENT:"); echo_yes_no((sh.STATUS_AXIS & sh.STATUS_AXIS_OCD) == 0);
   if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) {
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 2ab13f5..b1beed0 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -63,7 +63,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
     #if ENABLED(L6470_CHITCHAT)
       char tmp[10];
       sprintf_P(tmp, PSTR("%4x   "), status);
-      DEBUG_ECHOPGM("   status: ", tmp);
+      DEBUG_ECHOPAIR("   status: ", tmp);
       print_bin(status);
     #else
       UNUSED(status);
@@ -104,13 +104,13 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
       }
       SERIAL_EOL();
 
-      SERIAL_ECHOPGM("...MicroSteps: ", MicroSteps,
+      SERIAL_ECHOPAIR("...MicroSteps: ", MicroSteps,
                       "   ADC_OUT: ", L6470_ADC_out);
       SERIAL_ECHOPGM("   Vs_compensation: ");
       SERIAL_ECHOPGM_P((motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_EN_VSCOMP) ? PSTR("ENABLED ") : PSTR("DISABLED"));
-      SERIAL_ECHOLNPGM("   Compensation coefficient: ~", comp_coef * 0.01f);
+      SERIAL_ECHOLNPAIR("   Compensation coefficient: ~", comp_coef * 0.01f);
 
-      SERIAL_ECHOPGM("...KVAL_HOLD: ", motor.GetParam(L6470_KVAL_HOLD),
+      SERIAL_ECHOPAIR("...KVAL_HOLD: ", motor.GetParam(L6470_KVAL_HOLD),
                       "   KVAL_RUN : ", motor.GetParam(L6470_KVAL_RUN),
                       "   KVAL_ACC: ", motor.GetParam(L6470_KVAL_ACC),
                       "   KVAL_DEC: ", motor.GetParam(L6470_KVAL_DEC),
@@ -168,7 +168,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
       SERIAL_ECHOLNPGM(" mA)   Motor Status: NA");
 
       const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07); //NOMORE(MicroSteps, 16);
-      SERIAL_ECHOPGM("...MicroSteps: ", MicroSteps,
+      SERIAL_ECHOPAIR("...MicroSteps: ", MicroSteps,
                       "   ADC_OUT: ", L6470_ADC_out);
 
       SERIAL_ECHOLNPGM("   Vs_compensation: NA\n");
@@ -185,7 +185,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
           case 1:  DEBUG_ECHOLNPGM("75V/uS")  ; break;
           case 2:  DEBUG_ECHOLNPGM("110V/uS") ; break;
           case 3:  DEBUG_ECHOLNPGM("260V/uS") ; break;
-          default: DEBUG_ECHOLNPGM("slew rate: ", (motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_POW_SR) >> CONFIG_POW_SR_BIT); break;
+          default: DEBUG_ECHOLNPAIR("slew rate: ", (motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_POW_SR) >> CONFIG_POW_SR_BIT); break;
         }
       #endif
       SERIAL_EOL();
diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-918.cpp
index ad0a911..3dd21ef 100644
--- a/Marlin/src/gcode/feature/L6470/M916-918.cpp
+++ b/Marlin/src/gcode/feature/L6470/M916-918.cpp
@@ -96,7 +96,7 @@ void GcodeSuite::M916() {
   if (L64xxManager.get_user_input(driver_count, axis_index, axis_mon, position_max, position_min, final_feedrate, kval_hold, over_current_flag, OCD_TH_val, STALL_TH_val, over_current_threshold))
     return;  // quit if invalid user input
 
-  DEBUG_ECHOLNPGM("feedrate = ", final_feedrate);
+  DEBUG_ECHOLNPAIR("feedrate = ", final_feedrate);
 
   planner.synchronize();                             // wait for all current movement commands to complete
 
@@ -127,9 +127,9 @@ void GcodeSuite::M916() {
   do {
 
     if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)
-      DEBUG_ECHOLNPGM("TVAL current (mA) = ", (M91x_counter + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);        // report TVAL current for this run
+      DEBUG_ECHOLNPAIR("TVAL current (mA) = ", (M91x_counter + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);        // report TVAL current for this run
     else
-      DEBUG_ECHOLNPGM("kval_hold = ", M91x_counter);                                   // report KVAL_HOLD for this run
+      DEBUG_ECHOLNPAIR("kval_hold = ", M91x_counter);                                   // report KVAL_HOLD for this run
 
     for (j = 0; j < driver_count; j++)
       L64xxManager.set_param(axis_index[j], L6470_KVAL_HOLD, M91x_counter);  //set KVAL_HOLD or TVAL (same register address)
@@ -236,7 +236,7 @@ void GcodeSuite::M917() {
   if (L64xxManager.get_user_input(driver_count, axis_index, axis_mon, position_max, position_min, final_feedrate, kval_hold, over_current_flag, OCD_TH_val, STALL_TH_val, over_current_threshold))
     return;  // quit if invalid user input
 
-  DEBUG_ECHOLNPGM("feedrate = ", final_feedrate);
+  DEBUG_ECHOLNPAIR("feedrate = ", final_feedrate);
 
   planner.synchronize();                             // wait for all current movement commands to complete
 
@@ -252,18 +252,18 @@ void GcodeSuite::M917() {
                                           // 2 - OCD finalized - decreasing STALL - exit when STALL warning happens
                                           // 3 - OCD finalized - increasing STALL - exit when STALL warning stop
                                           // 4 - all testing completed
-  DEBUG_ECHOPGM(".\n.\n.\nover_current threshold : ", (OCD_TH_val + 1) * 375);   // first status display
-  DEBUG_ECHOPGM("  (OCD_TH:  : ", OCD_TH_val);
+  DEBUG_ECHOPAIR(".\n.\n.\nover_current threshold : ", (OCD_TH_val + 1) * 375);   // first status display
+  DEBUG_ECHOPAIR("  (OCD_TH:  : ", OCD_TH_val);
   if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) {
-    DEBUG_ECHOPGM(")   Stall threshold: ", (STALL_TH_val + 1) * 31.25);
-    DEBUG_ECHOPGM("  (STALL_TH: ", STALL_TH_val);
+    DEBUG_ECHOPAIR(")   Stall threshold: ", (STALL_TH_val + 1) * 31.25);
+    DEBUG_ECHOPAIR("  (STALL_TH: ", STALL_TH_val);
   }
   DEBUG_ECHOLNPGM(")");
 
   do {
 
-    if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) DEBUG_ECHOPGM("STALL threshold : ", (STALL_TH_val + 1) * 31.25);
-    DEBUG_ECHOLNPGM("   OCD threshold : ", (OCD_TH_val + 1) * 375);
+    if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) DEBUG_ECHOPAIR("STALL threshold : ", (STALL_TH_val + 1) * 31.25);
+    DEBUG_ECHOLNPAIR("   OCD threshold : ", (OCD_TH_val + 1) * 375);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(final_feedrate));
     gcode.process_subcommands_now_P(gcode_string);
@@ -303,7 +303,7 @@ void GcodeSuite::M917() {
         if (!(k % 4)) {
           kval_hold *= 0.95;
           DEBUG_EOL();
-          DEBUG_ECHOLNPGM("Lowering KVAL_HOLD by about 5% to ", kval_hold);
+          DEBUG_ECHOLNPAIR("Lowering KVAL_HOLD by about 5% to ", kval_hold);
           for (j = 0; j < driver_count; j++)
             L64xxManager.set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
         }
@@ -590,8 +590,8 @@ void GcodeSuite::M918() {
   }
   m_steps = L64xxManager.get_param(axis_index[0], L6470_STEP_MODE) & 0x07;   // get microsteps
 
-  DEBUG_ECHOLNPGM("Microsteps = ", _BV(m_steps));
-  DEBUG_ECHOLNPGM("target (maximum) feedrate = ", final_feedrate);
+  DEBUG_ECHOLNPAIR("Microsteps = ", _BV(m_steps));
+  DEBUG_ECHOLNPAIR("target (maximum) feedrate = ", final_feedrate);
 
   const float feedrate_inc = final_feedrate / 10,   // Start at 1/10 of max & go up by 1/10 per step
               fr_limit = final_feedrate * 0.99f;    // Rounding-safe comparison value
@@ -612,7 +612,7 @@ void GcodeSuite::M918() {
 
   do {
     current_feedrate += feedrate_inc;
-    DEBUG_ECHOLNPGM("...feedrate = ", current_feedrate);
+    DEBUG_ECHOLNPAIR("...feedrate = ", current_feedrate);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(current_feedrate));
     gcode.process_subcommands_now_P(gcode_string);
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index 4ed601b..1d76ebf 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -115,11 +115,11 @@ void GcodeSuite::M900() {
     #if ENABLED(EXTRA_LIN_ADVANCE_K)
 
       #if EXTRUDERS < 2
-        SERIAL_ECHOLNPGM("Advance S", new_slot, " K", kref, "(S", !new_slot, " K", lref, ")");
+        SERIAL_ECHOLNPAIR("Advance S", new_slot, " K", kref, "(S", !new_slot, " K", lref, ")");
       #else
         LOOP_L_N(i, EXTRUDERS) {
           const bool slot = TEST(lin_adv_slot, i);
-          SERIAL_ECHOLNPGM("Advance T", i, " S", slot, " K", planner.extruder_advance_K[i],
+          SERIAL_ECHOLNPAIR("Advance T", i, " S", slot, " K", planner.extruder_advance_K[i],
                             "(S", !slot, " K", other_extruder_advance_K[i], ")");
           SERIAL_EOL();
         }
@@ -129,7 +129,7 @@ void GcodeSuite::M900() {
 
       SERIAL_ECHO_START();
       #if EXTRUDERS < 2
-        SERIAL_ECHOLNPGM("Advance K=", planner.extruder_advance_K[0]);
+        SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
       #else
         SERIAL_ECHOPGM("Advance K");
         LOOP_L_N(i, EXTRUDERS) {
@@ -144,17 +144,4 @@ void GcodeSuite::M900() {
 
 }
 
-void GcodeSuite::M900_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_LINEAR_ADVANCE));
-  #if EXTRUDERS < 2
-    report_echo_start(forReplay);
-    SERIAL_ECHOLNPGM("  M900 K", planner.extruder_advance_K[0]);
-  #else
-    LOOP_L_N(i, EXTRUDERS) {
-      report_echo_start(forReplay);
-      SERIAL_ECHOLNPGM("  M900 T", i, " K", planner.extruder_advance_K[i]);
-    }
-  #endif
-}
-
 #endif // LIN_ADVANCE
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index 19051ff..f5c910a 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -135,8 +135,17 @@ void GcodeSuite::M240() {
     };
 
     #ifdef PHOTO_RETRACT_MM
-      const float rval = parser.linearval('R', _PHOTO_RETRACT_MM);
-      const feedRate_t sval = parser.feedrateval('S', TERN(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_RETRACT_FEEDRATE, TERN(FWRETRACT, RETRACT_FEEDRATE, 45)));
+      const float rval = parser.seenval('R') ? parser.value_linear_units() : _PHOTO_RETRACT_MM;
+      feedRate_t sval = (
+        #if ENABLED(ADVANCED_PAUSE_FEATURE)
+          PAUSE_PARK_RETRACT_FEEDRATE
+        #elif ENABLED(FWRETRACT)
+          RETRACT_FEEDRATE
+        #else
+          45
+        #endif
+      );
+      if (parser.seenval('S')) sval = parser.value_feedrate();
       e_move_m240(-rval, sval);
     #endif
 
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
index eede16b..aa382a3 100644
--- a/Marlin/src/gcode/feature/controllerfan/M710.cpp
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -27,6 +27,18 @@
 #include "../../gcode.h"
 #include "../../../feature/controllerfan.h"
 
+void M710_report(const bool forReplay=true) {
+  if (!forReplay) { SERIAL_ECHOLNPGM("; Controller Fan"); SERIAL_ECHO_START(); }
+  SERIAL_ECHOLNPAIR("  M710"
+    " S", int(controllerFan.settings.active_speed),
+    " I", int(controllerFan.settings.idle_speed),
+    " A", int(controllerFan.settings.auto_mode),
+    " D", controllerFan.settings.duration,
+    " ; (", (int(controllerFan.settings.active_speed) * 100) / 255, "%"
+    " ", (int(controllerFan.settings.idle_speed) * 100) / 255, "%)"
+  );
+}
+
 /**
  * M710: Set controller fan settings
  *
@@ -66,16 +78,4 @@ void GcodeSuite::M710() {
     M710_report();
 }
 
-void GcodeSuite::M710_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_CONTROLLER_FAN));
-  SERIAL_ECHOLNPGM("  M710"
-    " S", int(controllerFan.settings.active_speed),
-    " I", int(controllerFan.settings.idle_speed),
-    " A", int(controllerFan.settings.auto_mode),
-    " D", controllerFan.settings.duration,
-    " ; (", (int(controllerFan.settings.active_speed) * 100) / 255, "%"
-    " ", (int(controllerFan.settings.idle_speed) * 100) / 255, "%)"
-  );
-}
-
 #endif // CONTROLLER_FAN_EDITABLE
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index a0b5c48..bd741f8 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM || HAS_MOTOR_CURRENT_I2C || HAS_MOTOR_CURRENT_DAC
+#if ANY(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM, HAS_MOTOR_CURRENT_I2C, HAS_MOTOR_CURRENT_DAC)
 
 #include "../../gcode.h"
 
@@ -44,27 +44,12 @@
 void GcodeSuite::M907() {
   #if HAS_MOTOR_CURRENT_SPI
 
-    if (!parser.seen("BS" LOGICAL_AXES_STRING))
-      return M907_report();
-
     LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.set_digipot_current(i, parser.value_int());
     if (parser.seenval('B')) stepper.set_digipot_current(4, parser.value_int());
     if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.set_digipot_current(i, parser.value_int());
 
   #elif HAS_MOTOR_CURRENT_PWM
 
-    if (!parser.seen(
-      #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY)
-        "XY"
-      #endif
-      #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-        "Z"
-      #endif
-      #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-        "E"
-      #endif
-    )) return M907_report();
-
     #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY)
       if (parser.seenval('X') || parser.seenval('Y')) stepper.set_digipot_current(0, parser.value_int());
     #endif
@@ -97,30 +82,7 @@ void GcodeSuite::M907() {
   #endif
 }
 
-#if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
-
-  void GcodeSuite::M907_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_STEPPER_MOTOR_CURRENTS));
-    #if HAS_MOTOR_CURRENT_PWM
-      SERIAL_ECHOLNPGM_P(                                    // PWM-based has 3 values:
-          PSTR("  M907 X"), stepper.motor_current_setting[0]  // X and Y
-        , SP_Z_STR,         stepper.motor_current_setting[1]  // Z
-        , SP_E_STR,         stepper.motor_current_setting[2]  // E
-      );
-    #elif HAS_MOTOR_CURRENT_SPI
-      SERIAL_ECHOPGM("  M907");                               // SPI-based has 5 values:
-      LOOP_LOGICAL_AXES(q) {                                  // X Y Z (I J K) E (map to X Y Z (I J K) E0 by default)
-        SERIAL_CHAR(' ', axis_codes[q]);
-        SERIAL_ECHO(stepper.motor_current_setting[q]);
-      }
-      SERIAL_CHAR(' ', 'B');                                  // B (maps to E1 by default)
-      SERIAL_ECHOLN(stepper.motor_current_setting[4]);
-    #endif
-  }
-
-#endif // HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
-
-#if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_DAC
+#if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC)
 
   /**
    * M908: Control digital trimpot directly (M908 P<pin> S<current>)
diff --git a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
index ff174ec..a70f7a6 100644
--- a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
+++ b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M404() {
     planner.volumetric_area_nominal = CIRCLE_AREA(filwidth.nominal_mm * 0.5);
   }
   else
-    SERIAL_ECHOLNPGM("Filament dia (nominal mm):", filwidth.nominal_mm);
+    SERIAL_ECHOLNPAIR("Filament dia (nominal mm):", filwidth.nominal_mm);
 }
 
 /**
@@ -65,7 +65,7 @@ void GcodeSuite::M406() {
  * M407: Get measured filament diameter on serial output
  */
 void GcodeSuite::M407() {
-  SERIAL_ECHOLNPGM("Filament dia (measured mm):", filwidth.measured_mm);
+  SERIAL_ECHOLNPAIR("Filament dia (measured mm):", filwidth.measured_mm);
 }
 
 #endif // FILAMENT_WIDTH_SENSOR
diff --git a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
index 35330fe..219502f 100644
--- a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
+++ b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
@@ -32,7 +32,16 @@
  * G10 - Retract filament according to settings of M207
  *       TODO: Handle 'G10 P' for tool settings and 'G10 L' for workspace settings
  */
-void GcodeSuite::G10() { fwretract.retract(true OPTARG(HAS_MULTI_EXTRUDER, parser.boolval('S'))); }
+void GcodeSuite::G10() {
+  #if HAS_MULTI_EXTRUDER
+    const bool rs = parser.boolval('S');
+  #endif
+  fwretract.retract(true
+    #if HAS_MULTI_EXTRUDER
+      , rs
+    #endif
+  );
+}
 
 /**
  * G11 - Recover filament according to settings of M208
diff --git a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
index 040a09a..5793d73 100644
--- a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
+++ b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
@@ -29,34 +29,14 @@
 
 /**
  * M207: Set firmware retraction values
- *
- *   S[+units]    retract_length
- *   W[+units]    swap_retract_length (multi-extruder)
- *   F[units/min] retract_feedrate_mm_s
- *   Z[units]     retract_zraise
  */
 void GcodeSuite::M207() { fwretract.M207(); }
 
-void GcodeSuite::M207_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_RETRACT_S_F_Z));
-  fwretract.M207_report();
-}
-
 /**
  * M208: Set firmware un-retraction values
- *
- *   S[+units]    retract_recover_extra (in addition to M207 S*)
- *   W[+units]    swap_retract_recover_extra (multi-extruder)
- *   F[units/min] retract_recover_feedrate_mm_s
- *   R[units/min] swap_retract_recover_feedrate_mm_s
  */
 void GcodeSuite::M208() { fwretract.M208(); }
 
-void GcodeSuite::M208_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_RECOVER_S_F));
-  fwretract.M208_report();
-}
-
 #if ENABLED(FWRETRACT_AUTORETRACT)
 
   /**
@@ -67,11 +47,6 @@ void GcodeSuite::M208_report(const bool forReplay/*=true*/) {
    */
   void GcodeSuite::M209() { fwretract.M209(); }
 
-  void GcodeSuite::M209_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_AUTO_RETRACT_S));
-    fwretract.M209_report();
-  }
-
 #endif
 
 #endif // FWRETRACT
diff --git a/Marlin/src/gcode/feature/mixing/M166.cpp b/Marlin/src/gcode/feature/mixing/M166.cpp
index f42583d..5f78834 100644
--- a/Marlin/src/gcode/feature/mixing/M166.cpp
+++ b/Marlin/src/gcode/feature/mixing/M166.cpp
@@ -30,12 +30,12 @@
 #include "../../../feature/mixing.h"
 
 inline void echo_mix() {
-  SERIAL_ECHOPGM(" (", mixer.mix[0], "%|", mixer.mix[1], "%)");
+  SERIAL_ECHOPAIR(" (", mixer.mix[0], "%|", mixer.mix[1], "%)");
 }
 
 inline void echo_zt(const int t, const_float_t z) {
   mixer.update_mix_from_vtool(t);
-  SERIAL_ECHOPGM_P(SP_Z_STR, z, SP_T_STR, t);
+  SERIAL_ECHOPAIR_P(SP_Z_STR, z, SP_T_STR, t);
   echo_mix();
 }
 
@@ -74,7 +74,7 @@ void GcodeSuite::M166() {
 
     #if ENABLED(GRADIENT_VTOOL)
       if (mixer.gradient.vtool_index >= 0) {
-        SERIAL_ECHOPGM(" (T", mixer.gradient.vtool_index);
+        SERIAL_ECHOPAIR(" (T", mixer.gradient.vtool_index);
         SERIAL_CHAR(')');
       }
     #endif
diff --git a/Marlin/src/gcode/feature/network/M552-M554.cpp b/Marlin/src/gcode/feature/network/M552-M554.cpp
index 887e67f..22c718c 100644
--- a/Marlin/src/gcode/feature/network/M552-M554.cpp
+++ b/Marlin/src/gcode/feature/network/M552-M554.cpp
@@ -64,7 +64,17 @@ void ip_report(const uint16_t cmd, PGM_P const post, const IPAddress &ipo) {
     if (i < 3) SERIAL_CHAR('.');
   }
   SERIAL_ECHOPGM(" ; ");
-  SERIAL_ECHOLNPGM_P(post);
+  SERIAL_ECHOPGM_P(post);
+  SERIAL_EOL();
+}
+void M552_report() {
+  ip_report(552, PSTR("ip address"), Ethernet.linkStatus() == LinkON ? Ethernet.localIP() : ethernet.ip);
+}
+void M553_report() {
+  ip_report(553, PSTR("subnet mask"), Ethernet.linkStatus() == LinkON ? Ethernet.subnetMask() : ethernet.subnet);
+}
+void M554_report() {
+  ip_report(554, PSTR("gateway"), Ethernet.linkStatus() == LinkON ? Ethernet.gatewayIP() : ethernet.gateway);
 }
 
 /**
@@ -97,36 +107,20 @@ void GcodeSuite::M552() {
   if (nopar || seenP) M552_report();
 }
 
-void GcodeSuite::M552_report() {
-  ip_report(552, PSTR("ip address"), Ethernet.linkStatus() == LinkON ? Ethernet.localIP() : ethernet.ip);
-}
-
 /**
  * M553 Pnnn - Set netmask
  */
 void GcodeSuite::M553() {
-  if (parser.seenval('P'))
-    ethernet.subnet.fromString(parser.value_string());
-  else
-    M553_report();
-}
-
-void GcodeSuite::M553_report() {
-  ip_report(553, PSTR("subnet mask"), Ethernet.linkStatus() == LinkON ? Ethernet.subnetMask() : ethernet.subnet);
+  if (parser.seenval('P')) ethernet.subnet.fromString(parser.value_string());
+  M553_report();
 }
 
 /**
  * M554 Pnnn - Set Gateway
  */
 void GcodeSuite::M554() {
-  if (parser.seenval('P'))
-    ethernet.gateway.fromString(parser.value_string());
-  else
-    M554_report();
-}
-
-void GcodeSuite::M554_report() {
-  ip_report(554, PSTR("gateway"), Ethernet.linkStatus() == LinkON ? Ethernet.gatewayIP() : ethernet.gateway);
+  if (parser.seenval('P')) ethernet.gateway.fromString(parser.value_string());
+  M554_report();
 }
 
 #endif // HAS_ETHERNET
diff --git a/Marlin/src/gcode/feature/password/M510-M512.cpp b/Marlin/src/gcode/feature/password/M510-M512.cpp
index a5f017f..eeb9b1d 100644
--- a/Marlin/src/gcode/feature/password/M510-M512.cpp
+++ b/Marlin/src/gcode/feature/password/M510-M512.cpp
@@ -66,7 +66,7 @@ void GcodeSuite::M510() {
       if (password.value_entry < CAT(1e, PASSWORD_LENGTH)) {
         password.is_set = true;
         password.value = password.value_entry;
-        SERIAL_ECHOLNPGM(STR_PASSWORD_SET, password.value); // TODO: Update password.string
+        SERIAL_ECHOLNPAIR(STR_PASSWORD_SET, password.value); // TODO: Update password.string
       }
       else
         SERIAL_ECHOLNPGM(STR_PASSWORD_TOO_LONG);
diff --git a/Marlin/src/gcode/feature/pause/G27.cpp b/Marlin/src/gcode/feature/pause/G27.cpp
index f61453e..3ce618d 100644
--- a/Marlin/src/gcode/feature/pause/G27.cpp
+++ b/Marlin/src/gcode/feature/pause/G27.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+
 #include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(NOZZLE_PARK_FEATURE)
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 4c71900..7945123 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::G60() {
   SBI(saved_slots[slot >> 3], slot & 0x07);
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
-    DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
+    DEBUG_ECHOPAIR(STR_SAVED_POS " S", slot);
     const xyze_pos_t &pos = stored_position[slot];
     DEBUG_ECHOLNPAIR_F_P(
       LIST_N(DOUBLE(LOGICAL_AXES), SP_E_STR, pos.e,
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index f3e5a2a..a10c821 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::G61(void) {
   }
   else {
     if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
-      DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
+      DEBUG_ECHOPAIR(STR_RESTORING_POS " S", slot);
       LOOP_LINEAR_AXES(i) {
         destination[i] = parser.seen(AXIS_CHAR(i))
           ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
@@ -83,7 +83,7 @@ void GcodeSuite::G61(void) {
     }
     #if HAS_EXTRUDERS
       if (parser.seen_test('E')) {
-        DEBUG_ECHOLNPGM(STR_RESTORING_POS " S", slot, " E", current_position.e, "=>", stored_position[slot].e);
+        DEBUG_ECHOLNPAIR(STR_RESTORING_POS " S", slot, " E", current_position.e, "=>", stored_position[slot].e);
         SYNC_E(stored_position[slot].e);
       }
     #endif
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index ebb110d..9c3b774 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -42,8 +42,6 @@
  */
 void GcodeSuite::M603() {
 
-  if (!parser.seen("TUL")) return M603_report();
-
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
 
@@ -64,20 +62,4 @@ void GcodeSuite::M603() {
   }
 }
 
-void GcodeSuite::M603_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_FILAMENT_LOAD_UNLOAD));
-
-  #if EXTRUDERS == 1
-    report_echo_start(forReplay);
-    SERIAL_ECHOPGM("  M603 L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length), " ;");
-    say_units();
-  #else
-    LOOP_L_N(e, EXTRUDERS) {
-      report_echo_start(forReplay);
-      SERIAL_ECHOPGM("  M603 T", e, " L", LINEAR_UNIT(fc_settings[e].load_length), " U", LINEAR_UNIT(fc_settings[e].unload_length), " ;");
-      say_units();
-    }
-  #endif
-}
-
 #endif // ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index d46bb23..0a649da 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -114,7 +114,9 @@ void GcodeSuite::M701() {
       true,                                           // show_lcd
       thermalManager.still_heating(target_extruder),  // pause_for_user
       PAUSE_MODE_LOAD_FILAMENT                        // pause_mode
-      OPTARG(DUAL_X_CARRIAGE, target_extruder)        // Dual X target
+      #if ENABLED(DUAL_X_CARRIAGE)
+        , target_extruder                             // Dual X target
+      #endif
     );
   #endif
 
diff --git a/Marlin/src/gcode/feature/power_monitor/M430.cpp b/Marlin/src/gcode/feature/power_monitor/M430.cpp
index 642a75d..34430fb 100644
--- a/Marlin/src/gcode/feature/power_monitor/M430.cpp
+++ b/Marlin/src/gcode/feature/power_monitor/M430.cpp
@@ -50,7 +50,7 @@ void GcodeSuite::M430() {
     #endif
   #endif
   if (do_report) {
-    SERIAL_ECHOLNPGM(
+    SERIAL_ECHOLNPAIR(
       #if ENABLED(POWER_MONITOR_CURRENT)
         "Current: ", power_monitor.getAmps(), "A"
         #if ENABLED(POWER_MONITOR_VOLTAGE)
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 3ebb286..ea92dc6 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -27,16 +27,9 @@
 #include "../../gcode.h"
 #include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
-
 #include "../../../lcd/marlinui.h"
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
@@ -69,10 +62,8 @@ void GcodeSuite::M1000() {
     if (parser.seen_test('S')) {
       #if HAS_LCD_MENU
         ui.goto_screen(menu_job_recovery);
-      #elif HAS_DWIN_E3V2_BASIC
+      #elif ENABLED(DWIN_CREALITY_LCD)
         recovery.dwin_flag = true;
-      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) // Temporary fix until it can be better implemented
-        CrealityDWIN.Popup_Handler(Resume);
       #elif ENABLED(EXTENSIBLE_UI)
         ExtUI::onPowerLossResume();
       #else
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 7c714da..18aeb50 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -40,8 +40,11 @@ void GcodeSuite::M413() {
 
   if (parser.seen('S'))
     recovery.enable(parser.value_bool());
-  else
-    M413_report();
+  else {
+    SERIAL_ECHO_START();
+    SERIAL_ECHOPGM("Power-loss recovery ");
+    serialprintln_onoff(recovery.enabled);
+  }
 
   #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
     if (parser.seen("RL")) recovery.load();
@@ -56,10 +59,4 @@ void GcodeSuite::M413() {
   #endif
 }
 
-void GcodeSuite::M413_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_POWER_LOSS_RECOVERY));
-  SERIAL_ECHOPGM("  M413 S", AS_DIGIT(recovery.enabled), " ; ");
-  serialprintln_onoff(recovery.enabled);
-}
-
 #endif // POWER_LOSS_RECOVERY
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index bed0829..9a06357 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -56,7 +56,7 @@ void GcodeSuite::M412() {
     SERIAL_ECHOPGM("Filament runout ");
     serialprint_onoff(runout.enabled);
     #if HAS_FILAMENT_RUNOUT_DISTANCE
-      SERIAL_ECHOPGM(" ; Distance ", runout.runout_distance(), "mm");
+      SERIAL_ECHOPAIR(" ; Distance ", runout.runout_distance(), "mm");
     #endif
     #if ENABLED(HOST_ACTION_COMMANDS)
       SERIAL_ECHOPGM(" ; Host handling ");
@@ -66,16 +66,4 @@ void GcodeSuite::M412() {
   }
 }
 
-void GcodeSuite::M412_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
-  SERIAL_ECHOLNPGM(
-    "  M412 S", runout.enabled
-    #if HAS_FILAMENT_RUNOUT_DISTANCE
-      , " D", LINEAR_UNIT(runout.runout_distance())
-    #endif
-    , " ; Sensor "
-  );
-  serialprintln_onoff(runout.enabled);
-}
-
 #endif // HAS_FILAMENT_SENSOR
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 5cadd2d..9a7f1fb 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -138,66 +138,4 @@ void GcodeSuite::M569() {
     say_stealth_status();
 }
 
-void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_DRIVER_STEPPING_MODE));
-
-  auto say_M569 = [](const bool forReplay, const char * const etc=nullptr, const bool eol=false) {
-    if (!forReplay) SERIAL_ECHO_START();
-    SERIAL_ECHOPGM("  M569 S1");
-    if (etc) {
-      SERIAL_CHAR(' ');
-      SERIAL_ECHOPGM_P(etc);
-    }
-    if (eol) SERIAL_EOL();
-  };
-
-  const bool chop_x = TERN0(X_HAS_STEALTHCHOP, stepperX.get_stored_stealthChop()),
-             chop_y = TERN0(Y_HAS_STEALTHCHOP, stepperY.get_stored_stealthChop()),
-             chop_z = TERN0(Z_HAS_STEALTHCHOP, stepperZ.get_stored_stealthChop()),
-             chop_i = TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()),
-             chop_j = TERN0(J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()),
-             chop_k = TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop());
-
-  if (chop_x || chop_y || chop_z || chop_i || chop_j || chop_k) {
-    say_M569(forReplay);
-    LINEAR_AXIS_CODE(
-      if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR),
-      if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR),
-      if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR),
-      if (chop_i) SERIAL_ECHOPGM_P(SP_I_STR),
-      if (chop_j) SERIAL_ECHOPGM_P(SP_J_STR),
-      if (chop_k) SERIAL_ECHOPGM_P(SP_K_STR)
-    );
-    SERIAL_EOL();
-  }
-
-  const bool chop_x2 = TERN0(X2_HAS_STEALTHCHOP, stepperX2.get_stored_stealthChop()),
-             chop_y2 = TERN0(Y2_HAS_STEALTHCHOP, stepperY2.get_stored_stealthChop()),
-             chop_z2 = TERN0(Z2_HAS_STEALTHCHOP, stepperZ2.get_stored_stealthChop());
-
-  if (chop_x2 || chop_y2 || chop_z2) {
-    say_M569(forReplay, PSTR("I1"));
-    if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
-    if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
-    if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
-    SERIAL_EOL();
-  }
-
-  if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I2 Z"), true); }
-  if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I3 Z"), true); }
-
-  if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, SP_I_STR, true); }
-  if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, SP_J_STR, true); }
-  if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, SP_K_STR, true); }
-
-  if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T0 E"), true); }
-  if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T1 E"), true); }
-  if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T2 E"), true); }
-  if (TERN0(E3_HAS_STEALTHCHOP, stepperE3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T3 E"), true); }
-  if (TERN0(E4_HAS_STEALTHCHOP, stepperE4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T4 E"), true); }
-  if (TERN0(E5_HAS_STEALTHCHOP, stepperE5.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T5 E"), true); }
-  if (TERN0(E6_HAS_STEALTHCHOP, stepperE6.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T6 E"), true); }
-  if (TERN0(E7_HAS_STEALTHCHOP, stepperE7.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T7 E"), true); }
-}
-
 #endif // HAS_STEALTHCHOP
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 8877603..9e56e51 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -198,99 +198,4 @@ void GcodeSuite::M906() {
   }
 }
 
-void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_STEPPER_DRIVER_CURRENT));
-
-  auto say_M906 = [](const bool forReplay) {
-    report_echo_start(forReplay);
-    SERIAL_ECHOPGM("  M906");
-  };
-
-  #if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
-    say_M906(forReplay);
-    #if AXIS_IS_TMC(X)
-      SERIAL_ECHOPGM_P(SP_X_STR, stepperX.getMilliamps());
-    #endif
-    #if AXIS_IS_TMC(Y)
-      SERIAL_ECHOPGM_P(SP_Y_STR, stepperY.getMilliamps());
-    #endif
-    #if AXIS_IS_TMC(Z)
-      SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ.getMilliamps());
-    #endif
-    SERIAL_EOL();
-  #endif
-
-  #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2)
-    say_M906(forReplay);
-    SERIAL_ECHOPGM(" I1");
-    #if AXIS_IS_TMC(X2)
-      SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.getMilliamps());
-    #endif
-    #if AXIS_IS_TMC(Y2)
-      SERIAL_ECHOPGM_P(SP_Y_STR, stepperY2.getMilliamps());
-    #endif
-    #if AXIS_IS_TMC(Z2)
-      SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ2.getMilliamps());
-    #endif
-    SERIAL_EOL();
-  #endif
-
-  #if AXIS_IS_TMC(Z3)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.getMilliamps());
-  #endif
-
-  #if AXIS_IS_TMC(Z4)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.getMilliamps());
-  #endif
-
-  #if AXIS_IS_TMC(I)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM_P(SP_I_STR, stepperI.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(J)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM_P(SP_J_STR, stepperJ.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(K)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.getMilliamps());
-  #endif
-
-  #if AXIS_IS_TMC(E0)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T0 E", stepperE0.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(E1)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T1 E", stepperE1.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(E2)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T2 E", stepperE2.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(E3)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T3 E", stepperE3.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(E4)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T4 E", stepperE4.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(E5)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T5 E", stepperE5.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(E6)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T6 E", stepperE6.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(E7)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM(" T7 E", stepperE7.getMilliamps());
-  #endif
-  SERIAL_EOL();
-}
-
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 58702c6..fca16c0 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -227,7 +227,6 @@
  * M913: Set HYBRID_THRESHOLD speed.
  */
 #if ENABLED(HYBRID_THRESHOLD)
-
   void GcodeSuite::M913() {
     #define TMC_SAY_PWMTHRS(A,Q) tmc_print_pwmthrs(stepper##Q)
     #define TMC_SET_PWMTHRS(A,Q) stepper##Q.set_pwm_thrs(value)
@@ -309,109 +308,12 @@
       TERN_(E7_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(7));
     }
   }
-
-  void GcodeSuite::M913_report(const bool forReplay/*=true*/) {
-    report_heading(forReplay, PSTR(STR_HYBRID_THRESHOLD));
-
-    auto say_M913 = [](const bool forReplay) {
-      report_echo_start(forReplay);
-      SERIAL_ECHOPGM("  M913");
-    };
-
-    #if X_HAS_STEALTHCHOP || Y_HAS_STEALTHCHOP || Z_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      #if X_HAS_STEALTHCHOP
-        SERIAL_ECHOPGM_P(SP_X_STR, stepperX.get_pwm_thrs());
-      #endif
-      #if Y_HAS_STEALTHCHOP
-        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY.get_pwm_thrs());
-      #endif
-      #if Z_HAS_STEALTHCHOP
-        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ.get_pwm_thrs());
-      #endif
-      SERIAL_EOL();
-    #endif
-
-    #if X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOPGM(" I1");
-      #if X2_HAS_STEALTHCHOP
-        SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.get_pwm_thrs());
-      #endif
-      #if Y2_HAS_STEALTHCHOP
-        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY2.get_pwm_thrs());
-      #endif
-      #if Z2_HAS_STEALTHCHOP
-        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
-      #endif
-      SERIAL_EOL();
-    #endif
-
-    #if Z3_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.get_pwm_thrs());
-    #endif
-
-    #if Z4_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.get_pwm_thrs());
-    #endif
-
-    #if I_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM_P(SP_I_STR, stepperI.get_pwm_thrs());
-    #endif
-    #if J_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM_P(SP_J_STR, stepperJ.get_pwm_thrs());
-    #endif
-    #if K_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.get_pwm_thrs());
-    #endif
-
-    #if E0_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T0 E", stepperE0.get_pwm_thrs());
-    #endif
-    #if E1_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T1 E", stepperE1.get_pwm_thrs());
-    #endif
-    #if E2_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T2 E", stepperE2.get_pwm_thrs());
-    #endif
-    #if E3_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T3 E", stepperE3.get_pwm_thrs());
-    #endif
-    #if E4_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T4 E", stepperE4.get_pwm_thrs());
-    #endif
-    #if E5_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T5 E", stepperE5.get_pwm_thrs());
-    #endif
-    #if E6_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T6 E", stepperE6.get_pwm_thrs());
-    #endif
-    #if E7_HAS_STEALTHCHOP
-      say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" T7 E", stepperE7.get_pwm_thrs());
-    #endif
-    SERIAL_EOL();
-  }
-
 #endif // HYBRID_THRESHOLD
 
 /**
  * M914: Set StallGuard sensitivity.
  */
 #if USE_SENSORLESS
-
   void GcodeSuite::M914() {
 
     bool report = true;
@@ -510,68 +412,6 @@
       #endif
     }
   }
-
-  void GcodeSuite::M914_report(const bool forReplay/*=true*/) {
-    report_heading(forReplay, PSTR(STR_STALLGUARD_THRESHOLD));
-
-    auto say_M914 = [](const bool forReplay) {
-      report_echo_start(forReplay);
-      SERIAL_ECHOPGM("  M914");
-    };
-
-    #if X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS
-      say_M914(forReplay);
-      #if X_SENSORLESS
-        SERIAL_ECHOPGM_P(SP_X_STR, stepperX.homing_threshold());
-      #endif
-      #if Y_SENSORLESS
-        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY.homing_threshold());
-      #endif
-      #if Z_SENSORLESS
-        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ.homing_threshold());
-      #endif
-      SERIAL_EOL();
-    #endif
-
-    #if X2_SENSORLESS || Y2_SENSORLESS || Z2_SENSORLESS
-      say_M914(forReplay);
-      SERIAL_ECHOPGM(" I1");
-      #if X2_SENSORLESS
-        SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.homing_threshold());
-      #endif
-      #if Y2_SENSORLESS
-        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY2.homing_threshold());
-      #endif
-      #if Z2_SENSORLESS
-        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ2.homing_threshold());
-      #endif
-      SERIAL_EOL();
-    #endif
-
-    #if Z3_SENSORLESS
-      say_M914(forReplay);
-      SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.homing_threshold());
-    #endif
-
-    #if Z4_SENSORLESS
-      say_M914(forReplay);
-      SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.homing_threshold());
-    #endif
-
-    #if I_SENSORLESS
-      say_M914(forReplay);
-      SERIAL_ECHOLNPGM_P(SP_I_STR, stepperI.homing_threshold());
-    #endif
-    #if J_SENSORLESS
-      say_M914(forReplay);
-      SERIAL_ECHOLNPGM_P(SP_J_STR, stepperJ.homing_threshold());
-    #endif
-    #if K_SENSORLESS
-      say_M914(forReplay);
-      SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.homing_threshold());
-    #endif
-  }
-
 #endif // USE_SENSORLESS
 
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 4e7c3df..7933c31 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -102,24 +102,6 @@ uint8_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
   xyz_pos_t GcodeSuite::coordinate_system[MAX_COORDINATE_SYSTEMS];
 #endif
 
-void GcodeSuite::report_echo_start(const bool forReplay) { if (!forReplay) SERIAL_ECHO_START(); }
-void GcodeSuite::report_heading(const bool forReplay, PGM_P const pstr, const bool eol/*=true*/) {
-  if (forReplay) return;
-  if (pstr) {
-    SERIAL_ECHO_START();
-    SERIAL_ECHOPGM("; ");
-    SERIAL_ECHOPGM_P(pstr);
-  }
-  if (eol) { SERIAL_CHAR(':'); SERIAL_EOL(); }
-}
-
-void GcodeSuite::say_units() {
-  SERIAL_ECHOLNPGM_P(
-    TERN_(INCH_MODE_SUPPORT, parser.linear_unit_factor != 1.0 ? PSTR(" (in)") :)
-    PSTR(" (mm)")
-  );
-}
-
 /**
  * Get the target extruder from the T parameter or the active_extruder
  * Return -1 if the T parameter is out of range
@@ -130,7 +112,7 @@ int8_t GcodeSuite::get_target_extruder_from_command() {
     if (e < EXTRUDERS) return e;
     SERIAL_ECHO_START();
     SERIAL_CHAR('M'); SERIAL_ECHO(parser.codenum);
-    SERIAL_ECHOLNPGM(" " STR_INVALID_EXTRUDER " ", e);
+    SERIAL_ECHOLNPAIR(" " STR_INVALID_EXTRUDER " ", e);
     return -1;
   }
   return active_extruder;
@@ -149,12 +131,12 @@ int8_t GcodeSuite::get_target_e_stepper_from_command() {
   if (e == -1)
     SERIAL_ECHOLNPGM(" " STR_E_STEPPER_NOT_SPECIFIED);
   else
-    SERIAL_ECHOLNPGM(" " STR_INVALID_E_STEPPER " ", e);
+    SERIAL_ECHOLNPAIR(" " STR_INVALID_E_STEPPER " ", e);
   return -1;
 }
 
 /**
- * Set XYZIJKE destination and feedrate from the current GCode command
+ * Set XYZE destination and feedrate from the current GCode command
  *
  *  - Set destination from included axis codes
  *  - Set to current for missing axis codes
@@ -198,7 +180,7 @@ void GcodeSuite::get_destination_from_command() {
       recovery.save();
   #endif
 
-  if (parser.floatval('F') > 0)
+  if (parser.linearval('F') > 0)
     feedrate_mm_s = parser.value_feedrate();
 
   #if ENABLED(PRINTCOUNTER)
@@ -215,7 +197,7 @@ void GcodeSuite::get_destination_from_command() {
     // Set the laser power in the planner to configure this move
     if (parser.seen('S')) {
       const float spwr = parser.value_float();
-      cutter.inline_power(TERN(SPINDLE_LASER_USE_PWM, cutter.power_to_range(cutter_power_t(round(spwr))), spwr > 0 ? 255 : 0));
+      cutter.inline_power(TERN(SPINDLE_LASER_PWM, cutter.power_to_range(cutter_power_t(round(spwr))), spwr > 0 ? 255 : 0));
     }
     else if (ENABLED(LASER_MOVE_G0_OFF) && parser.codenum == 0) // G0
       cutter.set_inline_enabled(false);
@@ -717,9 +699,6 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         #if ENABLED(EDITABLE_SERVO_ANGLES)
           case 281: M281(); break;                                // M281: Set servo angles
         #endif
-        #if ENABLED(SERVO_DETACH_GCODE)
-          case 282: M282(); break;                                // M282: Detach servo
-        #endif
       #endif
 
       #if ENABLED(BABYSTEPPING)
@@ -1085,7 +1064,7 @@ void GcodeSuite::process_next_command() {
     SERIAL_ECHO_START();
     SERIAL_ECHOLN(command.buffer);
     #if ENABLED(M100_FREE_MEMORY_DUMPER)
-      SERIAL_ECHOPGM("slot:", queue.ring_buffer.index_r);
+      SERIAL_ECHOPAIR("slot:", queue.ring_buffer.index_r);
       M100_dump_routine(PSTR("   Command Queue:"), (const char*)&queue.ring_buffer, sizeof(queue.ring_buffer));
     #endif
   }
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index aa38b7d..9f47c9f 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * gcode.h - Temporary container for all gcode handlers
+ */
+
 /**
  * -----------------
  * G-Codes in Marlin
@@ -192,7 +196,6 @@
  * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
  * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
  * M281 - Set servo min|max position: "M281 P<index> L<min> U<max>". (Requires EDITABLE_SERVO_ANGLES)
- * M282 - Detach servo: "M282 P<index>". (Requires SERVO_DETACH_GCODE)
  * M290 - Babystepping (Requires BABYSTEPPING)
  * M300 - Play beep sound S<frequency Hz> P<duration ms>
  * M301 - Set PID parameters P I and D. (Requires PIDTEMP)
@@ -239,7 +242,6 @@
  * M553 - Get or set IP netmask. (Requires enabled Ethernet port)
  * M554 - Get or set IP gateway. (Requires enabled Ethernet port)
  * M569 - Enable stealthChop on an axis. (Requires at least one _DRIVER_TYPE to be TMC2130/2160/2208/2209/5130/5160)
- * M575 - Change the serial baud rate. (Requires BAUD_RATE_GCODE)
  * M600 - Pause for filament change: "M600 X<pos> Y<pos> Z<raise> E<first_retract> L<later_retract>". (Requires ADVANCED_PAUSE_FEATURE)
  * M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE)
  * M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
@@ -296,7 +298,6 @@
  * M997 - Perform in-application firmware update
  * M999 - Restart after being stopped by error
  * D... - Custom Development G-code. Add hooks to 'gcode_D.cpp' for developers to test features. (Requires MARLIN_DEV_MODE)
- *        D576 - Set buffer monitoring options. (Requires BUFFER_MONITORING)
  *
  * "T" Codes
  *
@@ -380,14 +381,6 @@ public:
     return ELAPSED(ms, previous_move_ms + stepper_inactive_time);
   }
 
-  static void report_echo_start(const bool forReplay);
-  static void report_heading(const bool forReplay, PGM_P const pstr, const bool eol=true);
-  static inline void report_heading_etc(const bool forReplay, PGM_P const pstr, const bool eol=true) {
-    report_heading(forReplay, pstr, eol);
-    report_echo_start(forReplay);
-  }
-  static void say_units();
-
   static int8_t get_target_extruder_from_command();
   static int8_t get_target_e_stepper_from_command();
   static void get_destination_from_command();
@@ -443,8 +436,6 @@ public:
 
 private:
 
-  friend class MarlinSettings;
-
   #if ENABLED(MARLIN_DEV_MODE)
     static void D(const int16_t dcode);
   #endif
@@ -525,7 +516,6 @@ private:
 
   #if ENABLED(Z_STEPPER_AUTO_ALIGN)
     static void M422();
-    static void M422_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(ASSISTED_TRAMMING)
@@ -670,7 +660,6 @@ private:
 
   static void M85();
   static void M92();
-  static void M92_report(const bool forReplay=true, const int8_t e=-1);
 
   #if ENABLED(M100_FREE_MEMORY_WATCHER)
     static void M100();
@@ -750,12 +739,10 @@ private:
 
   #if PREHEAT_COUNT
     static void M145();
-    static void M145_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
     static void M149();
-    static void M149_report(const bool forReplay=true);
   #endif
 
   #if HAS_COLOR_LEDS
@@ -781,51 +768,37 @@ private:
     #endif
   #endif
 
-  #if DISABLED(NO_VOLUMETRICS)
-    static void M200();
-    static void M200_report(const bool forReplay=true);
-  #endif
+  static void M200();
   static void M201();
-  static void M201_report(const bool forReplay=true);
 
   #if 0
     static void M202(); // Not used for Sprinter/grbl gen6
   #endif
 
   static void M203();
-  static void M203_report(const bool forReplay=true);
   static void M204();
-  static void M204_report(const bool forReplay=true);
   static void M205();
-  static void M205_report(const bool forReplay=true);
 
   #if HAS_M206_COMMAND
     static void M206();
-    static void M206_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(FWRETRACT)
     static void M207();
-    static void M207_report(const bool forReplay=true);
     static void M208();
-    static void M208_report(const bool forReplay=true);
     #if ENABLED(FWRETRACT_AUTORETRACT)
       static void M209();
-      static void M209_report(const bool forReplay=true);
     #endif
   #endif
 
   static void M211();
-  static void M211_report(const bool forReplay=true);
 
   #if HAS_MULTI_EXTRUDER
     static void M217();
-    static void M217_report(const bool forReplay=true);
   #endif
 
   #if HAS_HOTEND_OFFSET
     static void M218();
-    static void M218_report(const bool forReplay=true);
   #endif
 
   static void M220();
@@ -844,12 +817,10 @@ private:
 
   #if HAS_LCD_CONTRAST
     static void M250();
-    static void M250_report(const bool forReplay=true);
   #endif
 
   #if HAS_LCD_BRIGHTNESS
     static void M256();
-    static void M256_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(EXPERIMENTAL_I2CBUS)
@@ -861,10 +832,6 @@ private:
     static void M280();
     #if ENABLED(EDITABLE_SERVO_ANGLES)
       static void M281();
-      static void M281_report(const bool forReplay=true);
-    #endif
-    #if ENABLED(SERVO_DETACH_GCODE)
-      static void M282();
     #endif
   #endif
 
@@ -878,7 +845,6 @@ private:
 
   #if ENABLED(PIDTEMP)
     static void M301();
-    static void M301_report(const bool forReplay=true, const int8_t eindex=-1);
   #endif
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
@@ -891,7 +857,6 @@ private:
 
   #if ENABLED(PIDTEMPBED)
     static void M304();
-    static void M304_report(const bool forReplay=true);
   #endif
 
   #if HAS_USER_THERMISTORS
@@ -900,7 +865,6 @@ private:
 
   #if ENABLED(PIDTEMPCHAMBER)
     static void M309();
-    static void M309_report(const bool forReplay=true);
   #endif
 
   #if HAS_MICROSTEPS
@@ -949,23 +913,19 @@ private:
 
   #if HAS_FILAMENT_SENSOR
     static void M412();
-    static void M412_report(const bool forReplay=true);
   #endif
 
   #if HAS_MULTI_LANGUAGE
     static void M414();
-    static void M414_report(const bool forReplay=true);
   #endif
 
   #if HAS_LEVELING
     static void M420();
-    static void M420_report(const bool forReplay=true);
     static void M421();
   #endif
 
   #if ENABLED(BACKLASH_GCODE)
     static void M425();
-    static void M425_report(const bool forReplay=true);
   #endif
 
   #if HAS_M206_COMMAND
@@ -1010,16 +970,8 @@ private:
 
   #if HAS_ETHERNET
     static void M552();
-    static void M552_report();
     static void M553();
-    static void M553_report();
     static void M554();
-    static void M554_report();
-  #endif
-
-  #if HAS_STEALTHCHOP
-    static void M569();
-    static void M569_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(BAUD_RATE_GCODE)
@@ -1029,7 +981,6 @@ private:
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     static void M600();
     static void M603();
-    static void M603_report(const bool forReplay=true);
   #endif
 
   #if HAS_DUPLICATION_MODE
@@ -1038,12 +989,10 @@ private:
 
   #if IS_KINEMATIC
     static void M665();
-    static void M665_report(const bool forReplay=true);
   #endif
 
-  #if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
+  #if ENABLED(DELTA) || HAS_EXTRA_ENDSTOPS
     static void M666();
-    static void M666_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
@@ -1065,12 +1014,10 @@ private:
 
   #if HAS_BED_PROBE
     static void M851();
-    static void M851_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(SKEW_CORRECTION_GCODE)
     static void M852();
-    static void M852_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(I2C_POSITION_ENCODERS)
@@ -1093,24 +1040,23 @@ private:
 
   #if ENABLED(LIN_ADVANCE)
     static void M900();
-    static void M900_report(const bool forReplay=true);
   #endif
 
   #if HAS_TRINAMIC_CONFIG
     static void M122();
     static void M906();
-    static void M906_report(const bool forReplay=true);
+    #if HAS_STEALTHCHOP
+      static void M569();
+    #endif
     #if ENABLED(MONITOR_DRIVER_STATUS)
       static void M911();
       static void M912();
     #endif
     #if ENABLED(HYBRID_THRESHOLD)
       static void M913();
-      static void M913_report(const bool forReplay=true);
     #endif
     #if ENABLED(USE_SENSORLESS)
       static void M914();
-      static void M914_report(const bool forReplay=true);
     #endif
   #endif
 
@@ -1122,19 +1068,16 @@ private:
     static void M918();
   #endif
 
-  #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM || HAS_MOTOR_CURRENT_I2C || HAS_MOTOR_CURRENT_DAC
+  #if ANY(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM, HAS_MOTOR_CURRENT_I2C, HAS_MOTOR_CURRENT_DAC)
     static void M907();
-    #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
-      static void M907_report(const bool forReplay=true);
+    #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC)
+      static void M908();
+      #if HAS_MOTOR_CURRENT_DAC
+        static void M909();
+        static void M910();
+      #endif
     #endif
   #endif
-  #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_DAC
-    static void M908();
-  #endif
-  #if HAS_MOTOR_CURRENT_DAC
-    static void M909();
-    static void M910();
-  #endif
 
   #if ENABLED(SDSUPPORT)
     static void M928();
@@ -1161,7 +1104,6 @@ private:
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     static void M413();
-    static void M413_report(const bool forReplay=true);
     static void M1000();
   #endif
 
@@ -1183,7 +1125,6 @@ private:
 
   #if ENABLED(CONTROLLER_FAN_EDITABLE)
     static void M710();
-    static void M710_report(const bool forReplay=true);
   #endif
 
   static void T(const int8_t tool_index);
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 83646ef..52a2739 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -19,284 +19,252 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../inc/MarlinConfigPre.h"
 
 #if ENABLED(MARLIN_DEV_MODE)
 
-#include "gcode.h"
+  #include "gcode.h"
+  #include "../module/settings.h"
+  #include "../module/temperature.h"
+  #include "../libs/hex_print.h"
+  #include "../HAL/shared/eeprom_if.h"
+  #include "../HAL/shared/Delay.h"
+  #include "../sd/cardreader.h"
+  #include "../MarlinCore.h" // for kill
 
-#if ENABLED(BUFFER_MONITORING)
-  #include "queue.h"
-#endif
+  extern void dump_delay_accuracy_check();
 
-#include "../module/settings.h"
-#include "../module/temperature.h"
-#include "../libs/hex_print.h"
-#include "../HAL/shared/eeprom_if.h"
-#include "../HAL/shared/Delay.h"
-#include "../sd/cardreader.h"
-#include "../MarlinCore.h" // for kill
+  /**
+   * Dn: G-code for development and testing
+   *
+   * See https://reprap.org/wiki/G-code#D:_Debug_codes
+   *
+   * Put whatever else you need here to test ongoing development.
+   */
+  void GcodeSuite::D(const int16_t dcode) {
+    switch (dcode) {
 
-extern void dump_delay_accuracy_check();
+      case -1:
+        for (;;) { /* loop forever (watchdog reset) */ }
 
-/**
- * Dn: G-code for development and testing
- *
- * See https://reprap.org/wiki/G-code#D:_Debug_codes
- *
- * Put whatever else you need here to test ongoing development.
- */
-void GcodeSuite::D(const int16_t dcode) {
-  switch (dcode) {
+      case 0:
+        HAL_reboot();
+        break;
 
-    case -1:
-      for (;;) { /* loop forever (watchdog reset) */ }
+      case 10:
+        kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen_test('P'));
+        break;
 
-    case 0:
-      HAL_reboot();
-      break;
+      case 1: {
+        // Zero or pattern-fill the EEPROM data
+        #if ENABLED(EEPROM_SETTINGS)
+          persistentStore.access_start();
+          size_t total = persistentStore.capacity();
+          int pos = 0;
+          const uint8_t value = 0x0;
+          while (total--) persistentStore.write_data(pos, &value, 1);
+          persistentStore.access_finish();
+        #else
+          settings.reset();
+          settings.save();
+        #endif
+        HAL_reboot();
+      } break;
 
-    case 10:
-      kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen_test('P'));
-      break;
-
-    case 1: {
-      // Zero or pattern-fill the EEPROM data
-      #if ENABLED(EEPROM_SETTINGS)
-        persistentStore.access_start();
-        size_t total = persistentStore.capacity();
-        int pos = 0;
-        const uint8_t value = 0x0;
-        while (total--) persistentStore.write_data(pos, &value, 1);
-        persistentStore.access_finish();
-      #else
-        settings.reset();
-        settings.save();
-      #endif
-      HAL_reboot();
-    } break;
-
-    case 2: { // D2 Read / Write SRAM
-      #define SRAM_SIZE 8192
-      uint8_t *pointer = parser.hex_adr_val('A');
-      uint16_t len = parser.ushortval('C', 1);
-      uintptr_t addr = (uintptr_t)pointer;
-      NOMORE(addr, size_t(SRAM_SIZE - 1));
-      NOMORE(len, SRAM_SIZE - addr);
-      if (parser.seenval('X')) {
-        // Write the hex bytes after the X
-        uint16_t val = parser.hex_val('X');
-        while (len--) {
-          *pointer = val;
-          pointer++;
-        }
-      }
-      else {
-        while (len--) print_hex_byte(*(pointer++));
-        SERIAL_EOL();
-      }
-    } break;
-
-    #if ENABLED(EEPROM_SETTINGS)
-      case 3: { // D3 Read / Write EEPROM
+      case 2: { // D2 Read / Write SRAM
+        #define SRAM_SIZE 8192
         uint8_t *pointer = parser.hex_adr_val('A');
         uint16_t len = parser.ushortval('C', 1);
         uintptr_t addr = (uintptr_t)pointer;
-        NOMORE(addr, size_t(persistentStore.capacity() - 1));
-        NOMORE(len, persistentStore.capacity() - addr);
+        NOMORE(addr, size_t(SRAM_SIZE - 1));
+        NOMORE(len, SRAM_SIZE - addr);
         if (parser.seenval('X')) {
+          // Write the hex bytes after the X
           uint16_t val = parser.hex_val('X');
-          #if ENABLED(EEPROM_SETTINGS)
-            persistentStore.access_start();
-            while (len--) {
-              int pos = 0;
-              persistentStore.write_data(pos, (uint8_t *)&val, sizeof(val));
-            }
-            SERIAL_EOL();
-            persistentStore.access_finish();
-          #else
-            SERIAL_ECHOLNPGM("NO EEPROM");
-          #endif
+          while (len--) {
+            *pointer = val;
+            pointer++;
+          }
         }
         else {
-          // Read bytes from EEPROM
-          #if ENABLED(EEPROM_SETTINGS)
-            persistentStore.access_start();
-            int pos = 0;
-            uint8_t val;
-            while (len--) if (!persistentStore.read_data(pos, &val, 1)) print_hex_byte(val);
-            SERIAL_EOL();
-            persistentStore.access_finish();
-          #else
-            SERIAL_ECHOLNPGM("NO EEPROM");
-            len = 0;
-          #endif
+          while (len--) print_hex_byte(*(pointer++));
           SERIAL_EOL();
         }
       } break;
-    #endif
 
-    case 4: { // D4 Read / Write PIN
-      //const bool is_out = parser.boolval('F');
-      //const uint8_t pin = parser.byteval('P'),
-      //              val = parser.byteval('V', LOW);
-      if (parser.seenval('X')) {
-        // TODO: Write the hex bytes after the X
-        //while (len--) {
-        //}
-      }
-      else {
-        //while (len--) {
-        //// TODO: Read bytes from EEPROM
-        //  print_hex_byte(eeprom_read_byte(adr++));
-        //}
-        SERIAL_EOL();
-      }
-    } break;
+      #if ENABLED(EEPROM_SETTINGS)
+        case 3: { // D3 Read / Write EEPROM
+          uint8_t *pointer = parser.hex_adr_val('A');
+          uint16_t len = parser.ushortval('C', 1);
+          uintptr_t addr = (uintptr_t)pointer;
+          NOMORE(addr, size_t(persistentStore.capacity() - 1));
+          NOMORE(len, persistentStore.capacity() - addr);
+          if (parser.seenval('X')) {
+            uint16_t val = parser.hex_val('X');
+            #if ENABLED(EEPROM_SETTINGS)
+              persistentStore.access_start();
+              while (len--) {
+                int pos = 0;
+                persistentStore.write_data(pos, (uint8_t *)&val, sizeof(val));
+              }
+              SERIAL_EOL();
+              persistentStore.access_finish();
+            #else
+              SERIAL_ECHOLNPGM("NO EEPROM");
+            #endif
+          }
+          else {
+            // Read bytes from EEPROM
+            #if ENABLED(EEPROM_SETTINGS)
+              persistentStore.access_start();
+              int pos = 0;
+              uint8_t val;
+              while (len--) if (!persistentStore.read_data(pos, &val, 1)) print_hex_byte(val);
+              SERIAL_EOL();
+              persistentStore.access_finish();
+            #else
+              SERIAL_ECHOLNPGM("NO EEPROM");
+              len = 0;
+            #endif
+            SERIAL_EOL();
+          }
+        } break;
+      #endif
 
-    case 5: { // D5 Read / Write onboard Flash
-      #define FLASH_SIZE 1024
-      uint8_t *pointer = parser.hex_adr_val('A');
-      uint16_t len = parser.ushortval('C', 1);
-      uintptr_t addr = (uintptr_t)pointer;
-      NOMORE(addr, size_t(FLASH_SIZE - 1));
-      NOMORE(len, FLASH_SIZE - addr);
-      if (parser.seenval('X')) {
-        // TODO: Write the hex bytes after the X
-        //while (len--) {}
-      }
-      else {
-        //while (len--) {
-        //// TODO: Read bytes from EEPROM
-        //  print_hex_byte(eeprom_read_byte(adr++));
-        //}
-        SERIAL_EOL();
-      }
-    } break;
-
-    case 6: // D6 Check delay loop accuracy
-      dump_delay_accuracy_check();
-      break;
-
-    case 7: // D7 dump the current serial port type (hence configuration)
-      SERIAL_ECHOLNPGM("Current serial configuration RX_BS:", RX_BUFFER_SIZE, ", TX_BS:", TX_BUFFER_SIZE);
-      SERIAL_ECHOLN(gtn(&SERIAL_IMPL));
-      break;
-
-    case 100: { // D100 Disable heaters and attempt a hard hang (Watchdog Test)
-      SERIAL_ECHOLNPGM("Disabling heaters and attempting to trigger Watchdog");
-      SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
-      thermalManager.disable_all_heaters();
-      delay(1000); // Allow time to print
-      DISABLE_ISRS();
-      // Use a low-level delay that does not rely on interrupts to function
-      // Do not spin forever, to avoid thermal risks if heaters are enabled and
-      // watchdog does not work.
-      for (int i = 10000; i--;) DELAY_US(1000UL);
-      ENABLE_ISRS();
-      SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
-    } break;
-
-    #if ENABLED(SDSUPPORT)
-
-      case 101: { // D101 Test SD Write
-        card.openFileWrite("test.gco");
-        if (!card.isFileOpen()) {
-          SERIAL_ECHOLNPGM("Failed to open test.gco to write.");
-          return;
+      case 4: { // D4 Read / Write PIN
+        //const bool is_out = parser.boolval('F');
+        //const uint8_t pin = parser.byteval('P'),
+        //              val = parser.byteval('V', LOW);
+        if (parser.seenval('X')) {
+          // TODO: Write the hex bytes after the X
+          //while (len--) {
+          //}
         }
-        __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
-
-        uint16_t c;
-        for (c = 0; c < COUNT(buf); c++)
-          buf[c] = 'A' + (c % ('Z' - 'A'));
-
-        c = 1024 * 4;
-        while (c--) {
-          TERN_(USE_WATCHDOG, watchdog_refresh());
-          card.write(buf, COUNT(buf));
+        else {
+          //while (len--) {
+          //// TODO: Read bytes from EEPROM
+          //  print_hex_byte(eeprom_read_byte(adr++));
+          //}
+          SERIAL_EOL();
         }
-        SERIAL_ECHOLNPGM(" done");
-        card.closefile();
       } break;
 
-      case 102: { // D102 Test SD Read
-        char testfile[] = "test.gco";
-        card.openFileRead(testfile);
-        if (!card.isFileOpen()) {
-          SERIAL_ECHOLNPGM("Failed to open test.gco to read.");
-          return;
+      case 5: { // D5 Read / Write onboard Flash
+        #define FLASH_SIZE 1024
+        uint8_t *pointer = parser.hex_adr_val('A');
+        uint16_t len = parser.ushortval('C', 1);
+        uintptr_t addr = (uintptr_t)pointer;
+        NOMORE(addr, size_t(FLASH_SIZE - 1));
+        NOMORE(len, FLASH_SIZE - addr);
+        if (parser.seenval('X')) {
+          // TODO: Write the hex bytes after the X
+          //while (len--) {}
         }
-        __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
-        uint16_t c = 1024 * 4;
-        while (c--) {
-          TERN_(USE_WATCHDOG, watchdog_refresh());
-          card.read(buf, COUNT(buf));
-          bool error = false;
-          for (uint16_t i = 0; i < COUNT(buf); i++) {
-            if (buf[i] != ('A' + (i % ('Z' - 'A')))) {
-              error = true;
+        else {
+          //while (len--) {
+          //// TODO: Read bytes from EEPROM
+          //  print_hex_byte(eeprom_read_byte(adr++));
+          //}
+          SERIAL_EOL();
+        }
+      } break;
+
+      case 6: // D6 Check delay loop accuracy
+        dump_delay_accuracy_check();
+        break;
+
+      case 7: // D7 dump the current serial port type (hence configuration)
+        SERIAL_ECHOLNPAIR("Current serial configuration RX_BS:", RX_BUFFER_SIZE, ", TX_BS:", TX_BUFFER_SIZE);
+        SERIAL_ECHOLN(gtn(&SERIAL_IMPL));
+        break;
+
+      case 100: { // D100 Disable heaters and attempt a hard hang (Watchdog Test)
+        SERIAL_ECHOLNPGM("Disabling heaters and attempting to trigger Watchdog");
+        SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
+        thermalManager.disable_all_heaters();
+        delay(1000); // Allow time to print
+        DISABLE_ISRS();
+        // Use a low-level delay that does not rely on interrupts to function
+        // Do not spin forever, to avoid thermal risks if heaters are enabled and
+        // watchdog does not work.
+        for (int i = 10000; i--;) DELAY_US(1000UL);
+        ENABLE_ISRS();
+        SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
+      } break;
+
+      #if ENABLED(SDSUPPORT)
+
+        case 101: { // D101 Test SD Write
+          card.openFileWrite("test.gco");
+          if (!card.isFileOpen()) {
+            SERIAL_ECHOLNPAIR("Failed to open test.gco to write.");
+            return;
+          }
+          __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
+
+          uint16_t c;
+          for (c = 0; c < COUNT(buf); c++)
+            buf[c] = 'A' + (c % ('Z' - 'A'));
+
+          c = 1024 * 4;
+          while (c--) {
+            TERN_(USE_WATCHDOG, watchdog_refresh());
+            card.write(buf, COUNT(buf));
+          }
+          SERIAL_ECHOLNPGM(" done");
+          card.closefile();
+        } break;
+
+        case 102: { // D102 Test SD Read
+          char testfile[] = "test.gco";
+          card.openFileRead(testfile);
+          if (!card.isFileOpen()) {
+            SERIAL_ECHOLNPAIR("Failed to open test.gco to read.");
+            return;
+          }
+          __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
+          uint16_t c = 1024 * 4;
+          while (c--) {
+            TERN_(USE_WATCHDOG, watchdog_refresh());
+            card.read(buf, COUNT(buf));
+            bool error = false;
+            for (uint16_t i = 0; i < COUNT(buf); i++) {
+              if (buf[i] != ('A' + (i % ('Z' - 'A')))) {
+                error = true;
+                break;
+              }
+            }
+            if (error) {
+              SERIAL_ECHOLNPGM(" Read error!");
               break;
             }
           }
-          if (error) {
-            SERIAL_ECHOLNPGM(" Read error!");
-            break;
+          SERIAL_ECHOLNPGM(" done");
+          card.closefile();
+        } break;
+
+      #endif // SDSUPPORT
+
+      #if ENABLED(POSTMORTEM_DEBUGGING)
+
+        case 451: { // Trigger all kind of faults to test exception catcher
+          SERIAL_ECHOLNPGM("Disabling heaters");
+          thermalManager.disable_all_heaters();
+          delay(1000); // Allow time to print
+          volatile uint8_t type[5] = { parser.byteval('T', 1) };
+
+          // The code below is obviously wrong and it's full of quirks to fool the compiler from optimizing away the code
+          switch (type[0]) {
+            case 1: default: *(int*)0 = 451; break; // Write at bad address
+            case 2: { volatile int a = 0; volatile int b = 452 / a; *(int*)&a = b; } break; // Divide by zero (some CPUs accept this, like ARM)
+            case 3: { *(uint32_t*)&type[1] = 453; volatile int a = *(int*)&type[1]; type[0] = a / 255; } break; // Unaligned access (some CPUs accept this)
+            case 4: { volatile void (*func)() = (volatile void (*)()) 0xE0000000; func(); } break; // Invalid instruction
           }
+          break;
         }
-        SERIAL_ECHOLNPGM(" done");
-        card.closefile();
-      } break;
 
-    #endif // SDSUPPORT
-
-    #if ENABLED(POSTMORTEM_DEBUGGING)
-
-      case 451: { // Trigger all kind of faults to test exception catcher
-        SERIAL_ECHOLNPGM("Disabling heaters");
-        thermalManager.disable_all_heaters();
-        delay(1000); // Allow time to print
-        volatile uint8_t type[5] = { parser.byteval('T', 1) };
-
-        // The code below is obviously wrong and it's full of quirks to fool the compiler from optimizing away the code
-        switch (type[0]) {
-          case 1: default: *(int*)0 = 451; break; // Write at bad address
-          case 2: { volatile int a = 0; volatile int b = 452 / a; *(int*)&a = b; } break; // Divide by zero (some CPUs accept this, like ARM)
-          case 3: { *(uint32_t*)&type[1] = 453; volatile int a = *(int*)&type[1]; type[0] = a / 255; } break; // Unaligned access (some CPUs accept this)
-          case 4: { volatile void (*func)() = (volatile void (*)()) 0xE0000000; func(); } break; // Invalid instruction
-        }
-        break;
-      }
-
-    #endif
-
-    #if ENABLED(BUFFER_MONITORING)
-
-      /**
-       * D576: Return buffer stats or set the auto-report interval.
-       * Usage: D576 [S<seconds>]
-       *
-       * With no parameters emits the following output:
-       * "D576 P<nn> B<nn> PU<nn> PD<nn> BU<nn> BD<nn>"
-       * Where:
-       *   P : Planner buffers free
-       *   B : Command buffers free
-       *   PU: Planner buffer underruns (since the last report)
-       *   PD: Longest duration (ms) the planner buffer was empty (since the last report)
-       *   BU: Command buffer underruns (since the last report)
-       *   BD: Longest duration (ms) command buffer was empty (since the last report)
-       */
-      case 576: {
-        if (parser.seenval('S'))
-          queue.set_auto_report_interval((uint8_t)parser.value_byte());
-        else
-          queue.report_buffer_statistics();
-        break;
-      }
-
-    #endif // BUFFER_MONITORING
+      #endif
+    }
   }
-}
 
-#endif // MARLIN_DEV_MODE
+#endif
diff --git a/Marlin/src/gcode/geometry/G53-G59.cpp b/Marlin/src/gcode/geometry/G53-G59.cpp
index db2404a..a5a9f70 100644
--- a/Marlin/src/gcode/geometry/G53-G59.cpp
+++ b/Marlin/src/gcode/geometry/G53-G59.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::G53() {
     process_parsed_command(); // ...process the chained command
     select_coordinate_system(old_system);
     #ifdef DEBUG_M53
-      SERIAL_ECHOLNPGM("Go back to workspace ", old_system);
+      SERIAL_ECHOLNPAIR("Go back to workspace ", old_system);
       report_current_position();
     #endif
   }
@@ -87,7 +87,7 @@ void GcodeSuite::G53() {
 void G54_59(uint8_t subcode=0) {
   const int8_t _space = parser.codenum - 54 + subcode;
   if (gcode.select_coordinate_system(_space)) {
-    SERIAL_ECHOLNPGM("Select workspace ", _space);
+    SERIAL_ECHOLNPAIR("Select workspace ", _space);
     report_current_position();
   }
 }
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 416b3f7..51f3e7c 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -30,6 +30,19 @@
 #include "../../libs/buzzer.h"
 #include "../../MarlinCore.h"
 
+void M206_report() {
+  SERIAL_ECHOLNPAIR_P(
+    LIST_N(DOUBLE(LINEAR_AXES),
+      PSTR("M206 X"), home_offset.x,
+      SP_Y_STR, home_offset.y,
+      SP_Z_STR, home_offset.z,
+      SP_I_STR, home_offset.i,
+      SP_J_STR, home_offset.j,
+      SP_K_STR, home_offset.k,
+    )
+  );
+}
+
 /**
  * M206: Set Additional Homing Offset (X Y Z). SCARA aliases T=X, P=Y
  *
@@ -38,8 +51,6 @@
  * ***              In the 2.0 release, it will simply be disabled by default.
  */
 void GcodeSuite::M206() {
-  if (!parser.seen_any()) return M206_report();
-
   LOOP_LINEAR_AXES(i)
     if (parser.seen(AXIS_CHAR(i)))
       set_home_offset((AxisEnum)i, parser.value_linear_units());
@@ -49,25 +60,10 @@ void GcodeSuite::M206() {
     if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
   #endif
 
-  report_current_position();
-}
-
-void GcodeSuite::M206_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_HOME_OFFSET));
-  SERIAL_ECHOLNPGM_P(
-    #if IS_CARTESIAN
-      LIST_N(DOUBLE(LINEAR_AXES),
-        PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
-        SP_Y_STR, LINEAR_UNIT(home_offset.y),
-        SP_Z_STR, LINEAR_UNIT(home_offset.z),
-        SP_I_STR, LINEAR_UNIT(home_offset.i),
-        SP_J_STR, LINEAR_UNIT(home_offset.j),
-        SP_K_STR, LINEAR_UNIT(home_offset.k)
-      )
-    #else
-      PSTR("  M206 Z"), LINEAR_UNIT(home_offset.z)
-    #endif
-  );
+  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", "I", "J", "K")))
+    M206_report();
+  else
+    report_current_position();
 }
 
 /**
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index cdb9efb..7d69033 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -218,7 +218,7 @@ void GcodeSuite::M114() {
     }
     #if HAS_EXTRUDERS
       if (parser.seen_test('E')) {
-        SERIAL_ECHOLNPGM("Count E:", stepper.position(E_AXIS));
+        SERIAL_ECHOLNPAIR("Count E:", stepper.position(E_AXIS));
         return;
       }
     #endif
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 1c10697..3b88c69 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -166,16 +166,14 @@ void GcodeSuite::M115() {
 
     // Machine Geometry
     #if ENABLED(M115_GEOMETRY_REPORT)
-      const xyz_pos_t bmin = { 0, 0, 0 },
-                      bmax = { X_BED_SIZE , Y_BED_SIZE, Z_MAX_POS },
-                      dmin = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS },
+      const xyz_pos_t dmin = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS },
                       dmax = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
-      xyz_pos_t cmin = bmin, cmax = bmax;
+      xyz_pos_t cmin = dmin, cmax = dmax;
       apply_motion_limits(cmin);
       apply_motion_limits(cmax);
       const xyz_pos_t lmin = dmin.asLogical(), lmax = dmax.asLogical(),
                       wmin = cmin.asLogical(), wmax = cmax.asLogical();
-      SERIAL_ECHOLNPGM(
+      SERIAL_ECHOLNPAIR(
         "area:{"
           "full:{"
             "min:{x:", lmin.x, ",y:", lmin.y, ",z:", lmin.z, "},"
diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index 1830dea..7a0b8e3 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(REPETIER_GCODE_M360)
@@ -37,7 +36,7 @@ static void config_prefix(PGM_P const name, PGM_P const pref=nullptr, const int8
   SERIAL_ECHOPGM("Config:");
   if (pref) SERIAL_ECHOPGM_P(pref);
   if (ind >= 0) { SERIAL_ECHO(ind); SERIAL_CHAR(':'); }
-  SERIAL_ECHOPGM_P(name, AS_CHAR(':'));
+  SERIAL_ECHOPAIR_P(name, AS_CHAR(':'));
 }
 static void config_line(PGM_P const name, const float val, PGM_P const pref=nullptr, const int8_t ind=-1) {
   config_prefix(name, pref, ind);
diff --git a/Marlin/src/gcode/host/M876.cpp b/Marlin/src/gcode/host/M876.cpp
index 00efb01..0d8256c 100644
--- a/Marlin/src/gcode/host/M876.cpp
+++ b/Marlin/src/gcode/host/M876.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 9ba6ed5..414c4ce 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -35,8 +35,6 @@
   #include "../../lcd/marlinui.h"
 #elif ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -70,8 +68,6 @@ void GcodeSuite::M0_M1() {
       ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
     else
       ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
-  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-    DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg ?: GET_TEXT(MSG_STOPPED), GET_TEXT(MSG_USERWAIT));
   #else
 
     if (parser.string_arg) {
@@ -83,7 +79,7 @@ void GcodeSuite::M0_M1() {
 
   TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR));
 
-  TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
+  wait_for_user_response(ms);
 
   TERN_(HAS_LCD_MENU, ui.reset_status());
 }
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index 77fd425..d6a57d2 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -60,23 +60,4 @@ void GcodeSuite::M145() {
   }
 }
 
-void GcodeSuite::M145_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_MATERIAL_HEATUP));
-  LOOP_L_N(i, PREHEAT_COUNT) {
-    report_echo_start(forReplay);
-    SERIAL_ECHOLNPGM_P(
-      PSTR("  M145 S"), i
-      #if HAS_HOTEND
-        , PSTR(" H"), parser.to_temp_units(ui.material_preset[i].hotend_temp)
-      #endif
-      #if HAS_HEATED_BED
-        , SP_B_STR, parser.to_temp_units(ui.material_preset[i].bed_temp)
-      #endif
-      #if HAS_FAN
-        , PSTR(" F"), ui.material_preset[i].fan_speed
-      #endif
-    );
-  }
-}
-
 #endif // PREHEAT_COUNT
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 0793153..f553044 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -31,15 +31,8 @@
  * M250: Read and optionally set the LCD contrast
  */
 void GcodeSuite::M250() {
-  if (parser.seenval('C'))
-    ui.set_contrast(parser.value_int());
-  else
-    M250_report();
-}
-
-void GcodeSuite::M250_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_LCD_CONTRAST));
-  SERIAL_ECHOLNPGM("  M250 C", ui.contrast);
+  if (parser.seen('C')) ui.set_contrast(parser.value_int());
+  SERIAL_ECHOLNPAIR("LCD Contrast: ", ui.contrast);
 }
 
 #endif // HAS_LCD_CONTRAST
diff --git a/Marlin/src/gcode/lcd/M256.cpp b/Marlin/src/gcode/lcd/M256.cpp
index ee187cc..e292acc 100644
--- a/Marlin/src/gcode/lcd/M256.cpp
+++ b/Marlin/src/gcode/lcd/M256.cpp
@@ -30,15 +30,8 @@
  * M256: Set the LCD brightness
  */
 void GcodeSuite::M256() {
-  if (parser.seenval('B'))
-    ui.set_brightness(parser.value_int());
-  else
-    M256_report();
-}
-
-void GcodeSuite::M256_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_LCD_BRIGHTNESS));
-  SERIAL_ECHOLNPGM("  M256 B", ui.brightness);
+  if (parser.seenval('B')) ui.set_brightness(parser.value_int());
+  SERIAL_ECHOLNPAIR("LCD Brightness: ", ui.brightness);
 }
 
 #endif // HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/gcode/lcd/M414.cpp b/Marlin/src/gcode/lcd/M414.cpp
index 0eac980..760028a 100644
--- a/Marlin/src/gcode/lcd/M414.cpp
+++ b/Marlin/src/gcode/lcd/M414.cpp
@@ -38,14 +38,7 @@ void GcodeSuite::M414() {
 
   if (parser.seenval('S'))
     ui.set_language(parser.value_byte());
-  else
-    M414_report();
 
 }
 
-void GcodeSuite::M414_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_UI_LANGUAGE));
-  SERIAL_ECHOLNPGM("  M414 S", ui.language);
-}
-
 #endif // HAS_MULTI_LANGUAGE
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index b7a9b34..8996e5c 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -28,10 +28,6 @@
 #include "../../lcd/marlinui.h"
 #include "../../sd/cardreader.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
-#endif
-
 /**
  * M73: Set percentage complete (for display on LCD)
  *
@@ -39,23 +35,13 @@
  *   M73 P25 ; Set progress to 25%
  */
 void GcodeSuite::M73() {
-
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-
-    DWIN_Progress_Update();
-
-  #else
-
-    if (parser.seenval('P'))
-      ui.set_progress((PROGRESS_SCALE) > 1
-        ? parser.value_float() * (PROGRESS_SCALE)
-        : parser.value_byte()
-      );
-
-    #if ENABLED(USE_M73_REMAINING_TIME)
-      if (parser.seenval('R')) ui.set_remaining_time(60 * parser.value_ulong());
-    #endif
-
+  if (parser.seenval('P'))
+    ui.set_progress((PROGRESS_SCALE) > 1
+      ? parser.value_float() * (PROGRESS_SCALE)
+      : parser.value_byte()
+    );
+  #if ENABLED(USE_M73_REMAINING_TIME)
+    if (parser.seenval('R')) ui.set_remaining_time(60 * parser.value_ulong());
   #endif
 }
 
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index cc6979b..eb79180 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -71,7 +71,7 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
       #endif
     #endif
 
-    get_destination_from_command();                 // Get X Y [Z[I[J[K]]]] [E] F (and set cutter power)
+    get_destination_from_command();                 // Get X Y Z E F (and set cutter power)
 
     #ifdef G0_FEEDRATE
       if (fast_move) {
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 33167d9..094afdb 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -39,21 +39,14 @@
   #undef N_ARC_CORRECTION
   #define N_ARC_CORRECTION 1
 #endif
-#ifndef MIN_CIRCLE_SEGMENTS
-  #define MIN_CIRCLE_SEGMENTS 72  // 5° per segment
-#endif
-#if !defined(MAX_ARC_SEGMENT_MM) && defined(MIN_ARC_SEGMENT_MM)
-  #define MAX_ARC_SEGMENT_MM MIN_ARC_SEGMENT_MM
-#elif !defined(MIN_ARC_SEGMENT_MM) && defined(MAX_ARC_SEGMENT_MM)
-  #define MIN_ARC_SEGMENT_MM MAX_ARC_SEGMENT_MM
-#endif
-
-#define ARC_LIJK_CODE(L,I,J,K)    CODE_N(SUB2(LINEAR_AXES),L,I,J,K)
-#define ARC_LIJKE_CODE(L,I,J,K,E) ARC_LIJK_CODE(L,I,J,K); CODE_ITEM_E(E)
 
 /**
- * Plan an arc in 2 dimensions, with linear motion in the other axes.
- * The arc is traced with many small linear segments according to the configuration.
+ * Plan an arc in 2 dimensions, with optional linear motion in a 3rd dimension
+ *
+ * The arc is traced by generating many small linear segments, as configured by
+ * MM_PER_ARC_SEGMENT (Default 1mm). In the future we hope more slicers will include
+ * an option to generate G2/G3 arcs for curved surfaces, as this will allow faster
+ * boards to produce much smoother curved surfaces.
  */
 void plan_arc(
   const xyze_pos_t &cart,   // Destination position
@@ -62,45 +55,41 @@ void plan_arc(
   const uint8_t circles     // Take the scenic route
 ) {
   #if ENABLED(CNC_WORKSPACE_PLANES)
-    AxisEnum axis_p, axis_q, axis_l;
+    AxisEnum p_axis, q_axis, l_axis;
     switch (gcode.workspace_plane) {
       default:
-      case GcodeSuite::PLANE_XY: axis_p = X_AXIS; axis_q = Y_AXIS; axis_l = Z_AXIS; break;
-      case GcodeSuite::PLANE_YZ: axis_p = Y_AXIS; axis_q = Z_AXIS; axis_l = X_AXIS; break;
-      case GcodeSuite::PLANE_ZX: axis_p = Z_AXIS; axis_q = X_AXIS; axis_l = Y_AXIS; break;
+      case GcodeSuite::PLANE_XY: p_axis = X_AXIS; q_axis = Y_AXIS; l_axis = Z_AXIS; break;
+      case GcodeSuite::PLANE_YZ: p_axis = Y_AXIS; q_axis = Z_AXIS; l_axis = X_AXIS; break;
+      case GcodeSuite::PLANE_ZX: p_axis = Z_AXIS; q_axis = X_AXIS; l_axis = Y_AXIS; break;
     }
   #else
-    constexpr AxisEnum axis_p = X_AXIS, axis_q = Y_AXIS OPTARG(HAS_Z_AXIS, axis_l = Z_AXIS);
+    constexpr AxisEnum p_axis = X_AXIS, q_axis = Y_AXIS OPTARG(HAS_Z_AXIS, l_axis = Z_AXIS);
   #endif
 
   // Radius vector from center to current location
   ab_float_t rvec = -offset;
 
   const float radius = HYPOT(rvec.a, rvec.b),
-              center_P = current_position[axis_p] - rvec.a,
-              center_Q = current_position[axis_q] - rvec.b,
-              rt_X = cart[axis_p] - center_P,
-              rt_Y = cart[axis_q] - center_Q;
+              center_P = current_position[p_axis] - rvec.a,
+              center_Q = current_position[q_axis] - rvec.b,
+              rt_X = cart[p_axis] - center_P,
+              rt_Y = cart[q_axis] - center_Q
+              OPTARG(HAS_Z_AXIS, start_L = current_position[l_axis]);
 
-  ARC_LIJK_CODE(
-    const float start_L = current_position[axis_l],
-    const float start_I = current_position.i,
-    const float start_J = current_position.j,
-    const float start_K = current_position.k
-  );
+  #ifdef MIN_ARC_SEGMENTS
+    uint16_t min_segments = MIN_ARC_SEGMENTS;
+  #else
+    constexpr uint16_t min_segments = 1;
+  #endif
 
   // Angle of rotation between position and target from the circle center.
   float angular_travel, abs_angular_travel;
 
-  // Minimum number of segments in an arc move
-  uint16_t min_segments = 1;
-
   // Do a full circle if starting and ending positions are "identical"
-  if (NEAR(current_position[axis_p], cart[axis_p]) && NEAR(current_position[axis_q], cart[axis_q])) {
+  if (NEAR(current_position[p_axis], cart[p_axis]) && NEAR(current_position[q_axis], cart[q_axis])) {
     // Preserve direction for circles
     angular_travel = clockwise ? -RADIANS(360) : RADIANS(360);
     abs_angular_travel = RADIANS(360);
-    min_segments = MIN_CIRCLE_SEGMENTS;
   }
   else {
     // Calculate the angle
@@ -117,90 +106,61 @@ void plan_arc(
 
     abs_angular_travel = ABS(angular_travel);
 
-    // Apply minimum segments to the arc
-    const float portion_of_circle = abs_angular_travel / RADIANS(360);  // Portion of a complete circle (0 < N < 1)
-    min_segments = CEIL((MIN_CIRCLE_SEGMENTS) * portion_of_circle);     // Minimum segments for the arc
+    #ifdef MIN_ARC_SEGMENTS
+      min_segments = CEIL(min_segments * abs_angular_travel / RADIANS(360));
+      NOLESS(min_segments, 1U);
+    #endif
   }
 
-  ARC_LIJKE_CODE(
-    float travel_L = cart[axis_l] - start_L,
-    float travel_I = cart.i       - start_I,
-    float travel_J = cart.j       - start_J,
-    float travel_K = cart.k       - start_K,
-    float travel_E = cart.e       - current_position.e
-  );
+  #if HAS_Z_AXIS
+    float linear_travel = cart[l_axis] - start_L;
+  #endif
+  #if HAS_EXTRUDERS
+    float extruder_travel = cart.e - current_position.e;
+  #endif
 
-  // If "P" specified circles, call plan_arc recursively then continue with the rest of the arc
+  // If circling around...
   if (TERN0(ARC_P_CIRCLES, circles)) {
-    const float total_angular = abs_angular_travel + circles * RADIANS(360),    // Total rotation with all circles and remainder
-              part_per_circle = RADIANS(360) / total_angular;                   // Each circle's part of the total
+    const float total_angular = abs_angular_travel + circles * RADIANS(360),  // Total rotation with all circles and remainder
+              part_per_circle = RADIANS(360) / total_angular;             // Each circle's part of the total
 
-    ARC_LIJKE_CODE(
-      const float per_circle_L = travel_L * part_per_circle,    // L movement per circle
-      const float per_circle_I = travel_I * part_per_circle,
-      const float per_circle_J = travel_J * part_per_circle,
-      const float per_circle_K = travel_K * part_per_circle,
-      const float per_circle_E = travel_E * part_per_circle     // E movement per circle
-    );
+    #if HAS_Z_AXIS
+      const float l_per_circle = linear_travel * part_per_circle;         // L movement per circle
+    #endif
+    #if HAS_EXTRUDERS
+      const float e_per_circle = extruder_travel * part_per_circle;       // E movement per circle
+    #endif
 
-    xyze_pos_t temp_position = current_position;
+    xyze_pos_t temp_position = current_position;                          // for plan_arc to compare to current_position
     for (uint16_t n = circles; n--;) {
-      ARC_LIJKE_CODE(                                           // Destination Linear Axes
-        temp_position[axis_l] += per_circle_L,
-        temp_position.i       += per_circle_I,
-        temp_position.j       += per_circle_J,
-        temp_position.k       += per_circle_K,
-        temp_position.e       += per_circle_E                   // Destination E axis
-      );
-      plan_arc(temp_position, offset, clockwise, 0);            // Plan a single whole circle
+      TERN_(HAS_EXTRUDERS, temp_position.e += e_per_circle);              // Destination E axis
+      TERN_(HAS_Z_AXIS, temp_position[l_axis] += l_per_circle);           // Destination L axis
+      plan_arc(temp_position, offset, clockwise, 0);                      // Plan a single whole circle
     }
-    ARC_LIJKE_CODE(
-      travel_L = cart[axis_l] - current_position[axis_l],
-      travel_I = cart.i       - current_position.i,
-      travel_J = cart.j       - current_position.j,
-      travel_K = cart.k       - current_position.k,
-      travel_E = cart.e       - current_position.e
-    );
+    TERN_(HAS_Z_AXIS, linear_travel = cart[l_axis] - current_position[l_axis]);
+    TERN_(HAS_EXTRUDERS, extruder_travel = cart.e - current_position.e);
   }
 
-  // Millimeters in the arc, assuming it's flat
-  const float flat_mm = radius * abs_angular_travel;
+  const float flat_mm = radius * abs_angular_travel,
+              mm_of_travel = TERN_(HAS_Z_AXIS, linear_travel ? HYPOT(flat_mm, linear_travel) :) flat_mm;
+  if (mm_of_travel < 0.001f) return;
 
-  // Return if the move is near zero
-  if (flat_mm < 0.0001f
-    GANG_N(SUB2(LINEAR_AXES),
-      && travel_L < 0.0001f,
-      && travel_I < 0.0001f,
-      && travel_J < 0.0001f,
-      && travel_K < 0.0001f
-    )
-  ) return;
-
-  // Feedrate for the move, scaled by the feedrate multiplier
   const feedRate_t scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
 
-  // Get the nominal segment length based on settings
-  const float nominal_segment_mm = (
-    #if ARC_SEGMENTS_PER_SEC  // Length based on segments per second and feedrate
-      constrain(scaled_fr_mm_s * RECIPROCAL(ARC_SEGMENTS_PER_SEC), MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM)
+  // Start with a nominal segment length
+  float seg_length = (
+    #ifdef ARC_SEGMENTS_PER_R
+      constrain(MM_PER_ARC_SEGMENT * radius, MM_PER_ARC_SEGMENT, ARC_SEGMENTS_PER_R)
+    #elif ARC_SEGMENTS_PER_SEC
+      _MAX(scaled_fr_mm_s * RECIPROCAL(ARC_SEGMENTS_PER_SEC), MM_PER_ARC_SEGMENT)
     #else
-      MAX_ARC_SEGMENT_MM      // Length using the maximum segment size
+      MM_PER_ARC_SEGMENT
     #endif
   );
-
-  // Number of whole segments based on the nominal segment length
-  const float nominal_segments = _MAX(FLOOR(flat_mm / nominal_segment_mm), min_segments);
-
-  // A new segment length based on the required minimum
-  const float segment_mm = constrain(flat_mm / nominal_segments, MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM);
-
-  // The number of whole segments in the arc, ignoring the remainder
-  uint16_t segments = FLOOR(flat_mm / segment_mm);
-
-  // Are the segments now too few to reach the destination?
-  const float segmented_length = segment_mm * segments;
-  const bool tooshort = segmented_length < flat_mm - 0.0001f;
-  const float proportion = tooshort ? segmented_length / flat_mm : 1.0f;
+  // Divide total travel by nominal segment length
+  uint16_t segments = FLOOR(mm_of_travel / seg_length);
+  NOLESS(segments, min_segments);         // At least some segments
+  seg_length = mm_of_travel / segments;
 
   /**
    * Vector rotation by transformation matrix: r is the original vector, r_T is the rotated vector,
@@ -217,7 +177,7 @@ void plan_arc(
    * tool precision in some cases. Therefore, arc path correction is implemented.
    *
    * Small angle approximation may be used to reduce computation overhead further. This approximation
-   * holds for everything, but very small circles and large MAX_ARC_SEGMENT_MM values. In other words,
+   * holds for everything, but very small circles and large MM_PER_ARC_SEGMENT values. In other words,
    * theta_per_segment would need to be greater than 0.1 rad and N_ARC_CORRECTION would need to be large
    * to cause an appreciable drift error. N_ARC_CORRECTION~=25 is more than small enough to correct for
    * numerical drift error. N_ARC_CORRECTION may be on the order a hundred(s) before error becomes an
@@ -230,36 +190,26 @@ void plan_arc(
    */
   // Vector rotation matrix values
   xyze_pos_t raw;
-  const float theta_per_segment = proportion * angular_travel / segments,
+  const float theta_per_segment = angular_travel / segments,
               sq_theta_per_segment = sq(theta_per_segment),
               sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6,
               cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
 
-  #if DISABLED(AUTO_BED_LEVELING_UBL)
-    ARC_LIJK_CODE(
-      const float per_segment_L = proportion * travel_L / segments,
-      const float per_segment_I = proportion * travel_I / segments,
-      const float per_segment_J = proportion * travel_J / segments,
-      const float per_segment_K = proportion * travel_K / segments
-    );
+  #if HAS_Z_AXIS && DISABLED(AUTO_BED_LEVELING_UBL)
+    const float linear_per_segment = linear_travel / segments;
+  #endif
+  #if HAS_EXTRUDERS
+    const float extruder_per_segment = extruder_travel / segments;
   #endif
 
-  CODE_ITEM_E(const float extruder_per_segment = proportion * travel_E / segments);
+  // Initialize the linear axis
+  TERN_(HAS_Z_AXIS, raw[l_axis] = current_position[l_axis]);
 
-  // For shortened segments, run all but the remainder in the loop
-  if (tooshort) segments++;
-
-  // Initialize all linear axes and E
-  ARC_LIJKE_CODE(
-    raw[axis_l] = current_position[axis_l],
-    raw.i       = current_position.i,
-    raw.j       = current_position.j,
-    raw.k       = current_position.k,
-    raw.e       = current_position.e
-  );
+  // Initialize the extruder axis
+  TERN_(HAS_EXTRUDERS, raw.e = current_position.e);
 
   #if ENABLED(SCARA_FEEDRATE_SCALING)
-    const float inv_duration = scaled_fr_mm_s / segment_mm;
+    const float inv_duration = scaled_fr_mm_s / seg_length;
   #endif
 
   millis_t next_idle_ms = millis() + 200UL;
@@ -271,9 +221,8 @@ void plan_arc(
   for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
 
     thermalManager.manage_heater();
-    const millis_t ms = millis();
-    if (ELAPSED(ms, next_idle_ms)) {
-      next_idle_ms = ms + 200UL;
+    if (ELAPSED(millis(), next_idle_ms)) {
+      next_idle_ms = millis() + 200UL;
       idle();
     }
 
@@ -301,16 +250,13 @@ void plan_arc(
     }
 
     // Update raw location
-    raw[axis_p] = center_P + rvec.a;
-    raw[axis_q] = center_Q + rvec.b;
-    ARC_LIJKE_CODE(
-      #if ENABLED(AUTO_BED_LEVELING_UBL)
-        raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K
-      #else
-        raw[axis_l] += per_segment_L, raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K
-      #endif
-      , raw.e += extruder_per_segment
-    );
+    raw[p_axis] = center_P + rvec.a;
+    raw[q_axis] = center_Q + rvec.b;
+    #if HAS_Z_AXIS
+      raw[l_axis] = TERN(AUTO_BED_LEVELING_UBL, start_L, raw[l_axis] + linear_per_segment);
+    #endif
+
+    TERN_(HAS_EXTRUDERS, raw.e += extruder_per_segment);
 
     apply_motion_limits(raw);
 
@@ -318,15 +264,14 @@ void plan_arc(
       planner.apply_leveling(raw);
     #endif
 
-    if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)))
-      break;
+    if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
+      OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
+    )) break;
   }
 
   // Ensure last segment arrives at target location.
   raw = cart;
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    ARC_LIJK_CODE(raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K);
-  #endif
+  TERN_(AUTO_BED_LEVELING_UBL, TERN_(HAS_Z_AXIS, raw[l_axis] = start_L));
 
   apply_motion_limits(raw);
 
@@ -334,11 +279,11 @@ void plan_arc(
     planner.apply_leveling(raw);
   #endif
 
-  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
+  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
+    OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
+  );
 
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    ARC_LIJK_CODE(raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K);
-  #endif
+  TERN_(AUTO_BED_LEVELING_UBL, TERN_(HAS_Z_AXIS, raw[l_axis] = start_L));
   current_position = raw;
 
 } // plan_arc
@@ -380,7 +325,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
       relative_mode = true;
     #endif
 
-    get_destination_from_command();   // Get X Y [Z[I[J[K]]]] [E] F (and set cutter power)
+    get_destination_from_command();   // Get X Y Z E F (and set cutter power)
 
     TERN_(SF_ARC_FIX, relative_mode = relative_mode_backup);
 
diff --git a/Marlin/src/gcode/motion/G6.cpp b/Marlin/src/gcode/motion/G6.cpp
index a57a293..168dc28 100644
--- a/Marlin/src/gcode/motion/G6.cpp
+++ b/Marlin/src/gcode/motion/G6.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(DIRECT_STEPPING)
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 747ddd6..2b57a6b 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -91,12 +91,12 @@ void GcodeSuite::M290() {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-      SERIAL_ECHOLNPGM(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
+      SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
     #endif
 
     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
     {
-      SERIAL_ECHOLNPGM_P(
+      SERIAL_ECHOLNPAIR_P(
         PSTR("Hotend "), active_extruder
         #if ENABLED(BABYSTEP_XY)
           , PSTR("Offset X"), hotend_offset[active_extruder].x
@@ -111,12 +111,12 @@ void GcodeSuite::M290() {
     #endif
 
     #if ENABLED(MESH_BED_LEVELING)
-      SERIAL_ECHOLNPGM("MBL Adjust Z", mbl.z_offset);
+      SERIAL_ECHOLNPAIR("MBL Adjust Z", mbl.z_offset);
     #endif
 
     #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
     {
-      SERIAL_ECHOLNPGM_P(
+      SERIAL_ECHOLNPAIR_P(
         #if ENABLED(BABYSTEP_XY)
             PSTR("Babystep X"), babystep.axis_total[X_AXIS]
           , SP_Y_STR, babystep.axis_total[Y_AXIS]
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 4d4fdae..e4e2973 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -333,7 +333,7 @@ void GCodeParser::parse(char *p) {
 
       #if ENABLED(DEBUG_GCODE_PARSER)
         if (debug) {
-          SERIAL_ECHOPGM("Got param ", AS_CHAR(param), " at index ", p - command_ptr - 1);
+          SERIAL_ECHOPAIR("Got param ", AS_CHAR(param), " at index ", p - command_ptr - 1);
           if (has_val) SERIAL_ECHOPGM(" (has_val)");
         }
       #endif
@@ -341,7 +341,7 @@ void GCodeParser::parse(char *p) {
       if (!has_val && !string_arg) {            // No value? First time, keep as string_arg
         string_arg = p - 1;
         #if ENABLED(DEBUG_GCODE_PARSER)
-          if (debug) SERIAL_ECHOPGM(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
+          if (debug) SERIAL_ECHOPAIR(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
         #endif
       }
 
@@ -352,7 +352,7 @@ void GCodeParser::parse(char *p) {
     else if (!string_arg) {                     // Not A-Z? First time, keep as the string_arg
       string_arg = p - 1;
       #if ENABLED(DEBUG_GCODE_PARSER)
-        if (debug) SERIAL_ECHOPGM(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
+        if (debug) SERIAL_ECHOPAIR(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
       #endif
     }
 
@@ -390,7 +390,7 @@ void GCodeParser::unknown_command_warning() {
 #if ENABLED(DEBUG_GCODE_PARSER)
 
   void GCodeParser::debug() {
-    SERIAL_ECHOPGM("Command: ", command_ptr, " (", command_letter);
+    SERIAL_ECHOPAIR("Command: ", command_ptr, " (", command_letter);
     SERIAL_ECHO(codenum);
     SERIAL_ECHOLNPGM(")");
     #if ENABLED(FASTER_GCODE_PARSER)
@@ -398,18 +398,18 @@ void GCodeParser::unknown_command_warning() {
       for (char c = 'A'; c <= 'Z'; ++c) if (seen(c)) SERIAL_CHAR(c, ' ');
       SERIAL_CHAR('}');
     #else
-      SERIAL_ECHOPGM(" args: { ", command_args, " }");
+      SERIAL_ECHOPAIR(" args: { ", command_args, " }");
     #endif
     if (string_arg) {
-      SERIAL_ECHOPGM(" string: \"", string_arg);
+      SERIAL_ECHOPAIR(" string: \"", string_arg);
       SERIAL_CHAR('"');
     }
     SERIAL_ECHOLNPGM("\n");
     for (char c = 'A'; c <= 'Z'; ++c) {
       if (seen(c)) {
-        SERIAL_ECHOPGM("Code '", c); SERIAL_ECHOPGM("':");
+        SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':");
         if (has_value()) {
-          SERIAL_ECHOLNPGM(
+          SERIAL_ECHOLNPAIR(
             "\n    float: ", value_float(),
             "\n     long: ", value_long(),
             "\n    ulong: ", value_ulong(),
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index ad55076..08cf100 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -133,9 +133,9 @@ public:
       param[ind] = ptr ? ptr - command_ptr : 0;  // parameter offset or 0
       #if ENABLED(DEBUG_GCODE_PARSER)
         if (codenum == 800) {
-          SERIAL_ECHOPGM("Set bit ", ind, " of codebits (", hex_address((void*)(codebits >> 16)));
+          SERIAL_ECHOPAIR("Set bit ", ind, " of codebits (", hex_address((void*)(codebits >> 16)));
           print_hex_word((uint16_t)(codebits & 0xFFFF));
-          SERIAL_ECHOLNPGM(") | param = ", param[ind]);
+          SERIAL_ECHOLNPAIR(") | param = ", param[ind]);
         }
       #endif
     }
@@ -225,7 +225,9 @@ public:
   #endif // !FASTER_GCODE_PARSER
 
   // Seen any axis parameter
-  static inline bool seen_axis() { return seen(LOGICAL_AXES_STRING); }
+  static inline bool seen_axis() {
+    return seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR));
+  }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)
     static char* unescape_string(char* &src);
@@ -348,15 +350,14 @@ public:
 
     static inline void set_input_temp_units(const TempUnit units) { input_temp_units = units; }
 
-    static inline char temp_units_code() {
-      return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C';
-    }
-    static inline PGM_P temp_units_name() {
-      return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius");
-    }
-
     #if HAS_LCD_MENU && DISABLED(DISABLE_M503)
 
+      static inline char temp_units_code() {
+        return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C';
+      }
+      static inline PGM_P temp_units_name() {
+        return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius");
+      }
       static inline float to_temp_units(celsius_t c) {
         switch (input_temp_units) {
           default:
@@ -415,8 +416,7 @@ public:
   static inline float     linearval(const char c, const float dval=0)    { return seenval(c) ? value_linear_units() : dval; }
   static inline float     axisunitsval(const char c, const AxisEnum a, const float dval=0)
                                                                          { return seenval(c) ? value_axis_units(a)  : dval; }
-  static inline celsius_t celsiusval(const char c, const celsius_t dval=0)    { return seenval(c) ? value_celsius() : dval; }
-  static inline feedRate_t feedrateval(const char c, const feedRate_t dval=0) { return seenval(c) ? value_feedrate() : dval; }
+  static inline celsius_t celsiusval(const char c, const float dval=0)   { return seenval(c) ? value_celsius()      : dval; }
 
   #if ENABLED(MARLIN_DEV_MODE)
 
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index f4152c7..4347f55 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -53,7 +53,7 @@ void GcodeSuite::G30() {
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
   const float measured_z = probe.probe_at_point(pos, raise_after, 1);
   if (!isnan(measured_z))
-    SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
+    SERIAL_ECHOLNPAIR("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
 
   restore_feedrate_and_scaling();
 
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index 5518117..ee62449 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -32,8 +32,19 @@
  * M851: Set the nozzle-to-probe offsets in current units
  */
 void GcodeSuite::M851() {
-  // No parameters? Show current state.
-  if (!parser.seen("XYZ")) return M851_report();
+
+  // Show usage with no parameters
+  if (!parser.seen("XYZ")) {
+    SERIAL_ECHOLNPAIR_P(
+      #if HAS_PROBE_XY_OFFSET
+        PSTR(STR_PROBE_OFFSET " X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR
+      #else
+        PSTR(STR_PROBE_OFFSET " X0 Y0 Z")
+      #endif
+      , probe.offset.z
+    );
+    return;
+  }
 
   // Start with current offsets and modify
   xyz_pos_t offs = probe.offset;
@@ -47,11 +58,11 @@ void GcodeSuite::M851() {
       if (WITHIN(x, -(X_BED_SIZE), X_BED_SIZE))
         offs.x = x;
       else {
-        SERIAL_ECHOLNPGM("?X out of range (-", X_BED_SIZE, " to ", X_BED_SIZE, ")");
+        SERIAL_ECHOLNPAIR("?X out of range (-", X_BED_SIZE, " to ", X_BED_SIZE, ")");
         ok = false;
       }
     #else
-      if (x) SERIAL_ECHOLNPGM("?X must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
+      if (x) SERIAL_ECHOLNPAIR("?X must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
     #endif
   }
 
@@ -61,11 +72,11 @@ void GcodeSuite::M851() {
       if (WITHIN(y, -(Y_BED_SIZE), Y_BED_SIZE))
         offs.y = y;
       else {
-        SERIAL_ECHOLNPGM("?Y out of range (-", Y_BED_SIZE, " to ", Y_BED_SIZE, ")");
+        SERIAL_ECHOLNPAIR("?Y out of range (-", Y_BED_SIZE, " to ", Y_BED_SIZE, ")");
         ok = false;
       }
     #else
-      if (y) SERIAL_ECHOLNPGM("?Y must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
+      if (y) SERIAL_ECHOLNPAIR("?Y must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
     #endif
   }
 
@@ -74,7 +85,7 @@ void GcodeSuite::M851() {
     if (WITHIN(z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX))
       offs.z = z;
     else {
-      SERIAL_ECHOLNPGM("?Z out of range (", Z_PROBE_OFFSET_RANGE_MIN, " to ", Z_PROBE_OFFSET_RANGE_MAX, ")");
+      SERIAL_ECHOLNPAIR("?Z out of range (", Z_PROBE_OFFSET_RANGE_MIN, " to ", Z_PROBE_OFFSET_RANGE_MAX, ")");
       ok = false;
     }
   }
@@ -83,20 +94,4 @@ void GcodeSuite::M851() {
   if (ok) probe.offset = offs;
 }
 
-void GcodeSuite::M851_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_Z_PROBE_OFFSET));
-  SERIAL_ECHOPGM_P(
-    #if HAS_PROBE_XY_OFFSET
-      PSTR("  M851 X"), LINEAR_UNIT(probe.offset_xy.x),
-              SP_Y_STR, LINEAR_UNIT(probe.offset_xy.y),
-              SP_Z_STR
-    #else
-      PSTR("  M851 X0 Y0 Z")
-    #endif
-    , LINEAR_UNIT(probe.offset.z)
-    , " ;"
-  );
-  say_units();
-}
-
 #endif // HAS_BED_PROBE
diff --git a/Marlin/src/gcode/probe/M951.cpp b/Marlin/src/gcode/probe/M951.cpp
index c6a9cfb..f461fc2 100644
--- a/Marlin/src/gcode/probe/M951.cpp
+++ b/Marlin/src/gcode/probe/M951.cpp
@@ -32,13 +32,13 @@ mpe_settings_t mpe_settings;
 
 inline void mpe_settings_report() {
   SERIAL_ECHO_MSG("Magnetic Parking Extruder");
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("L: Left parking  :", mpe_settings.parking_xpos[0]);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("R: Right parking :", mpe_settings.parking_xpos[1]);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("I: Grab Offset   :", mpe_settings.grab_distance);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("D: Distance trav.:", mpe_settings.travel_distance);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("C: Compenstion   :", mpe_settings.compensation_factor);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("L: Left parking  :", mpe_settings.parking_xpos[0]);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("R: Right parking :", mpe_settings.parking_xpos[1]);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("I: Grab Offset   :", mpe_settings.grab_distance);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("D: Distance trav.:", mpe_settings.travel_distance);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("C: Compenstion   :", mpe_settings.compensation_factor);
 }
 
 void mpe_settings_init() {
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 07d7c53..09755fb 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -67,23 +67,6 @@ GCodeQueue::RingBuffer GCodeQueue::ring_buffer = { 0 };
   static millis_t last_command_time = 0;
 #endif
 
-/**
- * Track buffer underruns
- */
-#if ENABLED(BUFFER_MONITORING)
-  uint32_t GCodeQueue::command_buffer_underruns = 0,
-           GCodeQueue::planner_buffer_underruns = 0;
-  bool GCodeQueue::command_buffer_empty = false,
-       GCodeQueue::planner_buffer_empty = false;
-  millis_t GCodeQueue::max_command_buffer_empty_duration = 0,
-           GCodeQueue::max_planner_buffer_empty_duration = 0,
-           GCodeQueue::command_buffer_empty_at = 0,
-           GCodeQueue::planner_buffer_empty_at = 0;
-
-  uint8_t GCodeQueue::auto_buffer_report_interval;
-  millis_t GCodeQueue::next_buffer_report_ms;
-#endif
-
 /**
  * Serial command injection
  */
@@ -99,6 +82,7 @@ PGM_P GCodeQueue::injected_commands_P; // = nullptr
  */
 char GCodeQueue::injected_commands[64]; // = { 0 }
 
+
 void GCodeQueue::RingBuffer::commit_command(bool skip_ok
   OPTARG(HAS_MULTI_SERIAL, serial_index_t serial_ind/*=-1*/)
 ) {
@@ -118,7 +102,11 @@ bool GCodeQueue::RingBuffer::enqueue(const char *cmd, bool skip_ok/*=true*/
 ) {
   if (*cmd == ';' || length >= BUFSIZE) return false;
   strcpy(commands[index_w].buffer, cmd);
-  commit_command(skip_ok OPTARG(HAS_MULTI_SERIAL, serial_ind));
+  commit_command(skip_ok
+    #if HAS_MULTI_SERIAL
+      , serial_ind
+    #endif
+  );
   return true;
 }
 
@@ -127,7 +115,7 @@ bool GCodeQueue::RingBuffer::enqueue(const char *cmd, bool skip_ok/*=true*/
  * Return true if the command was consumed
  */
 bool GCodeQueue::enqueue_one(const char *cmd) {
-  //SERIAL_ECHOLNPGM("enqueue_one(\"", cmd, "\")");
+  //SERIAL_ECHOLNPAIR("enqueue_one(\"", cmd, "\")");
 
   if (*cmd == 0 || ISEOL(*cmd)) return true;
 
@@ -260,7 +248,7 @@ void GCodeQueue::RingBuffer::ok_to_send() {
       while (NUMERIC_SIGNED(*p))
         SERIAL_CHAR(*p++);
     }
-    SERIAL_ECHOPGM_P(SP_P_STR, planner.moves_free(),
+    SERIAL_ECHOPAIR_P(SP_P_STR, planner.moves_free(),
                       SP_B_STR, BUFSIZE - length);
   #endif
   SERIAL_EOL();
@@ -276,7 +264,7 @@ void GCodeQueue::flush_and_request_resend(const serial_index_t serial_ind) {
     PORT_REDIRECT(SERIAL_PORTMASK(serial_ind));   // Reply to the serial port that sent the command
   #endif
   SERIAL_FLUSH();
-  SERIAL_ECHOLNPGM(STR_RESEND, serial_state[serial_ind.index].last_N + 1);
+  SERIAL_ECHOLNPAIR(STR_RESEND, serial_state[serial_ind.index].last_N + 1);
   SERIAL_ECHOLNPGM(STR_OK);
 }
 
@@ -306,7 +294,7 @@ inline int read_serial(const serial_index_t index) { return SERIAL_IMPL.read(ind
 void GCodeQueue::gcode_line_error(PGM_P const err, const serial_index_t serial_ind) {
   PORT_REDIRECT(SERIAL_PORTMASK(serial_ind)); // Reply to the serial port that sent the command
   SERIAL_ERROR_START();
-  SERIAL_ECHOLNPGM_P(err, serial_state[serial_ind.index].last_N);
+  SERIAL_ECHOLNPAIR_P(err, serial_state[serial_ind.index].last_N);
   while (read_serial(serial_ind) != -1) { /* nada */ } // Clear out the RX buffer. Why don't use flush here ?
   flush_and_request_resend(serial_ind);
   serial_state[serial_ind.index].count = 0;
@@ -534,7 +522,11 @@ void GCodeQueue::get_serial_commands() {
         #endif
 
         // Add the command to the queue
-        ring_buffer.enqueue(serial.line_buffer, false OPTARG(HAS_MULTI_SERIAL, p));
+        ring_buffer.enqueue(serial.line_buffer, false
+          #if HAS_MULTI_SERIAL
+            , p
+          #endif
+        );
       }
       else
         process_stream_char(serial_char, serial.input_state, serial.line_buffer, serial.count);
@@ -629,24 +621,7 @@ void GCodeQueue::advance() {
   if (process_injected_command_P() || process_injected_command()) return;
 
   // Return if the G-code buffer is empty
-  if (ring_buffer.empty()) {
-    #if ENABLED(BUFFER_MONITORING)
-      if (!command_buffer_empty) {
-        command_buffer_empty = true;
-        command_buffer_underruns++;
-        command_buffer_empty_at = millis();
-      }
-    #endif
-    return;
-  }
-
-  #if ENABLED(BUFFER_MONITORING)
-    if (command_buffer_empty) {
-      command_buffer_empty = false;
-      const millis_t command_buffer_empty_duration = millis() - command_buffer_empty_at;
-      NOLESS(max_command_buffer_empty_duration, command_buffer_empty_duration);
-    }
-  #endif
+  if (ring_buffer.empty()) return;
 
   #if ENABLED(SDSUPPORT)
 
@@ -659,10 +634,10 @@ void GCodeQueue::advance() {
 
         #if !defined(__AVR__) || !defined(USBCON)
           #if ENABLED(SERIAL_STATS_DROPPED_RX)
-            SERIAL_ECHOLNPGM("Dropped bytes: ", MYSERIAL1.dropped());
+            SERIAL_ECHOLNPAIR("Dropped bytes: ", MYSERIAL1.dropped());
           #endif
           #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
-            SERIAL_ECHOLNPGM("Max RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
+            SERIAL_ECHOLNPAIR("Max RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
           #endif
         #endif
 
@@ -689,41 +664,3 @@ void GCodeQueue::advance() {
   // The queue may be reset by a command handler or by code invoked by idle() within a handler
   ring_buffer.advance_pos(ring_buffer.index_r, -1);
 }
-
-#if ENABLED(BUFFER_MONITORING)
-
-  void GCodeQueue::report_buffer_statistics() {
-    SERIAL_ECHOLNPGM("D576"
-      " P:", planner.moves_free(),         " ", -queue.planner_buffer_underruns, " (", queue.max_planner_buffer_empty_duration, ")"
-      " B:", BUFSIZE - ring_buffer.length, " ", -queue.command_buffer_underruns, " (", queue.max_command_buffer_empty_duration, ")"
-    );
-    command_buffer_underruns = planner_buffer_underruns = 0;
-    max_command_buffer_empty_duration = max_planner_buffer_empty_duration = 0;
-  }
-
-  void GCodeQueue::auto_report_buffer_statistics() {
-    // Bit of a hack to try to catch planner buffer underruns without having logic
-    // running inside Stepper::block_phase_isr
-    const millis_t ms = millis();
-    if (planner.movesplanned() == 0) {
-      if (!planner_buffer_empty) { // the planner buffer wasn't empty, but now it is
-        planner_buffer_empty = true;
-        planner_buffer_underruns++;
-        planner_buffer_empty_at = ms;
-      }
-    }
-    else if (planner_buffer_empty) { // the planner buffer was empty, but now it's not
-      planner_buffer_empty = false;
-      const millis_t planner_buffer_empty_duration = ms - planner_buffer_empty_at;
-      NOLESS(max_planner_buffer_empty_duration, planner_buffer_empty_duration); // if it's longer than the currently tracked max duration, replace it
-    }
-
-    if (queue.auto_buffer_report_interval && ELAPSED(ms, queue.next_buffer_report_ms)) {
-      queue.next_buffer_report_ms = ms + 1000UL * queue.auto_buffer_report_interval;
-      PORT_REDIRECT(SERIAL_BOTH);
-      report_buffer_statistics();
-      PORT_RESTORE();
-    }
-  }
-
-#endif // BUFFER_MONITORING
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 6bcf4a9..3474a40 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -197,46 +197,6 @@ public:
    */
   static inline void set_current_line_number(long n) { serial_state[ring_buffer.command_port().index].last_N = n; }
 
-  #if ENABLED(BUFFER_MONITORING)
-
-    private:
-
-    /**
-     * Track buffer underruns
-     */
-    static uint32_t command_buffer_underruns, planner_buffer_underruns;
-    static bool command_buffer_empty, planner_buffer_empty;
-    static millis_t max_command_buffer_empty_duration, max_planner_buffer_empty_duration,
-                    command_buffer_empty_at, planner_buffer_empty_at;
-
-    /**
-     * Report buffer statistics to the host to be able to detect buffer underruns
-     *
-     * Returns "D576 " followed by:
-     *  P<uint>   Planner space remaining
-     *  B<uint>   Command buffer space remaining
-     *  PU<uint>  Number of planner buffer underruns since last report
-     *  PD<uint>  Max time in ms the planner buffer was empty since last report
-     *  BU<uint>  Number of command buffer underruns since last report
-     *  BD<uint>  Max time in ms the command buffer was empty since last report
-     */
-    static void report_buffer_statistics();
-
-    static uint8_t auto_buffer_report_interval;
-    static millis_t next_buffer_report_ms;
-
-    public:
-
-    static void auto_report_buffer_statistics();
-
-    static inline void set_auto_report_interval(uint8_t v) {
-      NOMORE(v, 60);
-      auto_buffer_report_interval = v;
-      next_buffer_report_ms = millis() + 1000UL * v;
-    }
-
-  #endif // BUFFER_MONITORING
-
 private:
 
   static void get_serial_commands();
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index f5ee6a9..cd4933f 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -48,8 +48,6 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if ENABLED(HOST_ACTION_COMMANDS)
@@ -97,7 +95,7 @@ void GcodeSuite::M1001() {
       printerEventLEDs.onPrintCompleted();
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE)));
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR));
-      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
+      wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30)));
       printerEventLEDs.onResumeAfterWait();
     }
   #endif
@@ -108,7 +106,6 @@ void GcodeSuite::M1001() {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished());
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
 
   // Re-select the last printed file in the UI
   TERN_(SD_REPRINT_LAST_SELECTED_FILE, ui.reselect_last_file());
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index b554099..568d9b0 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -23,25 +23,14 @@
 #include "../gcode.h"
 #include "../../module/printcounter.h"
 #include "../../lcd/marlinui.h"
-#if ENABLED(HOST_PAUSE_M76)
-  #include "../../feature/host_actions.h"
-#endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
-#endif
-
 /**
  * M75: Start print timer
  */
 void GcodeSuite::M75() {
   startOrResumeJob();
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-    DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
-    DWIN_Print_Started(false);
-  #endif
 }
 
 /**
@@ -49,7 +38,6 @@ void GcodeSuite::M75() {
  */
 void GcodeSuite::M76() {
   print_job_timer.pause();
-  TERN_(HOST_PAUSE_M76, host_action_pause());
 }
 
 /**
@@ -57,30 +45,29 @@ void GcodeSuite::M76() {
  */
 void GcodeSuite::M77() {
   print_job_timer.stop();
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
 }
 
 #if ENABLED(PRINTCOUNTER)
 
-  /**
-   * M78: Show print statistics
-   */
-  void GcodeSuite::M78() {
-    if (parser.intval('S') == 78) {  // "M78 S78" will reset the statistics
-      print_job_timer.initStats();
+/**
+ * M78: Show print statistics
+ */
+void GcodeSuite::M78() {
+  if (parser.intval('S') == 78) {  // "M78 S78" will reset the statistics
+    print_job_timer.initStats();
+    ui.reset_status();
+    return;
+  }
+
+  #if HAS_SERVICE_INTERVALS
+    if (parser.seenval('R')) {
+      print_job_timer.resetServiceInterval(parser.value_int());
       ui.reset_status();
       return;
     }
+  #endif
 
-    #if HAS_SERVICE_INTERVALS
-      if (parser.seenval('R')) {
-        print_job_timer.resetServiceInterval(parser.value_int());
-        ui.reset_status();
-        return;
-      }
-    #endif
-
-    print_job_timer.showStats();
-  }
+  print_job_timer.showStats();
+}
 
 #endif // PRINTCOUNTER
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index 0d0ce47..ad3afe6 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -30,8 +30,6 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 /**
@@ -73,7 +71,6 @@ void GcodeSuite::M303() {
     default:
       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
       return;
   }
 
diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index 20b3781..5d9f832 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -33,13 +33,6 @@ void GcodeSuite::M149() {
        if (parser.seenval('C')) parser.set_input_temp_units(TEMPUNIT_C);
   else if (parser.seenval('K')) parser.set_input_temp_units(TEMPUNIT_K);
   else if (parser.seenval('F')) parser.set_input_temp_units(TEMPUNIT_F);
-  else M149_report();
-}
-
-void GcodeSuite::M149_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_TEMPERATURE_UNITS));
-  SERIAL_ECHOPGM("  M149 ", AS_CHAR(parser.temp_units_code()), " ; Units in ");
-  SERIAL_ECHOLNPGM_P(parser.temp_units_name());
 }
 
 #endif // TEMPERATURE_UNITS_SUPPORT
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 023bf46..137b9fc 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -237,18 +237,11 @@
 #elif ENABLED(CR10_STOCKDISPLAY)
 
   #define IS_RRD_FG_SC 1
-  #define LCD_ST7920_DELAY_1           125
-  #define LCD_ST7920_DELAY_2           125
-  #define LCD_ST7920_DELAY_3           125
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
 
-#elif EITHER(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
-
-  #define IS_RRD_FG_SC 1
-  #define LCD_ST7920_DELAY_1           150
-  #define LCD_ST7920_DELAY_2           150
-  #define LCD_ST7920_DELAY_3           150
-
-#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
+#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
 
   #define IS_RRD_FG_SC 1
 
@@ -478,11 +471,7 @@
 #endif
 
 // Aliases for LCD features
-#if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS)
-  #define HAS_DGUS_LCD_CLASSIC 1
-#endif
-
-#if ANY(HAS_DGUS_LCD_CLASSIC, DGUS_LCD_UI_RELOADED)
+#if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY,DGUS_LCD_UI_MKS)
   #define HAS_DGUS_LCD 1
 #endif
 
@@ -493,32 +482,22 @@
 #endif
 
 // Aliases for LCD features
-#if EITHER(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
-  #define HAS_DWIN_E3V2_BASIC 1
-#endif
-#if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
-  #define HAS_DWIN_E3V2 1
-#endif
-
 #if IS_ULTRA_LCD
   #define HAS_WIRED_LCD 1
   #if ENABLED(DOGLCD)
     #define HAS_MARLINUI_U8GLIB 1
   #elif IS_TFTGLCD_PANEL
     // Neither DOGM nor HD44780. Fully customized interface.
-  #elif IS_DWIN_MARLINUI
-    // Since HAS_MARLINUI_U8GLIB refers to U8G displays
-    // the DWIN display can define its own flags
-  #elif !HAS_GRAPHICAL_TFT
+  #elif DISABLED(HAS_GRAPHICAL_TFT)
     #define HAS_MARLINUI_HD44780 1
   #endif
 #endif
 
-#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
+#if EITHER(HAS_WIRED_LCD, EXTENSIBLE_UI)
   #define HAS_DISPLAY 1
 #endif
 
-#if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
+#if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD, GLOBAL_STATUS_MESSAGE)
   #define HAS_STATUS_MESSAGE 1
 #endif
 
@@ -931,10 +910,7 @@
   #if DISABLED(NOZZLE_AS_PROBE)
     #define HAS_PROBE_XY_OFFSET 1
   #endif
-  #if BOTH(DELTA, SENSORLESS_PROBING)
-    #define HAS_DELTA_SENSORLESS_PROBING 1
-  #endif
-  #if NONE(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, HAS_DELTA_SENSORLESS_PROBING)
+  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
     #define USES_Z_MIN_PROBE_PIN 1
   #endif
   #if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))
@@ -1111,7 +1087,7 @@
   #define HAS_ETHERNET 1
 #endif
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if ENABLED(DWIN_CREALITY_LCD)
   #define SERIAL_CATCHALL 0
   #ifndef LCD_SERIAL_PORT
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
@@ -1233,19 +1209,30 @@
  */
 #if ENABLED(MKS_TS35_V2_0)          // ST7796
   #define TFT_DEFAULT_DRIVER ST7796
-  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
   #define TFT_RES_480x320
   #define TFT_INTERFACE_SPI
-#elif EITHER(LERDGE_TFT35, ANET_ET5_TFT35) // ST7796
-  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
+#elif ENABLED(ANET_ET5_TFT35)       // ST7796
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
   #define TFT_RES_480x320
   #define TFT_INTERFACE_FSMC
-#elif ANY(ANET_ET4_TFT28, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32) // ST7789
+#elif ENABLED(ANET_ET4_TFT28)       // ST7789
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ANY(MKS_ROBIN_TFT35, TFT_TRONXY_X5SA, ANYCUBIC_TFT35) // ILI9488
-  #define TFT_DRIVER ILI9488
+#elif ENABLED(MKS_ROBIN_TFT24)      // ST7789
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
+  #define TFT_RES_320x240
+  #define TFT_INTERFACE_FSMC
+#elif ENABLED(MKS_ROBIN_TFT28)      // ST7789
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
+  #define TFT_RES_320x240
+  #define TFT_INTERFACE_FSMC
+#elif ENABLED(MKS_ROBIN_TFT32)      // ST7789
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
+  #define TFT_RES_320x240
+  #define TFT_INTERFACE_FSMC
+#elif ENABLED(MKS_ROBIN_TFT35)      // ILI9488
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_480x320
   #define TFT_INTERFACE_FSMC
@@ -1254,12 +1241,21 @@
   #define TFT_DEFAULT_ORIENTATION 0
   #define TFT_RES_480x272
   #define TFT_INTERFACE_FSMC
-#elif ANY(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)  // ILI9328 or R61505
+#elif ENABLED(MKS_ROBIN_TFT_V1_1R)  // ILI9328 or R61505
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
+  #define TFT_RES_320x240
+  #define TFT_INTERFACE_FSMC
+#elif EITHER(TFT_TRONXY_X5SA, ANYCUBIC_TFT35) // ILI9488
+  #define TFT_DRIVER ILI9488
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
+  #define TFT_RES_480x320
+  #define TFT_INTERFACE_FSMC
+#elif ENABLED(LONGER_LK_TFT28)
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
 #elif ENABLED(BIQU_BX_TFT70)        // RGB
-  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
   #define TFT_RES_1024x600
   #define TFT_INTERFACE_LTDC
   #if ENABLED(TOUCH_SCREEN)
@@ -1360,9 +1356,6 @@
 
 // This emulated DOGM has 'touch/xpt2046', not 'tft/xpt2046'
 #if ENABLED(TOUCH_SCREEN)
-  #if TOUCH_IDLE_SLEEP
-    #define HAS_TOUCH_SLEEP 1
-  #endif
   #if NONE(TFT_TOUCH_DEVICE_GT911, TFT_TOUCH_DEVICE_XPT2046)
     #define TFT_TOUCH_DEVICE_XPT2046          // ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
   #endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 94332c9..7fe0ee6 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -112,419 +112,17 @@
   #undef STEALTHCHOP_E
 #endif
 
-/**
- * Temperature Sensors; define what sensor(s) we have.
- */
-
-// Temperature sensor IDs
-#define HID_REDUNDANT -6
-#define HID_COOLER    -5
-#define HID_PROBE     -4
-#define HID_BOARD     -3
-#define HID_CHAMBER   -2
-#define HID_BED       -1
-#define HID_E0         0
-#define HID_E1         1
-#define HID_E2         2
-#define HID_E3         3
-#define HID_E4         4
-#define HID_E5         5
-#define HID_E6         6
-#define HID_E7         7
-
-#define ANY_TEMP_SENSOR_IS(n) (n == TEMP_SENSOR_0 || n == TEMP_SENSOR_1 || n == TEMP_SENSOR_2 || n == TEMP_SENSOR_3 \
-  || n == TEMP_SENSOR_4 || n == TEMP_SENSOR_5 || n == TEMP_SENSOR_6 || n == TEMP_SENSOR_7 \
-  || n == TEMP_SENSOR_BED \
-  || n == TEMP_SENSOR_PROBE \
-  || n == TEMP_SENSOR_CHAMBER \
-  || n == TEMP_SENSOR_COOLER \
-  || n == TEMP_SENSOR_REDUNDANT )
-#if ANY_TEMP_SENSOR_IS(1000)
-  #define HAS_USER_THERMISTORS 1
-#endif
-#undef ANY_TEMP_SENSOR_IS
-
-#if TEMP_SENSOR_REDUNDANT
-  #define _HEATER_ID(M) HID_##M
-  #define HEATER_ID(M)  _HEATER_ID(M)
-  #define REDUNDANT_TEMP_MATCH(M,N) (HEATER_ID(TEMP_SENSOR_REDUNDANT_##M) == _HEATER_ID(N))
-#else
-  #define REDUNDANT_TEMP_MATCH(...) 0
-#endif
-
-#if TEMP_SENSOR_0 == -5 || TEMP_SENSOR_0 == -3 || TEMP_SENSOR_0 == -2
-  #define TEMP_SENSOR_0_IS_MAX_TC 1
-  #if TEMP_SENSOR_0 == -5
-    #define TEMP_SENSOR_0_IS_MAX31865 1
-    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
-    #ifndef MAX31865_SENSOR_WIRES_0
-      #define MAX31865_SENSOR_WIRES_0 2
-    #endif
-  #elif TEMP_SENSOR_0 == -3
-    #define TEMP_SENSOR_0_IS_MAX31855 1
-    #define TEMP_SENSOR_0_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1800
-  #elif TEMP_SENSOR_0 == -2
-    #define TEMP_SENSOR_0_IS_MAX6675 1
-    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
-  #endif
-#elif TEMP_SENSOR_0 == -4
-  #define TEMP_SENSOR_0_IS_AD8495 1
-#elif TEMP_SENSOR_0 == -1
-  #define TEMP_SENSOR_0_IS_AD595 1
-#elif TEMP_SENSOR_0 > 0
-  #define TEMP_SENSOR_0_IS_THERMISTOR 1
-  #if TEMP_SENSOR_0 == 1000
-    #define TEMP_SENSOR_0_IS_CUSTOM 1
-  #elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
-    #define TEMP_SENSOR_0_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_0_MINTEMP
-  #undef HEATER_0_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_1 == -5 || TEMP_SENSOR_1 == -3 || TEMP_SENSOR_1 == -2
-  #define TEMP_SENSOR_1_IS_MAX_TC 1
-  #if TEMP_SENSOR_1 == -5
-    #define TEMP_SENSOR_1_IS_MAX31865 1
-    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
-    #ifndef MAX31865_SENSOR_WIRES_1
-      #define MAX31865_SENSOR_WIRES_1 2
-    #endif
-  #elif TEMP_SENSOR_1 == -3
-    #define TEMP_SENSOR_1_IS_MAX31855 1
-    #define TEMP_SENSOR_1_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_1_MAX_TC_TMAX 1800
-  #elif TEMP_SENSOR_1 == -2
-    #define TEMP_SENSOR_1_IS_MAX6675 1
-    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
-  #endif
-
-  #if TEMP_SENSOR_1 != TEMP_SENSOR_0
-    #if   TEMP_SENSOR_1 == -5
-      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
-    #elif TEMP_SENSOR_1 == -3
-      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
-    #elif TEMP_SENSOR_1 == -2
-      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
-    #endif
-  #endif
-#elif TEMP_SENSOR_1 == -4
-  #define TEMP_SENSOR_1_IS_AD8495 1
-#elif TEMP_SENSOR_1 == -1
-  #define TEMP_SENSOR_1_IS_AD595 1
-#elif TEMP_SENSOR_1 > 0
-  #define TEMP_SENSOR_1_IS_THERMISTOR 1
-  #if TEMP_SENSOR_1 == 1000
-    #define TEMP_SENSOR_1_IS_CUSTOM 1
-  #elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
-    #define TEMP_SENSOR_1_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_1_MINTEMP
-  #undef HEATER_1_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_REDUNDANT == -5 || TEMP_SENSOR_REDUNDANT == -3 || TEMP_SENSOR_REDUNDANT == -2
-  #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
-
-  #if TEMP_SENSOR_REDUNDANT == -5
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
-    #endif
-
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX31865    1
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
-  #elif TEMP_SENSOR_REDUNDANT == -3
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
-    #endif
-
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX31855    1
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
-  #elif TEMP_SENSOR_REDUNDANT == -2
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
-    #endif
-
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX6675     1
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
-  #endif
-
-  // mimic setting up the source TEMP_SENSOR
-  #if REDUNDANT_TEMP_MATCH(SOURCE, E0)
-    #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
-    #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
-    #ifndef MAX31865_SENSOR_WIRES_0
-      #define MAX31865_SENSOR_WIRES_0 2
-    #endif
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
-    #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
-    #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
-    #ifndef MAX31865_SENSOR_WIRES_1
-      #define MAX31865_SENSOR_WIRES_1 2
-    #endif
-  #endif
-
-  #if (TEMP_SENSOR_0_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_1_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
-    #if   TEMP_SENSOR_REDUNDANT == -5
-      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
-    #elif TEMP_SENSOR_REDUNDANT == -3
-      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
-    #elif TEMP_SENSOR_REDUNDANT == -2
-      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
-    #endif
-  #endif
-#elif TEMP_SENSOR_REDUNDANT == -4
-  #define TEMP_SENSOR_REDUNDANT_IS_AD8495 1
-#elif TEMP_SENSOR_REDUNDANT == -1
-  #define TEMP_SENSOR_REDUNDANT_IS_AD595 1
-#elif TEMP_SENSOR_REDUNDANT > 0
-  #define TEMP_SENSOR_REDUNDANT_IS_THERMISTOR 1
-  #if TEMP_SENSOR_REDUNDANT == 1000
-    #define TEMP_SENSOR_REDUNDANT_IS_CUSTOM 1
-  #elif TEMP_SENSOR_REDUNDANT == 998 || TEMP_SENSOR_REDUNDANT == 999
-    #error "Dummy sensors are not supported for TEMP_SENSOR_REDUNDANT."
-  #endif
-#endif
-
-#if TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC
-  #define HAS_MAX_TC 1
-#endif
-#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
-  #define HAS_MAX6675 1
-#endif
-#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
-  #define HAS_MAX31855 1
-#endif
-#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
-  #define HAS_MAX31865 1
-#endif
-
-#if TEMP_SENSOR_2 == -4
-  #define TEMP_SENSOR_2_IS_AD8495 1
-#elif TEMP_SENSOR_2 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_2."
-#elif TEMP_SENSOR_2 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
-#elif TEMP_SENSOR_2 == -1
-  #define TEMP_SENSOR_2_IS_AD595 1
-#elif TEMP_SENSOR_2 > 0
-  #define TEMP_SENSOR_2_IS_THERMISTOR 1
-  #if TEMP_SENSOR_2 == 1000
-    #define TEMP_SENSOR_2_IS_CUSTOM 1
-  #elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
-    #define TEMP_SENSOR_2_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_2_MINTEMP
-  #undef HEATER_2_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_3 == -4
-  #define TEMP_SENSOR_3_IS_AD8495 1
-#elif TEMP_SENSOR_3 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_3."
-#elif TEMP_SENSOR_3 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
-#elif TEMP_SENSOR_3 == -1
-  #define TEMP_SENSOR_3_IS_AD595 1
-#elif TEMP_SENSOR_3 > 0
-  #define TEMP_SENSOR_3_IS_THERMISTOR 1
-  #if TEMP_SENSOR_3 == 1000
-    #define TEMP_SENSOR_3_IS_CUSTOM 1
-  #elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
-    #define TEMP_SENSOR_3_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_3_MINTEMP
-  #undef HEATER_3_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_4 == -4
-  #define TEMP_SENSOR_4_IS_AD8495 1
-#elif TEMP_SENSOR_4 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_4."
-#elif TEMP_SENSOR_4 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
-#elif TEMP_SENSOR_4 == -1
-  #define TEMP_SENSOR_4_IS_AD595 1
-#elif TEMP_SENSOR_4 > 0
-  #define TEMP_SENSOR_4_IS_THERMISTOR 1
-  #if TEMP_SENSOR_4 == 1000
-    #define TEMP_SENSOR_4_IS_CUSTOM 1
-  #elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
-    #define TEMP_SENSOR_4_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_4_MINTEMP
-  #undef HEATER_4_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_5 == -4
-  #define TEMP_SENSOR_5_IS_AD8495 1
-#elif TEMP_SENSOR_5 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_5."
-#elif TEMP_SENSOR_5 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
-#elif TEMP_SENSOR_5 == -1
-  #define TEMP_SENSOR_5_IS_AD595 1
-#elif TEMP_SENSOR_5 > 0
-  #define TEMP_SENSOR_5_IS_THERMISTOR 1
-  #if TEMP_SENSOR_5 == 1000
-    #define TEMP_SENSOR_5_IS_CUSTOM 1
-  #elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
-    #define TEMP_SENSOR_5_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_5_MINTEMP
-  #undef HEATER_5_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_6 == -4
-  #define TEMP_SENSOR_6_IS_AD8495 1
-#elif TEMP_SENSOR_6 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_6."
-#elif TEMP_SENSOR_6 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_6."
-#elif TEMP_SENSOR_6 == -1
-  #define TEMP_SENSOR_6_IS_AD595 1
-#elif TEMP_SENSOR_6 > 0
-  #define TEMP_SENSOR_6_IS_THERMISTOR 1
-  #if TEMP_SENSOR_6 == 1000
-    #define TEMP_SENSOR_6_IS_CUSTOM 1
-  #elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
-    #define TEMP_SENSOR_6_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_6_MINTEMP
-  #undef HEATER_6_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_7 == -4
-  #define TEMP_SENSOR_7_IS_AD8495 1
-#elif TEMP_SENSOR_7 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_7."
-#elif TEMP_SENSOR_7 == -2
-  #error "MAX7775 Thermocouples (-2) not supported for TEMP_SENSOR_7."
-#elif TEMP_SENSOR_7 == -1
-  #define TEMP_SENSOR_7_IS_AD595 1
-#elif TEMP_SENSOR_7 > 0
-  #define TEMP_SENSOR_7_IS_THERMISTOR 1
-  #if TEMP_SENSOR_7 == 1000
-    #define TEMP_SENSOR_7_IS_CUSTOM 1
-  #elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
-    #define TEMP_SENSOR_7_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_7_MINTEMP
-  #undef HEATER_7_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_BED == -4
-  #define TEMP_SENSOR_BED_IS_AD8495 1
-#elif TEMP_SENSOR_BED == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BED."
-#elif TEMP_SENSOR_BED == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
-#elif TEMP_SENSOR_BED == -1
-  #define TEMP_SENSOR_BED_IS_AD595 1
-#elif TEMP_SENSOR_BED > 0
-  #define TEMP_SENSOR_BED_IS_THERMISTOR 1
-  #if TEMP_SENSOR_BED == 1000
-    #define TEMP_SENSOR_BED_IS_CUSTOM 1
-  #elif TEMP_SENSOR_BED == 998 || TEMP_SENSOR_BED == 999
-    #define TEMP_SENSOR_BED_IS_DUMMY 1
-  #endif
-#else
+#if TEMP_SENSOR_BED == 0
   #undef THERMAL_PROTECTION_BED
   #undef THERMAL_PROTECTION_BED_PERIOD
-  #undef BED_MINTEMP
-  #undef BED_MAXTEMP
 #endif
 
-#if TEMP_SENSOR_CHAMBER == -4
-  #define TEMP_SENSOR_CHAMBER_IS_AD8495 1
-#elif TEMP_SENSOR_CHAMBER == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_CHAMBER."
-#elif TEMP_SENSOR_CHAMBER == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
-#elif TEMP_SENSOR_CHAMBER == -1
-  #define TEMP_SENSOR_CHAMBER_IS_AD595 1
-#elif TEMP_SENSOR_CHAMBER > 0
-  #define TEMP_SENSOR_CHAMBER_IS_THERMISTOR 1
-  #if TEMP_SENSOR_CHAMBER == 1000
-    #define TEMP_SENSOR_CHAMBER_IS_CUSTOM 1
-  #elif TEMP_SENSOR_CHAMBER == 998 || TEMP_SENSOR_CHAMBER == 999
-    #define TEMP_SENSOR_CHAMBER_IS_DUMMY 1
-  #endif
-#else
+#if TEMP_SENSOR_CHAMBER == 0
   #undef THERMAL_PROTECTION_CHAMBER
-  #undef CHAMBER_MINTEMP
-  #undef CHAMBER_MAXTEMP
 #endif
 
-#if TEMP_SENSOR_COOLER == -4
-  #define TEMP_SENSOR_COOLER_IS_AD8495 1
-#elif TEMP_SENSOR_COOLER == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_COOLER."
-#elif TEMP_SENSOR_COOLER == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_COOLER."
-#elif TEMP_SENSOR_COOLER == -1
-  #define TEMP_SENSOR_COOLER_IS_AD595 1
-#elif TEMP_SENSOR_COOLER > 0
-  #define TEMP_SENSOR_COOLER_IS_THERMISTOR 1
-  #if TEMP_SENSOR_COOLER == 1000
-    #define TEMP_SENSOR_COOLER_IS_CUSTOM 1
-  #elif TEMP_SENSOR_COOLER == 998 || TEMP_SENSOR_COOLER == 999
-    #define TEMP_SENSOR_COOLER_IS_DUMMY 1
-  #endif
-#else
+#if TEMP_SENSOR_COOLER == 0
   #undef THERMAL_PROTECTION_COOLER
-  #undef COOLER_MINTEMP
-  #undef COOLER_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_PROBE == -4
-  #define TEMP_SENSOR_PROBE_IS_AD8495 1
-#elif TEMP_SENSOR_PROBE == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_PROBE."
-#elif TEMP_SENSOR_PROBE == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_PROBE."
-#elif TEMP_SENSOR_PROBE == -1
-  #define TEMP_SENSOR_PROBE_IS_AD595 1
-#elif TEMP_SENSOR_PROBE > 0
-  #define TEMP_SENSOR_PROBE_IS_THERMISTOR 1
-  #if TEMP_SENSOR_PROBE == 1000
-    #define TEMP_SENSOR_PROBE_IS_CUSTOM 1
-  #elif TEMP_SENSOR_PROBE == 998 || TEMP_SENSOR_PROBE == 999
-    #define TEMP_SENSOR_PROBE_IS_DUMMY 1
-  #endif
-#endif
-
-#if TEMP_SENSOR_BOARD == -4
-  #define TEMP_SENSOR_BOARD_IS_AD8495 1
-#elif TEMP_SENSOR_BOARD == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BOARD."
-#elif TEMP_SENSOR_BOARD == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BOARD."
-#elif TEMP_SENSOR_BOARD == -1
-  #define TEMP_SENSOR_BOARD_IS_AD595 1
-#elif TEMP_SENSOR_BOARD > 0
-  #define TEMP_SENSOR_BOARD_IS_THERMISTOR 1
-  #if TEMP_SENSOR_BOARD == 1000
-    #define TEMP_SENSOR_BOARD_IS_CUSTOM 1
-  #elif TEMP_SENSOR_BOARD == 998 || TEMP_SENSOR_BOARD == 999
-    #define TEMP_SENSOR_BOARD_IS_DUMMY 1
-  #endif
 #endif
 
 #if ENABLED(MIXING_EXTRUDER) && (ENABLED(RETRACT_SYNC_MIXING) || BOTH(FILAMENT_LOAD_UNLOAD_GCODES, FILAMENT_UNLOAD_ALL_EXTRUDERS))
@@ -594,7 +192,7 @@
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
   #define HAS_SOFTWARE_ENDSTOPS 1
 #endif
-#if ANY(EXTENSIBLE_UI, IS_NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, HAS_DWIN_E3V2)
+#if ANY(EXTENSIBLE_UI, IS_NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, DWIN_CREALITY_LCD)
   #define HAS_RESUME_CONTINUE 1
 #endif
 
@@ -658,7 +256,7 @@
 #endif
 
 // Add features that need hardware PWM here
-#if ANY(FAST_PWM_FAN, SPINDLE_LASER_USE_PWM)
+#if ANY(FAST_PWM_FAN, SPINDLE_LASER_PWM)
   #define NEEDS_HARDWARE_PWM 1
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5c1aa53..2fb276b 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -421,11 +421,6 @@
   #endif
 #endif
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #define HAS_LCD_BRIGHTNESS 1
-  #define MAX_LCD_BRIGHTNESS 31
-#endif
-
 /**
  * Override the SD_DETECT_STATE set in Configuration_adv.h
  * and enable sharing of onboard SD host drives (all platforms but AGCM4)
@@ -466,7 +461,7 @@
 
 #endif
 
-#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI) || !PIN_EXISTS(SD_DETECT)
+#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
   #define NO_LCD_REINIT 1  // Suppress LCD re-initialization
 #endif
 
@@ -518,90 +513,103 @@
 #endif
 
 /**
- * Temp Sensor defines; set up pins as needed.
+ * Temp Sensor defines
  */
 
+#define ANY_TEMP_SENSOR_IS(n) ( \
+     n == TEMP_SENSOR_0 || n == TEMP_SENSOR_1 || n == TEMP_SENSOR_2 || n == TEMP_SENSOR_3 \
+  || n == TEMP_SENSOR_4 || n == TEMP_SENSOR_5 || n == TEMP_SENSOR_6 || n == TEMP_SENSOR_7 \
+  || n == TEMP_SENSOR_BED \
+  || n == TEMP_SENSOR_PROBE \
+  || n == TEMP_SENSOR_CHAMBER \
+  || n == TEMP_SENSOR_COOLER \
+  || n == TEMP_SENSOR_REDUNDANT )
+#if ANY_TEMP_SENSOR_IS(1000)
+  #define HAS_USER_THERMISTORS 1
+#endif
+#undef ANY_TEMP_SENSOR_IS
+
 // Usurp a sensor to do redundant readings
 #if TEMP_SENSOR_REDUNDANT
   #ifndef TEMP_SENSOR_REDUNDANT_SOURCE
-    #define TEMP_SENSOR_REDUNDANT_SOURCE E1
+    #define TEMP_SENSOR_REDUNDANT_SOURCE 1
   #endif
   #ifndef TEMP_SENSOR_REDUNDANT_TARGET
-    #define TEMP_SENSOR_REDUNDANT_TARGET E0
+    #define TEMP_SENSOR_REDUNDANT_TARGET 0
   #endif
   #if !PIN_EXISTS(TEMP_REDUNDANT)
     #ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
       #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
     #endif
-    #if REDUNDANT_TEMP_MATCH(SOURCE, COOLER)
+    #if TEMP_SENSOR_REDUNDANT_SOURCE == -5
       #if !PIN_EXISTS(TEMP_COOLER)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_COOLER_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4
       #if !PIN_EXISTS(TEMP_PROBE)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to PROBE requires TEMP_PROBE_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_PROBE_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, CHAMBER)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2
       #if !PIN_EXISTS(TEMP_CHAMBER)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to CHAMBER requires TEMP_CHAMBER_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_CHAMBER_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, BED)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1
       #if !PIN_EXISTS(TEMP_BED)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to BED requires TEMP_BED_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_BED_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E0)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 0
       #if !PIN_EXISTS(TEMP_0)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E0 requires TEMP_0_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 0 requires TEMP_0_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_0_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
       #if !PIN_EXISTS(TEMP_1)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E1 requires TEMP_1_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 1 requires TEMP_1_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_1_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E2)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 2
       #if !PIN_EXISTS(TEMP_2)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E2 requires TEMP_2_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 2 requires TEMP_2_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_2_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E3)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 3
       #if !PIN_EXISTS(TEMP_3)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E3 requires TEMP_3_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 3 requires TEMP_3_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_3_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E4)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 4
       #if !PIN_EXISTS(TEMP_4)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E4 requires TEMP_4_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 4 requires TEMP_4_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_4_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E5)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 5
       #if !PIN_EXISTS(TEMP_5)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E5 requires TEMP_5_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 5 requires TEMP_5_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_5_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E6)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 6
       #if !PIN_EXISTS(TEMP_6)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E6 requires TEMP_6_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 6 requires TEMP_6_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_6_PIN
       #endif
-    #elif REDUNDANT_TEMP_MATCH(SOURCE, E7)
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 7
       #if !PIN_EXISTS(TEMP_7)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E7 requires TEMP_7_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 7 requires TEMP_7_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_7_PIN
       #endif
@@ -609,13 +617,170 @@
   #endif
 #endif
 
-/**
- * Compatibility layer for MAX (SPI) temp boards
- */
+#if TEMP_SENSOR_0 == -5 || TEMP_SENSOR_0 == -3 || TEMP_SENSOR_0 == -2
+  #define TEMP_SENSOR_0_IS_MAX_TC 1
+  #if TEMP_SENSOR_0 == -5
+    #define TEMP_SENSOR_0_IS_MAX31865 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
+    #ifndef MAX31865_SENSOR_WIRES_0
+      #define MAX31865_SENSOR_WIRES_0 2
+    #endif
+  #elif TEMP_SENSOR_0 == -3
+    #define TEMP_SENSOR_0_IS_MAX31855 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1800
+  #elif TEMP_SENSOR_0 == -2
+    #define TEMP_SENSOR_0_IS_MAX6675 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
+  #endif
+#elif TEMP_SENSOR_0 == -4
+  #define TEMP_SENSOR_0_IS_AD8495 1
+#elif TEMP_SENSOR_0 == -1
+  #define TEMP_SENSOR_0_IS_AD595 1
+#elif TEMP_SENSOR_0 > 0
+  #define TEMP_SENSOR_0_IS_THERMISTOR 1
+  #if TEMP_SENSOR_0 == 1000
+    #define TEMP_SENSOR_0_IS_CUSTOM 1
+  #elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
+    #define TEMP_SENSOR_0_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_0_MINTEMP
+  #undef HEATER_0_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_1 == -5 || TEMP_SENSOR_1 == -3 || TEMP_SENSOR_1 == -2
+  #define TEMP_SENSOR_1_IS_MAX_TC 1
+  #if TEMP_SENSOR_1 == -5
+    #define TEMP_SENSOR_1_IS_MAX31865 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
+    #ifndef MAX31865_SENSOR_WIRES_1
+      #define MAX31865_SENSOR_WIRES_1 2
+    #endif
+  #elif TEMP_SENSOR_1 == -3
+    #define TEMP_SENSOR_1_IS_MAX31855 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_1_MAX_TC_TMAX 1800
+  #elif TEMP_SENSOR_1 == -2
+    #define TEMP_SENSOR_1_IS_MAX6675 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
+  #endif
+
+  #if TEMP_SENSOR_1 != TEMP_SENSOR_0
+    #if   TEMP_SENSOR_1 == -5
+      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
+    #elif TEMP_SENSOR_1 == -3
+      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
+    #elif TEMP_SENSOR_1 == -2
+      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
+    #endif
+  #endif
+#elif TEMP_SENSOR_1 == -4
+  #define TEMP_SENSOR_1_IS_AD8495 1
+#elif TEMP_SENSOR_1 == -1
+  #define TEMP_SENSOR_1_IS_AD595 1
+#elif TEMP_SENSOR_1 > 0
+  #define TEMP_SENSOR_1_IS_THERMISTOR 1
+  #if TEMP_SENSOR_1 == 1000
+    #define TEMP_SENSOR_1_IS_CUSTOM 1
+  #elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
+    #define TEMP_SENSOR_1_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_1_MINTEMP
+  #undef HEATER_1_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_REDUNDANT == -5 || TEMP_SENSOR_REDUNDANT == -3 || TEMP_SENSOR_REDUNDANT == -2
+  #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
+
+  #if TEMP_SENSOR_REDUNDANT == -5
+    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+      #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31865    1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
+  #elif TEMP_SENSOR_REDUNDANT == -3
+    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+      #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31855    1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
+  #elif TEMP_SENSOR_REDUNDANT == -2
+    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+      #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX6675     1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
+  #endif
+
+  // mimic setting up the source TEMP_SENSOR
+  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0
+    #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+    #ifndef MAX31865_SENSOR_WIRES_0
+      #define MAX31865_SENSOR_WIRES_0 2
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+    #ifndef MAX31865_SENSOR_WIRES_1
+      #define MAX31865_SENSOR_WIRES_1 2
+    #endif
+  #endif
+
+  #if (TEMP_SENSOR_0_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_1_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
+    #if   TEMP_SENSOR_REDUNDANT == -5
+      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #elif TEMP_SENSOR_REDUNDANT == -3
+      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #elif TEMP_SENSOR_REDUNDANT == -2
+      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #endif
+  #endif
+#elif TEMP_SENSOR_REDUNDANT == -4
+  #define TEMP_SENSOR_REDUNDANT_IS_AD8495 1
+#elif TEMP_SENSOR_REDUNDANT == -1
+  #define TEMP_SENSOR_REDUNDANT_IS_AD595 1
+#elif TEMP_SENSOR_REDUNDANT > 0
+  #define TEMP_SENSOR_REDUNDANT_IS_THERMISTOR 1
+  #if TEMP_SENSOR_REDUNDANT == 1000
+    #define TEMP_SENSOR_REDUNDANT_IS_CUSTOM 1
+  #elif TEMP_SENSOR_REDUNDANT == 998 || TEMP_SENSOR_REDUNDANT == 999
+    #error "Dummy sensors are not supported for TEMP_SENSOR_REDUNDANT."
+  #endif
+#endif
+
+#if TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+  #define HAS_MAX_TC 1
+#endif
+#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
+  #define HAS_MAX6675 1
+#endif
+#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
+  #define HAS_MAX31855 1
+#endif
+#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
+  #define HAS_MAX31865 1
+#endif
+
+//
+// Compatibility layer for MAX (SPI) temp boards
+//
 #if HAS_MAX_TC
 
   // Translate old _SS, _CS, _SCK, _DO, _DI, _MISO, and _MOSI PIN defines.
-  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
+  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
 
     #if !PIN_EXISTS(TEMP_0_CS) // SS, CS
       #if PIN_EXISTS(MAX6675_SS)
@@ -684,7 +849,7 @@
 
   #endif // TEMP_SENSOR_0_IS_MAX_TC
 
-  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
+  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
 
     #if !PIN_EXISTS(TEMP_1_CS) // SS2, CS2
       #if PIN_EXISTS(MAX6675_SS2)
@@ -760,19 +925,216 @@
   // to select a USER library for MAX6675, MAX31855, MAX31865
   //
   #if BOTH(HAS_MAX6675, LIB_MAX6675)
-    #define USE_LIB_MAX6675 1
+    #define LIB_USR_MAX6675 1
   #endif
   #if BOTH(HAS_MAX31855, LIB_MAX31855)
-    #define USE_ADAFRUIT_MAX31855 1
+    #define LIB_USR_MAX31855 1
   #endif
   #if BOTH(HAS_MAX31865, LIB_MAX31865)
-    #define USE_ADAFRUIT_MAX31865 1
+    #define LIB_USR_MAX31865 1
   #elif HAS_MAX31865
     #define LIB_INTERNAL_MAX31865 1
   #endif
 
 #endif //HAS_MAX_TC
 
+#if TEMP_SENSOR_2 == -4
+  #define TEMP_SENSOR_2_IS_AD8495 1
+#elif TEMP_SENSOR_2 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_2."
+#elif TEMP_SENSOR_2 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
+#elif TEMP_SENSOR_2 == -1
+  #define TEMP_SENSOR_2_IS_AD595 1
+#elif TEMP_SENSOR_2 > 0
+  #define TEMP_SENSOR_2_IS_THERMISTOR 1
+  #if TEMP_SENSOR_2 == 1000
+    #define TEMP_SENSOR_2_IS_CUSTOM 1
+  #elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
+    #define TEMP_SENSOR_2_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_2_MINTEMP
+  #undef HEATER_2_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_3 == -4
+  #define TEMP_SENSOR_3_IS_AD8495 1
+#elif TEMP_SENSOR_3 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_3."
+#elif TEMP_SENSOR_3 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
+#elif TEMP_SENSOR_3 == -1
+  #define TEMP_SENSOR_3_IS_AD595 1
+#elif TEMP_SENSOR_3 > 0
+  #define TEMP_SENSOR_3_IS_THERMISTOR 1
+  #if TEMP_SENSOR_3 == 1000
+    #define TEMP_SENSOR_3_IS_CUSTOM 1
+  #elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
+    #define TEMP_SENSOR_3_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_3_MINTEMP
+  #undef HEATER_3_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_4 == -4
+  #define TEMP_SENSOR_4_IS_AD8495 1
+#elif TEMP_SENSOR_4 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_4."
+#elif TEMP_SENSOR_4 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
+#elif TEMP_SENSOR_4 == -1
+  #define TEMP_SENSOR_4_IS_AD595 1
+#elif TEMP_SENSOR_4 > 0
+  #define TEMP_SENSOR_4_IS_THERMISTOR 1
+  #if TEMP_SENSOR_4 == 1000
+    #define TEMP_SENSOR_4_IS_CUSTOM 1
+  #elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
+    #define TEMP_SENSOR_4_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_4_MINTEMP
+  #undef HEATER_4_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_5 == -4
+  #define TEMP_SENSOR_5_IS_AD8495 1
+#elif TEMP_SENSOR_5 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_5."
+#elif TEMP_SENSOR_5 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
+#elif TEMP_SENSOR_5 == -1
+  #define TEMP_SENSOR_5_IS_AD595 1
+#elif TEMP_SENSOR_5 > 0
+  #define TEMP_SENSOR_5_IS_THERMISTOR 1
+  #if TEMP_SENSOR_5 == 1000
+    #define TEMP_SENSOR_5_IS_CUSTOM 1
+  #elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
+    #define TEMP_SENSOR_5_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_5_MINTEMP
+  #undef HEATER_5_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_6 == -4
+  #define TEMP_SENSOR_6_IS_AD8495 1
+#elif TEMP_SENSOR_6 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_6."
+#elif TEMP_SENSOR_6 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_6."
+#elif TEMP_SENSOR_6 == -1
+  #define TEMP_SENSOR_6_IS_AD595 1
+#elif TEMP_SENSOR_6 > 0
+  #define TEMP_SENSOR_6_IS_THERMISTOR 1
+  #if TEMP_SENSOR_6 == 1000
+    #define TEMP_SENSOR_6_IS_CUSTOM 1
+  #elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
+    #define TEMP_SENSOR_6_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_6_MINTEMP
+  #undef HEATER_6_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_7 == -4
+  #define TEMP_SENSOR_7_IS_AD8495 1
+#elif TEMP_SENSOR_7 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_7."
+#elif TEMP_SENSOR_7 == -2
+  #error "MAX7775 Thermocouples (-2) not supported for TEMP_SENSOR_7."
+#elif TEMP_SENSOR_7 == -1
+  #define TEMP_SENSOR_7_IS_AD595 1
+#elif TEMP_SENSOR_7 > 0
+  #define TEMP_SENSOR_7_IS_THERMISTOR 1
+  #if TEMP_SENSOR_7 == 1000
+    #define TEMP_SENSOR_7_IS_CUSTOM 1
+  #elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
+    #define TEMP_SENSOR_7_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_7_MINTEMP
+  #undef HEATER_7_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_BED == -4
+  #define TEMP_SENSOR_BED_IS_AD8495 1
+#elif TEMP_SENSOR_BED == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BED."
+#elif TEMP_SENSOR_BED == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
+#elif TEMP_SENSOR_BED == -1
+  #define TEMP_SENSOR_BED_IS_AD595 1
+#elif TEMP_SENSOR_BED > 0
+  #define TEMP_SENSOR_BED_IS_THERMISTOR 1
+  #if TEMP_SENSOR_BED == 1000
+    #define TEMP_SENSOR_BED_IS_CUSTOM 1
+  #elif TEMP_SENSOR_BED == 998 || TEMP_SENSOR_BED == 999
+    #define TEMP_SENSOR_BED_IS_DUMMY 1
+  #endif
+#else
+  #undef BED_MINTEMP
+  #undef BED_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_CHAMBER == -4
+  #define TEMP_SENSOR_CHAMBER_IS_AD8495 1
+#elif TEMP_SENSOR_CHAMBER == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_CHAMBER."
+#elif TEMP_SENSOR_CHAMBER == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
+#elif TEMP_SENSOR_CHAMBER == -1
+  #define TEMP_SENSOR_CHAMBER_IS_AD595 1
+#elif TEMP_SENSOR_CHAMBER > 0
+  #define TEMP_SENSOR_CHAMBER_IS_THERMISTOR 1
+  #if TEMP_SENSOR_CHAMBER == 1000
+    #define TEMP_SENSOR_CHAMBER_IS_CUSTOM 1
+  #elif TEMP_SENSOR_CHAMBER == 998 || TEMP_SENSOR_CHAMBER == 999
+    #define TEMP_SENSOR_CHAMBER_IS_DUMMY 1
+  #endif
+#else
+  #undef CHAMBER_MINTEMP
+  #undef CHAMBER_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_COOLER == -4
+  #define TEMP_SENSOR_COOLER_IS_AD8495 1
+#elif TEMP_SENSOR_COOLER == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_COOLER."
+#elif TEMP_SENSOR_COOLER == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_COOLER."
+#elif TEMP_SENSOR_COOLER == -1
+  #define TEMP_SENSOR_COOLER_IS_AD595 1
+#elif TEMP_SENSOR_COOLER > 0
+  #define TEMP_SENSOR_COOLER_IS_THERMISTOR 1
+  #if TEMP_SENSOR_COOLER == 1000
+    #define TEMP_SENSOR_COOLER_IS_CUSTOM 1
+  #elif TEMP_SENSOR_COOLER == 998 || TEMP_SENSOR_COOLER == 999
+    #define TEMP_SENSOR_COOLER_IS_DUMMY 1
+  #endif
+#else
+  #undef COOLER_MINTEMP
+  #undef COOLER_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_PROBE == -4
+  #define TEMP_SENSOR_PROBE_IS_AD8495 1
+#elif TEMP_SENSOR_PROBE == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_PROBE."
+#elif TEMP_SENSOR_PROBE == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_PROBE."
+#elif TEMP_SENSOR_PROBE == -1
+  #define TEMP_SENSOR_PROBE_IS_AD595 1
+#elif TEMP_SENSOR_PROBE > 0
+  #define TEMP_SENSOR_PROBE_IS_THERMISTOR 1
+  #if TEMP_SENSOR_PROBE == 1000
+    #define TEMP_SENSOR_PROBE_IS_CUSTOM 1
+  #elif TEMP_SENSOR_PROBE == 998 || TEMP_SENSOR_PROBE == 999
+    #define TEMP_SENSOR_PROBE_IS_DUMMY 1
+  #endif
+#endif
+
 /**
  * X_DUAL_ENDSTOPS endstop reassignment
  */
@@ -2010,7 +2372,7 @@
   #define HAS_TMC_SW_SERIAL 1
 #endif
 
-#if DISABLED(SENSORLESS_HOMING)
+#if !USE_SENSORLESS
   #undef SENSORLESS_BACKOFF_MM
 #endif
 
@@ -2246,9 +2608,6 @@
 #if HAS_ADC_TEST(COOLER)
   #define HAS_TEMP_ADC_COOLER 1
 #endif
-#if HAS_ADC_TEST(BOARD)
-  #define HAS_TEMP_ADC_BOARD 1
-#endif
 #if HAS_ADC_TEST(REDUNDANT)
   #define HAS_TEMP_ADC_REDUNDANT 1
 #endif
@@ -2269,9 +2628,6 @@
 #if HAS_TEMP(COOLER)
   #define HAS_TEMP_COOLER 1
 #endif
-#if HAS_TEMP(BOARD)
-  #define HAS_TEMP_BOARD 1
-#endif
 #if HAS_TEMP(REDUNDANT)
   #define HAS_TEMP_REDUNDANT 1
 #endif
@@ -2343,8 +2699,7 @@
 #if HAS_HEATED_BED || HAS_TEMP_CHAMBER
   #define BED_OR_CHAMBER 1
 #endif
-
-#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE || HAS_TEMP_COOLER || HAS_TEMP_BOARD
+#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE || HAS_TEMP_COOLER
   #define HAS_TEMP_SENSOR 1
 #endif
 
@@ -2482,6 +2837,9 @@
 #endif
 #undef _NOT_E_AUTO
 #undef _HAS_FAN
+#if PIN_EXISTS(CONTROLLER_FAN)
+  #define HAS_CONTROLLER_FAN 1
+#endif
 
 #if BED_OR_CHAMBER || HAS_FAN0
   #define BED_OR_CHAMBER_OR_FAN 1
@@ -2558,27 +2916,6 @@
   #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1)) // Fan frequency default
 #endif
 
-/**
- * Controller Fan Settings
- */
-#if PIN_EXISTS(CONTROLLER_FAN)
-  #define HAS_CONTROLLER_FAN 1
-  #if CONTROLLER_FAN_MIN_BOARD_TEMP
-    #define HAS_CONTROLLER_FAN_MIN_BOARD_TEMP 1
-  #endif
-#endif
-
-#if HAS_CONTROLLER_FAN
-  #if ENABLED(CONTROLLER_FAN_USE_BOARD_TEMP)
-    #define HAS_CONTROLLER_FAN_BOARD_TEMP_TRIGGER 1
-    #ifndef CONTROLLER_FAN_TRIGGER_TEMP
-      #define CONTROLLER_FAN_TRIGGER_TEMP 30
-    #endif
-  #else
-    #undef CONTROLLER_FAN_TRIGGER_TEMP
-  #endif
-#endif
-
 // Servos
 #if PIN_EXISTS(SERVO0) && NUM_SERVOS > 0
   #define HAS_SERVO_0 1
@@ -2594,14 +2931,9 @@
 #endif
 #if NUM_SERVOS > 0
   #define HAS_SERVOS 1
-  #if defined(PAUSE_SERVO_OUTPUT) && defined(RESUME_SERVO_OUTPUT)
-    #define HAS_PAUSE_SERVO_OUTPUT 1
-  #endif
-#else
-  #undef SERVO_DELAY
-  #undef DEACTIVATE_SERVOS_AFTER_MOVE
-  #undef EDITABLE_SERVO_ANGLES
-  #undef SERVO_DETACH_GCODE
+#endif
+#if HAS_SERVOS && defined(PAUSE_SERVO_OUTPUT) && defined(RESUME_SERVO_OUTPUT)
+  #define HAS_PAUSE_SERVO_OUTPUT 1
 #endif
 
 // Sensors
@@ -2838,7 +3170,7 @@
   #define HAS_TEMPERATURE 1
 #endif
 
-#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
+#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD)
   #ifdef PREHEAT_6_LABEL
     #define PREHEAT_COUNT 6
   #elif defined(PREHEAT_5_LABEL)
@@ -2872,18 +3204,16 @@
 /**
  * Bed Probe dependencies
  */
-#if EITHER(MESH_BED_LEVELING, HAS_BED_PROBE)
+#if HAS_BED_PROBE
+  #if BOTH(ENDSTOPPULLUPS, HAS_Z_MIN_PROBE_PIN)
+    #define ENDSTOPPULLUP_ZMIN_PROBE
+  #endif
   #ifndef Z_PROBE_OFFSET_RANGE_MIN
     #define Z_PROBE_OFFSET_RANGE_MIN -20
   #endif
   #ifndef Z_PROBE_OFFSET_RANGE_MAX
     #define Z_PROBE_OFFSET_RANGE_MAX 20
   #endif
-#endif
-#if HAS_BED_PROBE
-  #if BOTH(ENDSTOPPULLUPS, HAS_Z_MIN_PROBE_PIN)
-    #define ENDSTOPPULLUP_ZMIN_PROBE
-  #endif
   #ifndef XY_PROBE_FEEDRATE
     #define XY_PROBE_FEEDRATE ((homing_feedrate_mm_m.x + homing_feedrate_mm_m.y) / 2)
   #endif
@@ -2959,7 +3289,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
@@ -3215,7 +3545,7 @@
 #endif
 
 // Number of VFAT entries used. Each entry has 13 UTF-16 characters
-#if EITHER(SCROLL_LONG_FILENAMES, HAS_DWIN_E3V2)
+#if EITHER(SCROLL_LONG_FILENAMES, DWIN_CREALITY_LCD)
   #define MAX_VFAT_ENTRIES (5)
 #else
   #define MAX_VFAT_ENTRIES (2)
@@ -3270,8 +3600,6 @@
   #ifndef LCD_WIDTH
     #if HAS_MARLINUI_U8GLIB
       #define LCD_WIDTH 21
-    #elif IS_DWIN_MARLINUI
-      // Defined by header
     #else
       #define LCD_WIDTH TERN(IS_ULTIPANEL, 20, 16)
     #endif
@@ -3279,8 +3607,6 @@
   #ifndef LCD_HEIGHT
     #if HAS_MARLINUI_U8GLIB
       #define LCD_HEIGHT 5
-    #elif IS_DWIN_MARLINUI
-      // Defined by header
     #else
       #define LCD_HEIGHT TERN(IS_ULTIPANEL, 4, 2)
     #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 53b8783..ebbfa17 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -43,7 +43,7 @@
 #define TEST2 1
 #define TEST3 0
 #define TEST4 true
-#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3) || !ENABLED(TEST1, TEST2, TEST4)
+#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3)
   #error "ENABLED is borked!"
 #endif
 #if BOTH(TEST0, TEST1)
@@ -577,30 +577,12 @@
   #error "CUSTOM_USER_MENUS has been replaced by CUSTOM_MENU_MAIN and CUSTOM_MENU_CONFIG."
 #elif defined(MKS_LCD12864)
   #error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
-#elif defined(DOGM_SD_PERCENT)
-  #error "DOGM_SD_PERCENT is now SHOW_SD_PERCENT."
 #elif defined(NEOPIXEL_BKGD_LED_INDEX)
   #error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
 #elif defined(TEMP_SENSOR_1_AS_REDUNDANT)
   #error "TEMP_SENSOR_1_AS_REDUNDANT is now TEMP_SENSOR_REDUNDANT, with associated TEMP_SENSOR_REDUNDANT_* config."
 #elif defined(MAX_REDUNDANT_TEMP_SENSOR_DIFF)
   #error "MAX_REDUNDANT_TEMP_SENSOR_DIFF is now TEMP_SENSOR_REDUNDANT_MAX_DIFF"
-#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
-  #error "LCD_ALEPHOBJECTS_CLCD_UI is now LCD_LULZBOT_CLCD_UI."
-#elif defined(MIN_ARC_SEGMENTS)
-  #error "MIN_ARC_SEGMENTS is now MIN_CIRCLE_SEGMENTS."
-#elif defined(ARC_SEGMENTS_PER_R)
-  #error "ARC_SUPPORT no longer uses ARC_SEGMENTS_PER_R."
-#elif ENABLED(ARC_SUPPORT) && (!defined(MIN_ARC_SEGMENT_MM) || !defined(MAX_ARC_SEGMENT_MM))
-  #error "ARC_SUPPORT now requires MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM."
-#elif defined(SPINDLE_LASER_PWM)
-  #error "SPINDLE_LASER_PWM (true) is now set with SPINDLE_LASER_USE_PWM (enabled)."
-#endif
-
-#if MOTHERBOARD == BOARD_DUE3DOM_MINI && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
-  #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
-#elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
-  #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -809,8 +791,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif PROGRESS_MSG_EXPIRE < 0
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
-#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
+#elif ENABLED(LCD_SET_PROGRESS_MANUALLY)
+  #if NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI)
+    #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, or EXTENSIBLE_UI."
+  #endif
 #endif
 
 #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -1469,13 +1453,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "CLASSIC_JERK is required for DELTA and SCARA."
 #endif
 
-/**
- * Some things should not be used on Belt Printers
- */
-#if BOTH(BELTPRINTER, HAS_LEVELING)
-  #error "Bed Leveling is not compatible with BELTPRINTER."
-#endif
-
 /**
  * Probes
  */
@@ -1738,7 +1715,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !(ENABLED(AUTO_BED_LEVELING_UBL) && EITHER(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI))
+#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !BOTH(AUTO_BED_LEVELING_UBL, HAS_MARLINUI_U8GLIB)
   #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
 #endif
 
@@ -1750,8 +1727,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * LCD_BED_LEVELING requirements
  */
 #if ENABLED(LCD_BED_LEVELING)
-  #if NONE(HAS_LCD_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
-    #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
+  #if !HAS_LCD_MENU
+    #error "LCD_BED_LEVELING requires a programmable LCD controller."
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
   #elif ENABLED(MESH_EDIT_MENU) && !HAS_MESH
@@ -2006,8 +1983,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TEMP_SENSOR_CHAMBER 1000 requires CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS and CHAMBER_BETA in Configuration_adv.h."
 #elif TEMP_SENSOR_PROBE_IS_CUSTOM && !(defined(PROBE_PULLUP_RESISTOR_OHMS) && defined(PROBE_RESISTANCE_25C_OHMS) && defined(PROBE_BETA))
   #error "TEMP_SENSOR_PROBE 1000 requires PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS and PROBE_BETA in Configuration_adv.h."
-#elif TEMP_SENSOR_BOARD_IS_CUSTOM && !(defined(BOARD_PULLUP_RESISTOR_OHMS) && defined(BOARD_RESISTANCE_25C_OHMS) && defined(BOARD_BETA))
-  #error "TEMP_SENSOR_BOARD 1000 requires BOARD_PULLUP_RESISTOR_OHMS, BOARD_RESISTANCE_25C_OHMS and BOARD_BETA in Configuration_adv.h."
 #elif TEMP_SENSOR_REDUNDANT_IS_CUSTOM && !(defined(REDUNDANT_PULLUP_RESISTOR_OHMS) && defined(REDUNDANT_RESISTANCE_25C_OHMS) && defined(REDUNDANT_BETA))
   #error "TEMP_SENSOR_REDUNDANT 1000 requires REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS and REDUNDANT_BETA in Configuration_adv.h."
 #endif
@@ -2015,14 +1990,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Required MAX31865 settings
  */
-#if TEMP_SENSOR_0_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && REDUNDANT_TEMP_MATCH(SOURCE, E0))
+#if TEMP_SENSOR_0_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
   #if !defined(MAX31865_SENSOR_WIRES_0) || !WITHIN(MAX31865_SENSOR_WIRES_0, 2, 4)
     #error "MAX31865_SENSOR_WIRES_0 must be defined as an integer between 2 and 4."
   #elif !defined(MAX31865_SENSOR_OHMS_0) || !defined(MAX31865_CALIBRATION_OHMS_0)
     #error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set if TEMP_SENSOR_0/TEMP_SENSOR_REDUNDANT is MAX31865."
   #endif
 #endif
-#if TEMP_SENSOR_1_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && REDUNDANT_TEMP_MATCH(SOURCE, E1))
+#if TEMP_SENSOR_1_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
   #if !defined(MAX31865_SENSOR_WIRES_1) || !WITHIN(MAX31865_SENSOR_WIRES_1, 2, 4)
     #error "MAX31865_SENSOR_WIRES_1 must be defined as an integer between 2 and 4."
   #elif !defined(MAX31865_SENSOR_OHMS_1) || !defined(MAX31865_CALIBRATION_OHMS_1)
@@ -2038,52 +2013,56 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_SOURCE."
   #elif !defined(TEMP_SENSOR_REDUNDANT_TARGET)
     #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_TARGET."
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, TEMP_SENSOR_REDUNDANT_TARGET)
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == TEMP_SENSOR_REDUNDANT_TARGET
     #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be the same as TEMP_SENSOR_REDUNDANT_TARGET."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE < -5 || TEMP_SENSOR_REDUNDANT_SOURCE > 7
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be between -5 and 7."
+  #elif TEMP_SENSOR_REDUNDANT_TARGET < -5 || TEMP_SENSOR_REDUNDANT_TARGET > 7
+    #error "TEMP_SENSOR_REDUNDANT_TARGET must be between -5 and 7."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -3
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be -3 (not used)."
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -3
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be -3 (not used)."
   #elif HAS_MULTI_HOTEND && TEMP_SENSOR_REDUNDANT_SOURCE < HOTENDS
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be after the last used hotend TEMP_SENSOR."
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be after the last TEMP_SENSOR used with a hotend; you can't use a sensor in the middle of two hotends."
   #endif
 
-  #if REDUNDANT_TEMP_MATCH(SOURCE, E0) && HAS_HOTEND
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be E0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, COOLER) && HAS_TEMP_COOLER
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be COOLER. TEMP_SENSOR_COOLER is in use."
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE) && HAS_TEMP_PROBE
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be PROBE. TEMP_SENSOR_PROBE is in use."
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, BOARD) && HAS_TEMP_BOARD
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be BOARD. TEMP_SENSOR_BOARD is in use."
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, CHAMBER) && HAS_TEMP_CHAMBER
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be CHAMBER. TEMP_SENSOR_CHAMBER is in use."
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, BED) && HAS_TEMP_BED
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be BED. TEMP_SENSOR_BED is in use."
+  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0 && HAS_HOTEND
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can not be 0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -5 && HAS_TEMP_COOLER
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Cooler (-5): TEMP_SENSOR_COOLER has already defined the sensor."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4 && HAS_TEMP_PROBE
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Probe (-4): TEMP_SENSOR_PROBE has already defined the sensor."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2 && HAS_TEMP_CHAMBER
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Chamber (-2): TEMP_SENSOR_CHAMBER has already defined the sensor."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1 && HAS_TEMP_BED
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Bed (-1): TEMP_SENSOR_BED has already defined the sensor."
   #endif
 
-  #if REDUNDANT_TEMP_MATCH(TARGET, E0) && !PIN_EXISTS(TEMP_0)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E0 without TEMP_0_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, E1) && !PIN_EXISTS(TEMP_1)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E1 without TEMP_1_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, E2) && !PIN_EXISTS(TEMP_2)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E2 without TEMP_2_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, E3) && !PIN_EXISTS(TEMP_3)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E3 without TEMP_3_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, E4) && !PIN_EXISTS(TEMP_4)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E4 without TEMP_4_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, E5) && !PIN_EXISTS(TEMP_5)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E5 without TEMP_5_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, E6) && !PIN_EXISTS(TEMP_6)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E6 without TEMP_6_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, E7) && !PIN_EXISTS(TEMP_7)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E7 without TEMP_7_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, BED) && !PIN_EXISTS(TEMP_BED)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be BED without TEMP_BED_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, CHAMBER) && !PIN_EXISTS(TEMP_CHAMBER)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be CHAMBER without TEMP_CHAMBER_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, BOARD) && !PIN_EXISTS(TEMP_BOARD)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be BOARD without TEMP_BOARD_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, PROBE) && !PIN_EXISTS(TEMP_PROBE)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be PROBE without TEMP_PROBE_PIN defined."
-  #elif REDUNDANT_TEMP_MATCH(TARGET, COOLER) && !PIN_EXISTS(TEMP_COOLER)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be COOLER without TEMP_COOLER_PIN defined."
+  #if TEMP_SENSOR_REDUNDANT_TARGET == 0 && !PIN_EXISTS(TEMP_0)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E0 (0): requires TEMP_0_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 1 && !PIN_EXISTS(TEMP_1)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E1 (1): requires TEMP_1_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 2 && !PIN_EXISTS(TEMP_2)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E2 (2): requires TEMP_2_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 3 && !PIN_EXISTS(TEMP_3)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E3 (3): requires TEMP_3_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 4 && !PIN_EXISTS(TEMP_4)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E4 (4): requires TEMP_4_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 5 && !PIN_EXISTS(TEMP_5)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E5 (5): requires TEMP_5_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 6 && !PIN_EXISTS(TEMP_6)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E6 (6): requires TEMP_6_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 7 && !PIN_EXISTS(TEMP_7)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E7 (7): requires TEMP_7_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -1 && !PIN_EXISTS(TEMP_BED)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Bed (-1): requires TEMP_BED_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -2 && !PIN_EXISTS(TEMP_CHAMBER)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Chamber (-2): requires TEMP_CHAMBER_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -4 && !PIN_EXISTS(TEMP_PROBE)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Probe (-4): requires TEMP_PROBE_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -5 && !PIN_EXISTS(TEMP_COOLER)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Cooler (-5): requires TEMP_COOLER_PIN"
   #endif
 
   #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0) && !PIN_EXISTS(TEMP_0_CS)
@@ -2254,28 +2233,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if TEMP_SENSOR_PROBE
-  #if !PIN_EXISTS(TEMP_PROBE)
-    #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN."
-  #elif !HAS_TEMP_ADC_PROBE
-    #error "TEMP_PROBE_PIN must be an ADC pin."
-  #elif DISABLED(FIX_MOUNTED_PROBE)
-    #error "TEMP_SENSOR_PROBE shouldn't be set without FIX_MOUNTED_PROBE."
-  #endif
-#endif
-
-#if TEMP_SENSOR_BOARD
-  #if !PIN_EXISTS(TEMP_BOARD)
-    #error "TEMP_SENSOR_BOARD requires TEMP_BOARD_PIN."
-  #elif !HAS_TEMP_ADC_BOARD
-    #error "TEMP_BOARD_PIN must be an ADC pin."
-  #elif ENABLED(THERMAL_PROTECTION_BOARD) && (!defined(BOARD_MINTEMP) || !defined(BOARD_MAXTEMP))
-    #error "THERMAL_PROTECTION_BOARD requires BOARD_MINTEMP and BOARD_MAXTEMP."
-  #endif
-#elif CONTROLLER_FAN_MIN_BOARD_TEMP
-  #error "CONTROLLER_FAN_MIN_BOARD_TEMP requires TEMP_SENSOR_BOARD."
-#endif
-
 #if ENABLED(LASER_COOLANT_FLOW_METER) && !(PIN_EXISTS(FLOWMETER) && ENABLED(LASER_FEATURE))
   #error "LASER_COOLANT_FLOW_METER requires FLOWMETER_PIN and LASER_FEATURE."
 #endif
@@ -2655,9 +2612,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
-  + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
-  + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+  + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS) \
+  + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY, DWIN_CREALITY_LCD) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
@@ -2750,35 +2706,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Please select only one of CHIRON_TFT_STANDARD or CHIRON_TFT_NEW."
 #endif
 
-/**
- * Ender 3 V2 controller has some limitations
- */
-#if ENABLED(DWIN_CREALITY_LCD)
-  #if DISABLED(SDSUPPORT)
-    #error "DWIN_CREALITY_LCD requires SDSUPPORT to be enabled."
-  #elif ENABLED(PID_EDIT_MENU)
-    #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU."
-  #elif ENABLED(PID_AUTOTUNE_MENU)
-    #error "DWIN_CREALITY_LCD does not support PID_AUTOTUNE_MENU."
-  #elif ENABLED(LEVEL_BED_CORNERS)
-    #error "DWIN_CREALITY_LCD does not support LEVEL_BED_CORNERS."
-  #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
-    #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
-  #endif
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #if DISABLED(SDSUPPORT)
-    #error "DWIN_CREALITY_LCD_ENHANCED requires SDSUPPORT to be enabled."
-  #elif ENABLED(PID_EDIT_MENU)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_EDIT_MENU."
-  #elif ENABLED(PID_AUTOTUNE_MENU)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_AUTOTUNE_MENU."
-  #elif ENABLED(LEVEL_BED_CORNERS)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support LEVEL_BED_CORNERS."
-  #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support LCD_BED_LEVELING with PROBE_MANUALLY."
-  #endif
-#endif
-
 /**
  * Some boards forbid the use of -1 Native USB
  */
@@ -3279,64 +3206,82 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Check per-axis initializers for errors
  */
+constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
+                sanity_arr_2[] = DEFAULT_MAX_FEEDRATE,
+                sanity_arr_3[] = DEFAULT_MAX_ACCELERATION,
+                sanity_arr_7[] = HOMING_FEEDRATE_MM_M;
 
-#define __PLUS_TEST(I,A) && (sanity_arr_##A[_MIN(I,signed(COUNT(sanity_arr_##A)-1))] > 0)
-#define _PLUS_TEST(A) (1 REPEAT2(14,__PLUS_TEST,A))
+#define _ARR_TEST(N,I) (sanity_arr_##N[_MIN(I,int(COUNT(sanity_arr_##N))-1)] > 0)
 #if HAS_MULTI_EXTRUDER
   #define _EXTRA_NOTE " (Did you forget to enable DISTINCT_E_FACTORS?)"
 #else
   #define _EXTRA_NOTE " (Should be " STRINGIFY(LINEAR_AXES) "+" STRINGIFY(E_STEPPERS) ")"
 #endif
 
-constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT;
 static_assert(COUNT(sanity_arr_1) >= LOGICAL_AXES,  "DEFAULT_AXIS_STEPS_PER_UNIT requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_1) <= DISTINCT_AXES, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements." _EXTRA_NOTE);
-static_assert(_PLUS_TEST(1), "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
+static_assert(   _ARR_TEST(1,0) && _ARR_TEST(1,1) && _ARR_TEST(1,2)
+              && _ARR_TEST(1,3) && _ARR_TEST(1,4) && _ARR_TEST(1,5)
+              && _ARR_TEST(1,6) && _ARR_TEST(1,7) && _ARR_TEST(1,8),
+              "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
 
-constexpr float sanity_arr_2[] = DEFAULT_MAX_FEEDRATE;
 static_assert(COUNT(sanity_arr_2) >= LOGICAL_AXES,  "DEFAULT_MAX_FEEDRATE requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_2) <= DISTINCT_AXES, "DEFAULT_MAX_FEEDRATE has too many elements." _EXTRA_NOTE);
-static_assert(_PLUS_TEST(2), "DEFAULT_MAX_FEEDRATE values must be positive.");
+static_assert(   _ARR_TEST(2,0) && _ARR_TEST(2,1) && _ARR_TEST(2,2)
+              && _ARR_TEST(2,3) && _ARR_TEST(2,4) && _ARR_TEST(2,5)
+              && _ARR_TEST(2,6) && _ARR_TEST(2,7) && _ARR_TEST(2,8),
+              "DEFAULT_MAX_FEEDRATE values must be positive.");
 
-constexpr float sanity_arr_3[] = DEFAULT_MAX_ACCELERATION;
 static_assert(COUNT(sanity_arr_3) >= LOGICAL_AXES,  "DEFAULT_MAX_ACCELERATION requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_3) <= DISTINCT_AXES, "DEFAULT_MAX_ACCELERATION has too many elements." _EXTRA_NOTE);
-static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive.");
+static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
+              && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
+              && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
+              "DEFAULT_MAX_ACCELERATION values must be positive.");
 
-constexpr float sanity_arr_4[] = HOMING_FEEDRATE_MM_M;
-static_assert(COUNT(sanity_arr_4) == LINEAR_AXES,  "HOMING_FEEDRATE_MM_M requires " _LINEAR_AXES_STR "elements (and no others).");
-static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
+static_assert(COUNT(sanity_arr_7) == LINEAR_AXES,  "HOMING_FEEDRATE_MM_M requires " _LINEAR_AXES_STR "elements (and no others).");
+static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
+              && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
+              && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
+              "HOMING_FEEDRATE_MM_M values must be positive.");
 
-#ifdef MAX_ACCEL_EDIT_VALUES
-  constexpr float sanity_arr_5[] = MAX_ACCEL_EDIT_VALUES;
-  static_assert(COUNT(sanity_arr_5) >= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
-  static_assert(COUNT(sanity_arr_5) <= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
-  static_assert(_PLUS_TEST(5), "MAX_ACCEL_EDIT_VALUES values must be positive.");
+#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
+  #ifdef MAX_ACCEL_EDIT_VALUES
+    constexpr float sanity_arr_4[] = MAX_ACCEL_EDIT_VALUES;
+    static_assert(COUNT(sanity_arr_4) >= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+    static_assert(COUNT(sanity_arr_4) <= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
+    static_assert(   _ARR_TEST(4,0) && _ARR_TEST(4,1) && _ARR_TEST(4,2)
+                  && _ARR_TEST(4,3) && _ARR_TEST(4,4) && _ARR_TEST(4,5)
+                  && _ARR_TEST(4,6) && _ARR_TEST(4,7) && _ARR_TEST(4,8),
+                  "MAX_ACCEL_EDIT_VALUES values must be positive.");
+  #endif
 #endif
 
-#ifdef MAX_FEEDRATE_EDIT_VALUES
-  constexpr float sanity_arr_6[] = MAX_FEEDRATE_EDIT_VALUES;
-  static_assert(COUNT(sanity_arr_6) >= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
-  static_assert(COUNT(sanity_arr_6) <= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
-  static_assert(_PLUS_TEST(6), "MAX_FEEDRATE_EDIT_VALUES values must be positive.");
+#if ENABLED(LIMITED_MAX_FR_EDITING)
+  #ifdef MAX_FEEDRATE_EDIT_VALUES
+    constexpr float sanity_arr_5[] = MAX_FEEDRATE_EDIT_VALUES;
+    static_assert(COUNT(sanity_arr_5) >= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+    static_assert(COUNT(sanity_arr_5) <= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
+    static_assert(   _ARR_TEST(5,0) && _ARR_TEST(5,1) && _ARR_TEST(5,2)
+                  && _ARR_TEST(5,3) && _ARR_TEST(5,4) && _ARR_TEST(5,5)
+                  && _ARR_TEST(5,6) && _ARR_TEST(5,7) && _ARR_TEST(5,8),
+                  "MAX_FEEDRATE_EDIT_VALUES values must be positive.");
+  #endif
 #endif
 
-#ifdef MAX_JERK_EDIT_VALUES
-  constexpr float sanity_arr_7[] = MAX_JERK_EDIT_VALUES;
-  static_assert(COUNT(sanity_arr_7) >= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
-  static_assert(COUNT(sanity_arr_7) <= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
-  static_assert(_PLUS_TEST(7), "MAX_JERK_EDIT_VALUES values must be positive.");
+#if ENABLED(LIMITED_JERK_EDITING)
+  #ifdef MAX_JERK_EDIT_VALUES
+    constexpr float sanity_arr_6[] = MAX_JERK_EDIT_VALUES;
+    static_assert(COUNT(sanity_arr_6) >= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+    static_assert(COUNT(sanity_arr_6) <= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
+    static_assert(   _ARR_TEST(6,0) && _ARR_TEST(6,1) && _ARR_TEST(6,2)
+                  && _ARR_TEST(6,3) && _ARR_TEST(6,4) && _ARR_TEST(6,5)
+                  && _ARR_TEST(6,6) && _ARR_TEST(6,7) && _ARR_TEST(6,8),
+                  "MAX_JERK_EDIT_VALUES values must be positive.");
+  #endif
 #endif
 
-#ifdef MANUAL_FEEDRATE
-  constexpr float sanity_arr_8[] = MANUAL_FEEDRATE;
-  static_assert(COUNT(sanity_arr_8) >= LOGICAL_AXES, "MANUAL_FEEDRATE requires " _LOGICAL_AXES_STR "elements.");
-  static_assert(COUNT(sanity_arr_8) <= LOGICAL_AXES, "MANUAL_FEEDRATE has too many elements. " _LOGICAL_AXES_STR "elements only.");
-  static_assert(_PLUS_TEST(8), "MANUAL_FEEDRATE values must be positive.");
-#endif
-
-#undef __PLUS_TEST
-#undef _PLUS_TEST
+#undef _ARR_TEST
 #undef _EXTRA_NOTE
 
 #if BOTH(CNC_COORDINATE_SYSTEMS, NO_WORKSPACE_OFFSETS)
@@ -3504,13 +3449,6 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #endif
 #endif
 
-/**
- * Validate MKS_PWC
- */
-#if ENABLED(MKS_PWC) && PSU_ACTIVE_STATE != HIGH
-  #error "MKS_PWC requires PSU_ACTIVE_STATE to be set HIGH."
-#endif
-
 /**
  * Ensure this option is set intentionally
  */
@@ -3538,8 +3476,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
       #error "LASER_MOVE_G0_OFF requires LASER_MOVE_POWER."
     #endif
     #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-      #if DISABLED(SPINDLE_LASER_USE_PWM)
-        #error "LASER_POWER_INLINE_TRAPEZOID requires SPINDLE_LASER_USE_PWM to function."
+      #if DISABLED(SPINDLE_LASER_PWM)
+        #error "LASER_POWER_INLINE_TRAPEZOID requires SPINDLE_LASER_PWM to function."
       #elif ENABLED(S_CURVE_ACCELERATION)
         //#ifndef LASER_POWER_INLINE_S_CURVE_ACCELERATION_WARN
         //  #define LASER_POWER_INLINE_S_CURVE_ACCELERATION_WARN
@@ -3571,21 +3509,21 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
     #error "(SPINDLE|LASER)_FEATURE requires SPINDLE_LASER_ENA_PIN or SPINDLE_SERVO to control the power."
   #elif ENABLED(SPINDLE_CHANGE_DIR) && !PIN_EXISTS(SPINDLE_DIR)
     #error "SPINDLE_DIR_PIN is required for SPINDLE_CHANGE_DIR."
-  #elif ENABLED(SPINDLE_LASER_USE_PWM)
+  #elif ENABLED(SPINDLE_LASER_PWM)
     #if !defined(SPINDLE_LASER_PWM_PIN) || SPINDLE_LASER_PWM_PIN < 0
-      #error "SPINDLE_LASER_PWM_PIN is required for SPINDLE_LASER_USE_PWM."
+      #error "SPINDLE_LASER_PWM_PIN is required for SPINDLE_LASER_PWM."
     #elif !_TEST_PWM(SPINDLE_LASER_PWM_PIN)
       #error "SPINDLE_LASER_PWM_PIN not assigned to a PWM pin."
     #elif !defined(SPINDLE_LASER_PWM_INVERT)
       #error "SPINDLE_LASER_PWM_INVERT is required for (SPINDLE|LASER)_FEATURE."
     #elif !(defined(SPEED_POWER_INTERCEPT) && defined(SPEED_POWER_MIN) && defined(SPEED_POWER_MAX) && defined(SPEED_POWER_STARTUP))
-      #error "SPINDLE_LASER_USE_PWM equation constant(s) missing."
+      #error "SPINDLE_LASER_PWM equation constant(s) missing."
     #elif _PIN_CONFLICT(X_MIN)
-      #error "SPINDLE_LASER_USE_PWM pin conflicts with X_MIN_PIN."
+      #error "SPINDLE_LASER_PWM pin conflicts with X_MIN_PIN."
     #elif _PIN_CONFLICT(X_MAX)
-      #error "SPINDLE_LASER_USE_PWM pin conflicts with X_MAX_PIN."
+      #error "SPINDLE_LASER_PWM pin conflicts with X_MAX_PIN."
     #elif _PIN_CONFLICT(Z_STEP)
-      #error "SPINDLE_LASER_USE_PWM pin conflicts with Z_STEP_PIN."
+      #error "SPINDLE_LASER_PWM pin conflicts with Z_STEP_PIN."
     #elif _PIN_CONFLICT(CASE_LIGHT)
       #error "SPINDLE_LASER_PWM_PIN conflicts with CASE_LIGHT_PIN."
     #elif _PIN_CONFLICT(E0_AUTO_FAN)
@@ -3792,35 +3730,6 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #endif
 #undef _BAD_DRIVER
 
-/**
- * Require certain features for DGUS_LCD_UI_RELOADED.
- */
-#if ENABLED(DGUS_LCD_UI_RELOADED)
-  #if BUFSIZE < 4
-    #error "DGUS_LCD_UI_RELOADED requires a BUFSIZE of at least 4."
-  #elif HOTENDS < 1
-    #error "DGUS_LCD_UI_RELOADED requires at least 1 hotend."
-  #elif EXTRUDERS < 1
-    #error "DGUS_LCD_UI_RELOADED requires at least 1 extruder."
-  #elif !HAS_HEATED_BED
-    #error "DGUS_LCD_UI_RELOADED requires a heated bed."
-  #elif FAN_COUNT < 1
-    #error "DGUS_LCD_UI_RELOADED requires a fan."
-  #elif !HAS_BED_PROBE
-    #error "DGUS_LCD_UI_RELOADED requires a bed probe."
-  #elif !HAS_MESH
-    #error "DGUS_LCD_UI_RELOADED requires mesh leveling."
-  #elif DISABLED(LEVEL_BED_CORNERS)
-    #error "DGUS_LCD_UI_RELOADED requires LEVEL_BED_CORNERS."
-  #elif DISABLED(BABYSTEP_ALWAYS_AVAILABLE)
-    #error "DGUS_LCD_UI_RELOADED requires BABYSTEP_ALWAYS_AVAILABLE."
-  #elif DISABLED(BABYSTEP_ZPROBE_OFFSET)
-    #error "DGUS_LCD_UI_RELOADED requires BABYSTEP_ZPROBE_OFFSET."
-  #elif ENABLED(AUTO_BED_LEVELING_UBL) && DISABLED(UBL_SAVE_ACTIVE_ON_M500)
-    #warning "Without UBL_SAVE_ACTIVE_ON_M500, your mesh will not be saved when using the touchscreen."
-  #endif
-#endif
-
 // Misc. Cleanup
 #undef _TEST_PWM
 #undef _LINEAR_AXES_STR
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e51f61b..3f19f31 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -25,7 +25,7 @@
  * Release version. Leave the Marlin version or apply a custom scheme.
  */
 #ifndef SHORT_BUILD_VERSION
-  #define SHORT_BUILD_VERSION "bugfix-2.0.x"
+  #define SHORT_BUILD_VERSION "2.0.9.1"
 #endif
 
 /**
@@ -42,8 +42,8 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  //#define STRING_DISTRIBUTION_DATE "2021-09-19"
-      #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__
+  // #define STRING_DISTRIBUTION_DATE "2021-06-27"
+    #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__
 #endif
 
 /**
@@ -53,7 +53,7 @@
  * to alert users to major changes.
  */
 
-#define MARLIN_HEX_VERSION 02000902
+#define MARLIN_HEX_VERSION 02000901
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif
@@ -106,18 +106,18 @@
  * Currently only supported by DUE platform
  */
 #ifndef USB_DEVICE_VENDOR_ID
-  #define USB_DEVICE_VENDOR_ID            0x03EB /* ATMEL VID */
+  #define  USB_DEVICE_VENDOR_ID           0x03EB /* ATMEL VID */
 #endif
 #ifndef USB_DEVICE_PRODUCT_ID
-  #define USB_DEVICE_PRODUCT_ID           0x2424 /* MSC / CDC */
+  #define  USB_DEVICE_PRODUCT_ID          0x2424 /* MSC / CDC */
 #endif
 //! USB Device string definitions (Optional)
 #ifndef USB_DEVICE_MANUFACTURE_NAME
-  #define USB_DEVICE_MANUFACTURE_NAME     WEBSITE_URL
+  #define  USB_DEVICE_MANUFACTURE_NAME    WEBSITE_URL
 #endif
 #ifdef CUSTOM_MACHINE_NAME
-  #define USB_DEVICE_PRODUCT_NAME         CUSTOM_MACHINE_NAME
+  #define  USB_DEVICE_PRODUCT_NAME        CUSTOM_MACHINE_NAME
 #else
-  #define USB_DEVICE_PRODUCT_NAME         MACHINE_NAME
+  #define  USB_DEVICE_PRODUCT_NAME        MACHINE_NAME
 #endif
-#define USB_DEVICE_SERIAL_NAME            "123985739853"
+#define  USB_DEVICE_SERIAL_NAME           "123985739853"
diff --git a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
index 19e3814..8aca19b 100644
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@@ -1,25 +1,3 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
 /**
  * @file    lcdprint_hd44780.cpp
  * @brief   LCD print api for HD44780
diff --git a/Marlin/src/lcd/buttons.h b/Marlin/src/lcd/buttons.h
index 6d028e9..f39cb0a 100644
--- a/Marlin/src/lcd/buttons.h
+++ b/Marlin/src/lcd/buttons.h
@@ -75,7 +75,7 @@
   #endif
 #endif
 
-#if EITHER(HAS_DIGITAL_BUTTONS, HAS_DWIN_E3V2)
+#if EITHER(HAS_DIGITAL_BUTTONS, DWIN_CREALITY_LCD)
   // Wheel spin pins where BA is 00, 10, 11, 01 (1 bit always changes)
   #define BLEN_A 0
   #define BLEN_B 1
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index f17dd06..dfbf7b4 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -480,7 +480,7 @@
     #endif
 
     #ifndef STATUS_CUTTER_TEXT_X
-      #define STATUS_CUTTER_TEXT_X (STATUS_CUTTER_X - 1)
+      #define STATUS_CUTTER_TEXT_X (STATUS_CUTTER_X -1)
     #endif
 
     #ifndef STATUS_CUTTER_TEXT_Y
@@ -488,12 +488,12 @@
     #endif
 
     static_assert(
-      sizeof(status_cutter_bmp) == (STATUS_CUTTER_BYTEWIDTH) * STATUS_CUTTER_HEIGHT(0),
+      sizeof(status_cutter_bmp) == (STATUS_CUTTER_BYTEWIDTH) * (STATUS_CUTTER_HEIGHT(0)),
       "Status cutter bitmap (status_cutter_bmp) dimensions don't match data."
     );
     #ifdef STATUS_CUTTER_ANIM
       static_assert(
-        sizeof(status_cutter_on_bmp) == (STATUS_CUTTER_BYTEWIDTH) * STATUS_CUTTER_HEIGHT(1),
+        sizeof(status_cutter_on_bmp) == (STATUS_CUTTER_BYTEWIDTH) * (STATUS_CUTTER_HEIGHT(1)),
         "Status cutter bitmap (status_cutter_on_bmp) dimensions don't match data."
       );
     #endif
@@ -530,12 +530,12 @@
   #endif
 
   static_assert(
-    sizeof(status_chamber_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * STATUS_CHAMBER_HEIGHT(0),
+    sizeof(status_chamber_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(0)),
     "Status chamber bitmap (status_chamber_bmp) dimensions don't match data."
   );
   #ifdef STATUS_CHAMBER_ANIM
     static_assert(
-      sizeof(status_chamber_on_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * STATUS_CHAMBER_HEIGHT(1),
+      sizeof(status_chamber_on_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(1)),
       "Status chamber bitmap (status_chamber_on_bmp) dimensions don't match data."
     );
   #endif
@@ -565,12 +565,12 @@
     #endif
 
     static_assert(
-      sizeof(status_cooler_bmp1) == (STATUS_COOLER_BYTEWIDTH) * STATUS_COOLER_HEIGHT(0),
+      sizeof(status_cooler_bmp1) == (STATUS_COOLER_BYTEWIDTH) * (STATUS_COOLER_HEIGHT(0)),
       "Status cooler bitmap (status_cooler_bmp1) dimensions don't match data."
     );
     #ifdef STATUS_COOLER_ANIM
       static_assert(
-        sizeof(status_cooler_bmp2) == (STATUS_COOLER_BYTEWIDTH) * STATUS_COOLER_HEIGHT(1),
+        sizeof(status_cooler_bmp2) == (STATUS_COOLER_BYTEWIDTH) * (STATUS_COOLER_HEIGHT(1)),
         "Status cooler bitmap (status_cooler_bmp2) dimensions don't match data."
       );
     #endif
@@ -647,7 +647,7 @@
 #if STATUS_BED_WIDTH && !STATUS_HEATERS_WIDTH
 
   #ifndef STATUS_BED_X
-    #define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8 - TERN0(STATUS_HEAT_PERCENT, 4))
+    #define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8)
   #endif
 
   #ifndef STATUS_BED_HEIGHT
@@ -667,12 +667,12 @@
   #endif
 
   static_assert(
-    sizeof(status_bed_bmp) == (STATUS_BED_BYTEWIDTH) * STATUS_BED_HEIGHT(0),
+    sizeof(status_bed_bmp) == (STATUS_BED_BYTEWIDTH) * (STATUS_BED_HEIGHT(0)),
     "Status bed bitmap (status_bed_bmp) dimensions don't match data."
   );
   #ifdef STATUS_BED_ANIM
     static_assert(
-      sizeof(status_bed_on_bmp) == (STATUS_BED_BYTEWIDTH) * STATUS_BED_HEIGHT(1),
+      sizeof(status_bed_on_bmp) == (STATUS_BED_BYTEWIDTH) * (STATUS_BED_HEIGHT(1)),
       "Status bed bitmap (status_bed_on_bmp) dimensions don't match data."
     );
   #endif
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
index 6f55d3b..0a7ece8 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include <U8glib-HAL.h>
 
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 33bb3e4..25e943a 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -354,11 +354,12 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
 
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
-      u8g_uint_t y1 = row * (MENU_FONT_HEIGHT) + 1, y2 = y1 + MENU_FONT_HEIGHT - 1;
+      row_y1 = row * (MENU_FONT_HEIGHT) + 1;
+      row_y2 = row_y1 + MENU_FONT_HEIGHT - 1;
 
-      if (!PAGE_CONTAINS(y1 + 1, y2 + 2)) return;
+      if (!PAGE_CONTAINS(row_y1 + 1, row_y2 + 2)) return;
 
-      lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), y2, 'E');
+      lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), row_y2, 'E');
       lcd_put_wchar((char)('1' + extruder));
       lcd_put_wchar(' ');
       lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
diff --git a/Marlin/src/lcd/dogm/status/bed.h b/Marlin/src/lcd/dogm/status/bed.h
index 175a50e..c484a12 100644
--- a/Marlin/src/lcd/dogm/status/bed.h
+++ b/Marlin/src/lcd/dogm/status/bed.h
@@ -29,7 +29,9 @@
 
   #define STATUS_BED_ANIM
   #define STATUS_BED_WIDTH  24
-
+  #ifndef STATUS_BED_X
+    #define STATUS_BED_X   (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8)
+  #endif
   #define STATUS_BED_TEXT_X (STATUS_BED_X + 11)
 
   const unsigned char status_bed_bmp[] PROGMEM = {
@@ -60,6 +62,9 @@
 #else
 
   #define STATUS_BED_WIDTH  21
+  #ifndef STATUS_BED_X
+    #define STATUS_BED_X   (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8)
+  #endif
 
   #ifdef STATUS_BED_ANIM
 
@@ -103,7 +108,3 @@
   #endif
 
 #endif
-
-#ifndef STATUS_BED_X
-  #define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8 - TERN0(STATUS_HEAT_PERCENT, 4))
-#endif
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 8b707ba..5fe8b61 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -456,13 +456,13 @@ void MarlinUI::draw_status_screen() {
   #endif
 
   #if HAS_PRINT_PROGRESS
-    #if DISABLED(SHOW_SD_PERCENT)
+    #if DISABLED(DOGM_SD_PERCENT)
       #define _SD_INFO_X(len) (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH) / 2 - (len) * (MENU_FONT_WIDTH) / 2)
     #else
       #define _SD_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH))
     #endif
 
-    #if ENABLED(SHOW_SD_PERCENT)
+    #if ENABLED(DOGM_SD_PERCENT)
       static char progress_string[5];
     #endif
     static uint8_t lastElapsed = 0xFF, lastProgress = 0xFF;
@@ -471,7 +471,7 @@ void MarlinUI::draw_status_screen() {
     #if ENABLED(SHOW_REMAINING_TIME)
       static u8g_uint_t estimation_x_pos = 0;
       static char estimation_string[10];
-      #if BOTH(SHOW_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
+      #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
         static u8g_uint_t progress_x_pos = 0;
         static uint8_t progress_state = 0;
         static bool prev_blink = 0;
@@ -526,7 +526,7 @@ void MarlinUI::draw_status_screen() {
 
         progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * (progress / (PROGRESS_SCALE)) * 0.01f);
 
-        #if ENABLED(SHOW_SD_PERCENT)
+        #if ENABLED(DOGM_SD_PERCENT)
           if (progress == 0) {
             progress_string[0] = '\0';
             #if ENABLED(SHOW_REMAINING_TIME)
@@ -543,7 +543,7 @@ void MarlinUI::draw_status_screen() {
         #endif
       }
 
-      constexpr bool can_show_days = DISABLED(SHOW_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
+      constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
       if (ev != lastElapsed) {
         lastElapsed = ev;
         const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L);
@@ -564,7 +564,11 @@ void MarlinUI::draw_status_screen() {
             else {
               duration_t estimation = timeval;
               const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L);
-              estimation_x_pos = _SD_INFO_X(len + !BOTH(SHOW_SD_PERCENT, ROTATE_PROGRESS_DISPLAY));
+              estimation_x_pos = _SD_INFO_X(len
+                #if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
+                  + 1
+                #endif
+              );
             }
           }
         #endif
@@ -763,7 +767,7 @@ void MarlinUI::draw_status_screen() {
 
     if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) {
 
-      #if ALL(SHOW_SD_PERCENT, SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY)
+      #if ALL(DOGM_SD_PERCENT, SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY)
 
         if (prev_blink != blink) {
           prev_blink = blink;
@@ -785,13 +789,13 @@ void MarlinUI::draw_status_screen() {
           lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
         }
 
-      #else // !SHOW_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
+      #else // !DOGM_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
 
         //
         // SD Percent Complete
         //
 
-        #if ENABLED(SHOW_SD_PERCENT)
+        #if ENABLED(DOGM_SD_PERCENT)
           if (progress_string[0]) {
             lcd_put_u8str(55, EXTRAS_BASELINE, progress_string); // Percent complete
             lcd_put_wchar('%');
@@ -811,7 +815,7 @@ void MarlinUI::draw_status_screen() {
         #endif
             lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
 
-      #endif // !SHOW_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
+      #endif // !DOGM_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
     }
 
   #endif // HAS_PRINT_PROGRESS
diff --git a/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp b/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
index 6d40ea0..2a21bd6 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../inc/MarlinConfigPre.h"
 
 #if HAS_MARLINUI_U8GLIB
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
index df7b400..b0cb59a 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
@@ -73,18 +73,13 @@ TFT_IO tftio;
 #define HEIGHT LCD_PIXEL_HEIGHT
 #define PAGE_HEIGHT 8
 
+#include "../touch/touch_buttons.h"
+
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
   #include "../tft_io/touch_calibration.h"
   #include "../marlinui.h"
 #endif
 
-#if HAS_TOUCH_BUTTONS
-  #include "../touch/touch_buttons.h"
-  #if HAS_TOUCH_SLEEP
-    #define HAS_TOUCH_BUTTONS_SLEEP 1
-  #endif
-#endif
-
 #define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1)
 #define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1)
 
@@ -345,18 +340,6 @@ static uint8_t page;
   }
 #endif // HAS_TOUCH_BUTTONS
 
-static void u8g_upscale_clear_lcd(u8g_t *u8g, u8g_dev_t *dev, uint16_t *buffer) {
-  setWindow(u8g, dev, 0, 0, (TFT_WIDTH) - 1, (TFT_HEIGHT) - 1);
-  #if HAS_LCD_IO
-    UNUSED(buffer);
-    tftio.WriteMultiple(TFT_MARLINBG_COLOR, (TFT_WIDTH) * (TFT_HEIGHT));
-  #else
-    memset2(buffer, TFT_MARLINBG_COLOR, (TFT_WIDTH) / 2);
-    for (uint16_t i = 0; i < (TFT_HEIGHT) * sq(GRAPHICAL_TFT_UPSCALE); i++)
-      u8g_WriteSequence(u8g, dev, (TFT_WIDTH) / 2, (uint8_t *)buffer);
-  #endif
-}
-
 static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
 
 uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
@@ -382,37 +365,34 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
       tftio.Init();
       tftio.InitTFT();
       TERN_(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration_reset());
-      u8g_upscale_clear_lcd(u8g, dev, buffer);
+
+      // Clear Screen
+      setWindow(u8g, dev, 0, 0, (TFT_WIDTH) - 1, (TFT_HEIGHT) - 1);
+      #if HAS_LCD_IO
+        tftio.WriteMultiple(TFT_MARLINBG_COLOR, (TFT_WIDTH) * (TFT_HEIGHT));
+      #else
+        memset2(buffer, TFT_MARLINBG_COLOR, (TFT_WIDTH) / 2);
+        for (uint16_t i = 0; i < (TFT_HEIGHT) * sq(GRAPHICAL_TFT_UPSCALE); i++)
+          u8g_WriteSequence(u8g, dev, (TFT_WIDTH) / 2, (uint8_t *)buffer);
+      #endif
       return 0;
 
     case U8G_DEV_MSG_STOP: preinit = true; break;
 
-    case U8G_DEV_MSG_PAGE_FIRST: {
+    case U8G_DEV_MSG_PAGE_FIRST:
       page = 0;
-      #if HAS_TOUCH_BUTTONS_SLEEP
-        static bool sleepCleared;
-        if (touchBt.isSleeping()) {
-          if (!sleepCleared) {
-            sleepCleared = true;
-            u8g_upscale_clear_lcd(u8g, dev, buffer);
-            IF_ENABLED(HAS_TOUCH_BUTTONS, redrawTouchButtons = true);
-          }
-          break;
-        }
-        else
-          sleepCleared = false;
-      #endif
       TERN_(HAS_TOUCH_BUTTONS, drawTouchButtons(u8g, dev));
       setWindow(u8g, dev, TFT_PIXEL_OFFSET_X, TFT_PIXEL_OFFSET_Y, X_HI, Y_HI);
-    } break;
+      break;
 
     case U8G_DEV_MSG_PAGE_NEXT:
-      if (TERN0(HAS_TOUCH_BUTTONS_SLEEP, touchBt.isSleeping())) break;
       if (++page > (HEIGHT / PAGE_HEIGHT)) return 1;
 
       LOOP_L_N(y, PAGE_HEIGHT) {
         uint32_t k = 0;
-        TERN_(HAS_LCD_IO, buffer = (y & 1) ? bufferB : bufferA);
+        #if HAS_LCD_IO
+          buffer = (y & 1) ? bufferB : bufferA;
+        #endif
         for (uint16_t i = 0; i < (uint32_t)pb->width; i++) {
           const uint8_t b = *(((uint8_t *)pb->buf) + i);
           const uint16_t c = TEST(b, y) ? TFT_MARLINUI_COLOR : TFT_MARLINBG_COLOR;
diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
index 9367ed7..4abf91e 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
@@ -33,64 +33,68 @@
 
 #include "ultralcd_st7920_u8glib_rrd_AVR.h"
 
-// Optimize this code with -O3
-#pragma GCC optimize (3)
+#if F_CPU >= 20000000
+  #define CPU_ST7920_DELAY_1 DELAY_NS(150)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(150)
+#elif MB(3DRAG, K8200, K8400)
+  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(188)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(0)
+#elif MB(MINIRAMBO, EINSY_RAMBO, EINSY_RETRO, SILVER_GATE)
+  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(250)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(0)
+#elif MB(RAMBO)
+  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(0)
+#elif MB(BQ_ZUM_MEGA_3D)
+  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(189)
+#elif defined(ARDUINO_ARCH_STM32)
+  #define CPU_ST7920_DELAY_1 DELAY_NS(300)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(40)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(340)
+#elif F_CPU == 16000000
+  #define CPU_ST7920_DELAY_1 DELAY_NS(125)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(188)
+#else
+  #error "No valid condition for delays in 'ultralcd_st7920_u8glib_rrd_AVR.h'"
+#endif
 
 #ifndef ST7920_DELAY_1
-  #ifndef LCD_ST7920_DELAY_1
-    #define LCD_ST7920_DELAY_1 0
-  #endif
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1 0
-  #endif
-  #ifndef CPU_ST7920_DELAY_1
-    #define CPU_ST7920_DELAY_1 0
-  #endif
-  #if LCD_ST7920_DELAY_1 || BOARD_ST7920_DELAY_1 || CPU_ST7920_DELAY_1
-    #define ST7920_DELAY_1 DELAY_NS(_MAX(LCD_ST7920_DELAY_1, BOARD_ST7920_DELAY_1, CPU_ST7920_DELAY_1))
+  #ifdef BOARD_ST7920_DELAY_1
+    #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
   #else
-    #define ST7920_DELAY_1
+    #define ST7920_DELAY_1 CPU_ST7920_DELAY_1
   #endif
 #endif
 #ifndef ST7920_DELAY_2
-  #ifndef LCD_ST7920_DELAY_2
-    #define LCD_ST7920_DELAY_2 0
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2 0
-  #endif
-  #ifndef CPU_ST7920_DELAY_2
-    #define CPU_ST7920_DELAY_2 0
-  #endif
-  #if LCD_ST7920_DELAY_2 || BOARD_ST7920_DELAY_2 || CPU_ST7920_DELAY_2
-    #define ST7920_DELAY_2 DELAY_NS(_MAX(LCD_ST7920_DELAY_2, BOARD_ST7920_DELAY_2, CPU_ST7920_DELAY_2))
+  #ifdef BOARD_ST7920_DELAY_2
+    #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
   #else
-    #define ST7920_DELAY_2
+    #define ST7920_DELAY_2 CPU_ST7920_DELAY_2
   #endif
 #endif
 #ifndef ST7920_DELAY_3
-  #ifndef LCD_ST7920_DELAY_3
-    #define LCD_ST7920_DELAY_3 0
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 0
-  #endif
-  #ifndef CPU_ST7920_DELAY_3
-    #define CPU_ST7920_DELAY_3 0
-  #endif
-  #if LCD_ST7920_DELAY_3 || BOARD_ST7920_DELAY_3 || CPU_ST7920_DELAY_3
-    #define ST7920_DELAY_3 DELAY_NS(_MAX(LCD_ST7920_DELAY_3, BOARD_ST7920_DELAY_3, CPU_ST7920_DELAY_3))
+  #ifdef BOARD_ST7920_DELAY_3
+    #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
   #else
-    #define ST7920_DELAY_3
+    #define ST7920_DELAY_3 CPU_ST7920_DELAY_3
   #endif
 #endif
 
+// Optimize this code with -O3
+#pragma GCC optimize (3)
+
 #ifdef ARDUINO_ARCH_STM32F1
   #define ST7920_DAT(V) !!((V) & 0x80)
 #else
   #define ST7920_DAT(V) ((V) & 0x80)
 #endif
-
 #define ST7920_SND_BIT do{ \
   WRITE(ST7920_CLK_PIN, LOW);             ST7920_DELAY_1; \
   WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 05aa9f0..05da343 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -30,10 +30,7 @@
 
 #include "dwin.h"
 
-//#define USE_STRING_HEADINGS
-//#define USE_STRING_TITLES
-
-#if ENABLED(LCD_BED_LEVELING) && DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
   #define HAS_ONESTEP_LEVELING 1
 #endif
 
@@ -97,8 +94,11 @@
 
 #define PAUSE_HEAT
 
+#define USE_STRING_HEADINGS
+//#define USE_STRING_TITLES
+
 #define MENU_CHAR_LIMIT  24
-#define STATUS_Y        354
+#define STATUS_Y        360
 
 // Print speed limit
 #define MIN_PRINT_SPEED  10
@@ -121,40 +121,27 @@
 #define DWIN_SCROLL_UPDATE_INTERVAL      SEC_TO_MS(2)
 #define DWIN_REMAIN_TIME_UPDATE_INTERVAL SEC_TO_MS(20)
 
-#define TROWS 6                         // Total rows
-constexpr uint16_t MROWS = TROWS - 1,   // Last Row Index
-                   TITLE_HEIGHT = 30,   // Title bar height
-                   MLINE = 53,          // Menu line height
-                   LBLX = 60,           // Menu item label X
+constexpr uint16_t TROWS = 6, MROWS = TROWS - 1,        // Total rows, and other-than-Back
+                   TITLE_HEIGHT = 30,                   // Title bar height
+                   MLINE = 53,                          // Menu line height
+                   LBLX = 60,                           // Menu item label X
                    MENU_CHR_W = 8, STAT_CHR_W = 10;
 
 #define MBASE(L) (49 + MLINE * (L))
-#define EBASE(L) (MBASE(L) - 2 * DISABLED(USE_STRING_TITLES))
 
 #define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, dwin_zoffset)
 
 #define DWIN_BOTTOM (DWIN_HEIGHT-1)
 #define DWIN_RIGHT (DWIN_WIDTH-1)
 
-// Value Init
+/* Value Init */
 HMI_value_t HMI_ValueStruct;
-HMI_flag_t HMI_flag{0};
+HMI_Flag_t HMI_flag{0};
 
 millis_t dwin_heat_time = 0;
 
 uint8_t checkkey = 0;
 
-enum SelectItem : uint8_t {
-  PAGE_PRINT = 0,
-  PAGE_PREPARE,
-  PAGE_CONTROL,
-  PAGE_INFO_LEVELING,
-
-  PRINT_SETUP = 0,
-  PRINT_PAUSE_RESUME,
-  PRINT_STOP
-};
-
 typedef struct {
   uint8_t now, last;
   void set(uint8_t v) { now = last = v; }
@@ -230,129 +217,177 @@ void HMI_ToggleLanguage() {
   #endif
 }
 
-typedef struct { uint16_t x, y, w, h; } icon_info_t;
-typedef struct { uint16_t x, y[2], w, h; } text_info_t;
-
-void ICON_Button(const bool here, const int iconid, const icon_info_t &ico, const text_info_t (&txt)[2]) {
-  const bool cn = HMI_IsChinese();
-  DWIN_ICON_Show(ICON, iconid + here, ico.x, ico.y);
-  if (here) DWIN_Draw_Rectangle(0, Color_White, ico.x, ico.y, ico.x + ico.w - 1, ico.y + ico.h - 1);
-  DWIN_Frame_AreaCopy(1, txt[cn].x, txt[cn].y[here], txt[cn].x + txt[cn].w - 1, txt[cn].y[here] + txt[cn].h - 1, ico.x + (ico.w - txt[cn].w) / 2, (ico.y + ico.h - 28) - txt[cn].h/2);
+void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  if (value < 0) {
+    DWIN_Draw_String(true, size, Color_White, bColor, x - 6, y, F("-"));
+    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, -value);
+  }
+  else {
+    DWIN_Draw_String(true, size, Color_White, bColor, x - 6, y, F(" "));
+    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value);
+  }
 }
 
-//
-// Main Menu: "Print"
-//
 void ICON_Print() {
-  constexpr icon_info_t ico = { 17, 110, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 1, { 417, 449 }, 30, 14 },
-    { 1, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_PRINT, ICON_Print_0, ico, txt);
+  if (select_page.now == 0) {
+    DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
+    DWIN_Draw_Rectangle(0, Color_White, 17, 130, 126, 229);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 58, 201);
+    else
+      DWIN_Frame_AreaCopy(1, 1, 451, 31, 463, 57, 201);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 58, 201);
+    else
+      DWIN_Frame_AreaCopy(1, 1, 423, 31, 435, 57, 201);
+  }
 }
 
-//
-// Main Menu: "Prepare"
-//
 void ICON_Prepare() {
-  constexpr icon_info_t ico = { 145, 110, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 33, { 417, 449 }, 51, 14 },
-    { 31, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_PREPARE, ICON_Prepare_0, ico, txt);
+  if (select_page.now == 1) {
+    DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
+    DWIN_Draw_Rectangle(0, Color_White, 145, 130, 254, 229);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 31, 447, 58, 460, 186, 201);
+    else
+      DWIN_Frame_AreaCopy(1, 33, 451, 82, 466, 175, 201);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 31, 405, 58, 420, 186, 201);
+    else
+      DWIN_Frame_AreaCopy(1, 33, 423, 82, 438, 175, 201);
+  }
 }
 
-//
-// Main Menu: "Control"
-//
 void ICON_Control() {
-  constexpr icon_info_t ico = { 17, 226, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 85, { 417, 449 }, 46, 14 },
-    { 61, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_CONTROL, ICON_Control_0, ico, txt);
+  if (select_page.now == 2) {
+    DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
+    DWIN_Draw_Rectangle(0, Color_White, 17, 246, 126, 345);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 61, 447, 88, 460, 58, 318);
+    else
+      DWIN_Frame_AreaCopy(1, 85, 451, 132, 463, 48, 318);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 61, 405, 88, 420, 58, 318);
+    else
+      DWIN_Frame_AreaCopy(1, 85, 423, 132, 434, 48, 318);
+  }
 }
 
-//
-// Main Menu: "Info"
-//
-void ICON_StartInfo() {
-  constexpr icon_info_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 133, { 417, 449 }, 23, 14 },
-    {  91, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Info_0, ico, txt);
+void ICON_StartInfo(bool show) {
+  if (show) {
+    DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
+    DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 91, 447, 118, 460, 186, 318);
+    else
+      DWIN_Frame_AreaCopy(1, 132, 451, 159, 466, 186, 318);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 91, 405, 118, 420, 186, 318);
+    else
+      DWIN_Frame_AreaCopy(1, 132, 423, 159, 435, 186, 318);
+  }
 }
 
-//
-// Main Menu: "Level"
-//
-void ICON_Leveling() {
-  constexpr icon_info_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    {  88, { 433, 464 }, 36, 14 },
-    { 211, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Leveling_0, ico, txt);
+void ICON_Leveling(bool show) {
+  if (show) {
+    DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
+    DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 211, 447, 238, 460, 186, 318);
+    else
+      DWIN_Frame_AreaCopy(1, 84, 437, 120,  449, 182, 318);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 211, 405, 238, 420, 186, 318);
+    else
+      DWIN_Frame_AreaCopy(1, 84, 465, 120, 478, 182, 318);
+  }
 }
 
-//
-// Printing: "Tune"
-//
 void ICON_Tune() {
-  constexpr icon_info_t ico = { 8, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    {   0, { 433, 464 }, 32, 14 },
-    { 121, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_print.now == PRINT_SETUP, ICON_Setup_0, ico, txt);
+  if (select_print.now == 0) {
+    DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
+    DWIN_Draw_Rectangle(0, Color_White, 8, 252, 87, 351);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 121, 447, 148, 458, 34, 325);
+    else
+      DWIN_Frame_AreaCopy(1,   0, 466,  34, 476, 31, 325);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 121, 405, 148, 420, 34, 325);
+    else
+      DWIN_Frame_AreaCopy(1,   0, 438,  32, 448, 31, 325);
+  }
 }
 
-//
-// Printing: "Pause"
-//
 void ICON_Pause() {
-  constexpr icon_info_t ico = { 96, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    { 157, { 417, 449 }, 39, 14 },
-    { 181, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Pause_0, ico, txt);
+  if (select_print.now == 1) {
+    DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
+    DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 181, 447, 208, 459, 124, 325);
+    else
+      DWIN_Frame_AreaCopy(1, 177, 451, 216, 462, 116, 325);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 181, 405, 208, 420, 124, 325);
+    else
+      DWIN_Frame_AreaCopy(1, 177, 423, 215, 433, 116, 325);
+  }
 }
 
-//
-// Printing: "Resume"
-//
-void ICON_Resume() {
-  constexpr icon_info_t ico = { 96, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    { 33, { 433, 464 }, 53, 14 },
-    {  1, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Continue_0, ico, txt);
+void ICON_Continue() {
+  if (select_print.now == 1) {
+    DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
+    DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 124, 325);
+    else
+      DWIN_Frame_AreaCopy(1, 1, 452, 32, 464, 121, 325);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 124, 325);
+    else
+      DWIN_Frame_AreaCopy(1, 1, 424, 31, 434, 121, 325);
+  }
 }
 
-void ICON_ResumeOrPause() {
-  if (printingIsPaused() || HMI_flag.pause_flag || HMI_flag.pause_action)
-    ICON_Resume();
-  else
-    ICON_Pause();
-}
-
-//
-// Printing: "Stop"
-//
 void ICON_Stop() {
-  constexpr icon_info_t ico = { 184, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    { 196, { 417, 449 }, 29, 14 },
-    { 151, { 405, 447 }, 27, 12 }
-  };
-  ICON_Button(select_print.now == PRINT_STOP, ICON_Stop_0, ico, txt);
+  if (select_print.now == 2) {
+    DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
+    DWIN_Draw_Rectangle(0, Color_White, 184, 252, 263, 351);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 151, 447, 178, 459, 210, 325);
+    else
+      DWIN_Frame_AreaCopy(1, 218, 452, 249, 466, 209, 325);
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
+    if (HMI_IsChinese())
+      DWIN_Frame_AreaCopy(1, 151, 405, 178, 420, 210, 325);
+    else
+      DWIN_Frame_AreaCopy(1, 218, 423, 247, 436, 209, 325);
+  }
 }
 
 inline void Clear_Title_Bar() {
@@ -390,7 +425,7 @@ void Draw_More_Icon(const uint8_t line) {
 }
 
 void Draw_Menu_Cursor(const uint8_t line) {
-  //DWIN_ICON_Show(ICON, ICON_Rectangle, 0, MBASE(line) - 18);
+  // DWIN_ICON_Show(ICON,ICON_Rectangle, 0, MBASE(line) - 18);
   DWIN_Draw_Rectangle(1, Rectangle_Color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
 }
 
@@ -439,38 +474,27 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const
   DWIN_Draw_Line(Line_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 34);
 }
 
-void Draw_Menu_LineF(const uint8_t line, const uint8_t icon=0, const __FlashStringHelper *label=nullptr, bool more=false) {
-  Draw_Menu_Line(line, icon, (char*)label, more);
+void Draw_Chkb_Line(const uint8_t line, const bool mode) {
+  DWIN_Draw_Checkbox(Color_White, Color_Bg_Black, 225, MBASE(line) - 1, mode);
 }
 
-void Draw_Checkbox_Line(const uint8_t line, const bool ison) {
-  const uint16_t x = 225, y = EBASE(line) - 2;
-  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x + 5, y, F(ison ? "X" : " "));
-  DWIN_Draw_Rectangle(0, Color_White, x + 2, y + 2, x + 16, y + 16);
-}
-
-// AreaCopy for a Menu Item
-void Item_AreaCopy(const uint16_t x1, const uint16_t y1, const uint16_t x2, const uint16_t y2, const uint8_t row=0, const uint16_t inset=0, const uint16_t yadd=0) {
-  DWIN_Frame_AreaCopy(1, x1, y1, x2, y2, LBLX + inset, MBASE(row) + yadd);
-}
-
-// AreaCopy for a Screen Title
-void DWIN_Frame_TitleCopy(const uint16_t x1, const uint16_t y1, const uint16_t w, const uint16_t h) {
-  DWIN_Frame_AreaCopy(1, x1, y1, x1 + w - 1, y1 + h - 1, (DWIN_WIDTH - w) / 2, (TITLE_HEIGHT - h) / 2);
+// The "Back" label is always on the first line
+void Draw_Back_Label() {
+  if (HMI_IsChinese())
+    DWIN_Frame_AreaCopy(1, 129, 72, 156, 84, LBLX, MBASE(0));
+  else
+    DWIN_Frame_AreaCopy(1, 226, 179, 256, 189, LBLX, MBASE(0));
 }
 
 // Draw "Back" line at the top
 void Draw_Back_First(const bool is_sel=true) {
   Draw_Menu_Line(0, ICON_Back);
-  if (HMI_IsChinese())
-    Item_AreaCopy(129,  72, 156,  84);
-  else
-    Item_AreaCopy(223, 179, 254, 189);
+  Draw_Back_Label();
   if (is_sel) Draw_Menu_Cursor(0);
 }
 
 template <typename T>
-inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
+inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref) {
   if (encoder_diffState == ENCODER_DIFF_CW)
     valref += EncoderRate.encoderMoveValue;
   else if (encoder_diffState == ENCODER_DIFF_CCW)
@@ -481,7 +505,6 @@ inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
 //
 // Draw Menus
 //
-#define CASE_BACK          0
 
 #define MOTION_CASE_RATE   1
 #define MOTION_CASE_ACCEL  2
@@ -539,114 +562,42 @@ inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
 // Draw Menus
 //
 
-void say_move_en(const uint8_t row) {
-  Item_AreaCopy( 69,  61, 102,  71, row);         // "Move"
+void DWIN_Draw_Label(const uint16_t y, char *string) {
+  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, LBLX, y, string);
 }
-void say_max_en(const uint8_t row) {
-  Item_AreaCopy( 75, 119, 100, 129, row);         // "Max"
-}
-void say_jerk_en(const uint8_t row) {
-  Item_AreaCopy(104, 119, 128, 129, row, 30);     // "Jerk"
-}
-void say_speed_en(const uint16_t inset, const uint8_t row) {
-  Item_AreaCopy(133, 119, 172, 132, row, inset);  // "Speed"
-}
-void say_max_accel_en(const uint8_t row) {
-   say_max_en(row);                               // "Max"
-   Item_AreaCopy(  0, 135,  79, 145, row, 30);    // "Acceleration"
-}
-void say_max_jerk_speed_en(const uint8_t row) {
-  Item_AreaCopy( 75, 119, 172, 132, row);         // "Max Jerk Speed"
-}
-void say_x_en(const uint16_t inset, const uint8_t row) {
-  Item_AreaCopy(175, 119, 184, 129, row, inset);  // "X"
-}
-void say_y_en(const uint16_t inset, const uint8_t row) {
-  Item_AreaCopy(184, 119, 192, 129, row, inset);  // "Y"
-}
-void say_z_en(const uint16_t inset, const uint8_t row) {
-  Item_AreaCopy(193, 119, 201, 129, row, inset);  // "Z"
-}
-void say_e_en(const uint16_t inset, const uint8_t row) {
-  Item_AreaCopy(201, 119, 209, 129, row, inset);  // "E"
-}
-void say_pla_en(const uint16_t inset, const uint8_t row) {
-  Item_AreaCopy(131, 164, 153, 174, row, inset);  // "PLA"
-}
-void say_abs_en(const uint16_t inset, const uint8_t row) {
-  Item_AreaCopy(157,  76, 181,  86, row, inset);  // "ABS"
-}
-void say_home_offs_en(const uint8_t row) {
-  Item_AreaCopy(153, 193, 225, 203, row);         // "Home Offset"
-}
-void say_probe_offs_en(const uint8_t row) {
-  Item_AreaCopy(153, 205, 225, 215, row);         // "Probe Offset"
-}
-void say_steps_per_mm_en(const uint8_t row) {
-  Item_AreaCopy(  1, 151,  91, 161, row);         // "Steps-per-mm"
+void DWIN_Draw_Label(const uint16_t y, const __FlashStringHelper *title) {
+  DWIN_Draw_Label(y, (char*)title);
 }
 
-void DWIN_Draw_Label(const uint8_t row, char *string) {
-  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(row), string);
-}
-void DWIN_Draw_Label(const uint8_t row, const __FlashStringHelper *title) {
-  DWIN_Draw_Label(row, (char*)title);
+void draw_move_en(const uint16_t line) {
+  #ifdef USE_STRING_TITLES
+    DWIN_Draw_Label(line, F("Move"));
+  #else
+    DWIN_Frame_AreaCopy(1, 69, 61, 102, 71, LBLX, line); // "Move"
+  #endif
 }
 
-void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
-  DWIN_Draw_String(true, size, Color_White, bColor, x - 8, y, value < 0 ? F("-") : F(" "));
-  DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value < 0 ? -value : value);
+inline void DWIN_Frame_TitleCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
+  DWIN_Frame_AreaCopy(id, x1, y1, x2, y2, 14, 8);
 }
 
-void Draw_Edit_Integer3(const uint8_t row, const uint16_t value, const bool active=false) {
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, 220, EBASE(row), value);
-}
-
-void Draw_Edit_Integer4(const uint8_t row, const uint16_t value, const bool active=false) {
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 4, 220 - 1 * 8, EBASE(row), value);
-}
-
-void Draw_Edit_Float3(const uint8_t row, const uint16_t value, const bool active=false) {
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), (int32_t)value);
-}
-
-void Draw_Edit_Signed_Float2(const uint8_t row, const float value, const bool active=false) {
-  DWIN_Draw_Signed_Float(font8x16, active ? Select_Color : Color_Bg_Black, 2, UNITFDIGITS, 220 + 8 - UNITFDIGITS * 8, EBASE(row), value);
-}
-
-void Draw_Edit_Signed_Float3(const uint8_t row, const float value, const bool active=false) {
-  DWIN_Draw_Signed_Float(font8x16, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), value);
-}
-
-void Draw_Stat_Int(const uint16_t xpos, const uint16_t ypos, const uint16_t value) {
-  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, xpos, ypos, value);
-}
-
-void Draw_Stat_Float(const uint16_t xpos, const uint16_t ypos, const float value) {
-  DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, xpos, ypos, value);
-}
-
-//
-// Prepare Menu
-//
-
 void Item_Prepare_Move(const uint8_t row) {
   if (HMI_IsChinese())
-    Item_AreaCopy(159, 70, 200, 84, row);
+    DWIN_Frame_AreaCopy(1, 159, 70, 200, 84, LBLX, MBASE(row));
   else
-    say_move_en(row);             // "Move"
+    draw_move_en(MBASE(row)); // "Move"
   Draw_Menu_Line(row, ICON_Axis);
   Draw_More_Icon(row);
 }
 
 void Item_Prepare_Disable(const uint8_t row) {
   if (HMI_IsChinese())
-    Item_AreaCopy(204, 70, 259, 82, row);
+    DWIN_Frame_AreaCopy(1, 204, 70, 259, 82, LBLX, MBASE(row));
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, GET_TEXT_F(MSG_DISABLE_STEPPERS));
+      DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_DISABLE_STEPPERS));
     #else
-      Item_AreaCopy(104, 61, 191, 74, row); // "Disable Stepper"
+      DWIN_Frame_AreaCopy(1, 103, 59, 200, 74, LBLX, MBASE(row)); // "Disable Stepper"
     #endif
   }
   Draw_Menu_Line(row, ICON_CloseMotor);
@@ -654,12 +605,12 @@ void Item_Prepare_Disable(const uint8_t row) {
 
 void Item_Prepare_Home(const uint8_t row) {
   if (HMI_IsChinese())
-    Item_AreaCopy(0, 89, 41, 101, row);
+    DWIN_Frame_AreaCopy(1, 0, 89, 41, 101, LBLX, MBASE(row));
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, GET_TEXT_F(MSG_AUTO_HOME));
+      DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_AUTO_HOME));
     #else
-      Item_AreaCopy(202, 61, 271, 71, row); // "Auto Home"
+      DWIN_Frame_AreaCopy(1, 202, 61, 271, 71, LBLX, MBASE(row)); // "Auto Home"
     #endif
   }
   Draw_Menu_Line(row, ICON_Homing);
@@ -670,27 +621,28 @@ void Item_Prepare_Home(const uint8_t row) {
   void Item_Prepare_Offset(const uint8_t row) {
     if (HMI_IsChinese()) {
       #if HAS_BED_PROBE
-        Item_AreaCopy(174, 164, 223, 177, row);
+        DWIN_Frame_AreaCopy(1, 174, 164, 223, 177, LBLX, MBASE(row));
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(row), probe.offset.z * 100);
       #else
-        Item_AreaCopy(43, 89, 98, 101, row);
+        DWIN_Frame_AreaCopy(1, 43, 89, 98, 101, LBLX, MBASE(row));
       #endif
     }
     else {
       #if HAS_BED_PROBE
         #ifdef USE_STRING_TITLES
-          DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
+          DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
         #else
-          Item_AreaCopy( 94, 179, 143, 190, row); // "Z-Offset"
+          DWIN_Frame_AreaCopy(1, 93, 179, 141, 189, LBLX, MBASE(row));    // "Z-Offset"
         #endif
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(row), probe.offset.z * 100);
       #else
         #ifdef USE_STRING_TITLES
-          DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
+          DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_SET_HOME_OFFSETS));
         #else
-          Item_AreaCopy(  1,  76, 103,  87, row); // "Set home offsets"
+          DWIN_Frame_AreaCopy(1, 1, 76, 106, 86, LBLX, MBASE(row));       // "Set home offsets"
         #endif
       #endif
     }
-    Draw_Edit_Signed_Float2(row, BABY_Z_VAR * 100);
     Draw_Menu_Line(row, ICON_SetHome);
   }
 
@@ -698,28 +650,30 @@ void Item_Prepare_Home(const uint8_t row) {
 
 #if HAS_HOTEND
   void Item_Prepare_PLA(const uint8_t row) {
-    if (HMI_IsChinese())
-      Item_AreaCopy(100, 89, 151, 101, row);
+    if (HMI_IsChinese()) {
+      DWIN_Frame_AreaCopy(1, 100, 89, 151, 101, LBLX, MBASE(row));
+    }
     else {
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(row, GET_TEXT_F(MSG_PREHEAT_1));
+        DWIN_Draw_Label(MBASE(row), F("Preheat " PREHEAT_1_LABEL));
       #else
-        Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
-        say_pla_en(52, row);                    // "PLA"
+        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(row));       // "Preheat"
+        DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX + 52, MBASE(row));  // "PLA"
       #endif
     }
     Draw_Menu_Line(row, ICON_PLAPreheat);
   }
 
   void Item_Prepare_ABS(const uint8_t row) {
-    if (HMI_IsChinese())
-      Item_AreaCopy(180,  89, 233, 100, row);
+    if (HMI_IsChinese()) {
+      DWIN_Frame_AreaCopy(1, 180, 89, 233, 100, LBLX, MBASE(row));
+    }
     else {
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(row, F("Preheat " PREHEAT_2_LABEL));
+        DWIN_Draw_Label(MBASE(row), F("Preheat " PREHEAT_2_LABEL));
       #else
-        Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
-        say_abs_en(52, row);                    // "ABS"
+        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(row));       // "Preheat"
+        DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX + 52, MBASE(row));  // "ABS"
       #endif
     }
     Draw_Menu_Line(row, ICON_ABSPreheat);
@@ -729,12 +683,12 @@ void Item_Prepare_Home(const uint8_t row) {
 #if HAS_PREHEAT
   void Item_Prepare_Cool(const uint8_t row) {
     if (HMI_IsChinese())
-      Item_AreaCopy(1, 104,  56, 117, row);
+      DWIN_Frame_AreaCopy(1,   1, 104,  56, 117, LBLX, MBASE(row));
     else {
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(row, GET_TEXT_F(MSG_COOLDOWN));
+        DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_COOLDOWN));
       #else
-        Item_AreaCopy(200, 76, 264, 86, row); // "Cooldown"
+        DWIN_Frame_AreaCopy(1, 200,  76, 264,  86, LBLX, MBASE(row));      // "Cooldown"
       #endif
     }
     Draw_Menu_Line(row, ICON_Cool);
@@ -743,38 +697,37 @@ void Item_Prepare_Home(const uint8_t row) {
 
 void Item_Prepare_Lang(const uint8_t row) {
   if (HMI_IsChinese())
-    Item_AreaCopy(239, 134, 266, 146, row);
+    DWIN_Frame_AreaCopy(1, 239, 134, 266, 146, LBLX, MBASE(row));
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, F("UI Language"));
+      DWIN_Draw_Label(MBASE(row), F("UI Language"));
     #else
-      Item_AreaCopy(1, 194, 96, 206, row);    // "LCD Language"
+      DWIN_Frame_AreaCopy(1, 0, 194, 121, 207, LBLX, MBASE(row)); // "Language selection"
     #endif
   }
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 226, EBASE(row), HMI_IsChinese() ? F("CN") : F("EN"));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 226, MBASE(row), HMI_IsChinese() ? F("CN") : F("EN"));
   Draw_Menu_Icon(row, ICON_Language);
 }
 
-#define VISI(T,L,S) (WITHIN(L, T - MROWS, MROWS) || WITHIN(S, 0, MROWS))
-
 void Draw_Prepare_Menu() {
   Clear_Main_Window();
 
   const int16_t scroll = MROWS - index_prepare; // Scrolled-up lines
   #define PSCROL(L) (scroll + (L))
-  #define PVISI(L) VISI(PREPARE_CASE_TOTAL, L, PSCROL(L))
+  #define PVISI(L)  WITHIN(PSCROL(L), 0, MROWS)
 
-  if (HMI_IsChinese())
-    DWIN_Frame_TitleCopy(133, 1, 28, 13);   // "Prepare"
+  if (HMI_IsChinese()) {
+    DWIN_Frame_TitleCopy(1, 133, 1, 160, 13);   // "Prepare"
+  }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_PREPARE));
     #else
-      DWIN_Frame_TitleCopy(179, 0, 48, 14); // "Prepare"
+      DWIN_Frame_TitleCopy(1, 178, 2, 229, 14); // "Prepare"
     #endif
   }
 
-  if (PVISI(0)) Draw_Back_First(select_prepare.now == CASE_BACK);                 // < Back
+  if (PVISI(0)) Draw_Back_First(select_prepare.now == 0);                         // < Back
   if (PVISI(PREPARE_CASE_MOVE)) Item_Prepare_Move(PSCROL(PREPARE_CASE_MOVE));     // Move >
   if (PVISI(PREPARE_CASE_DISA)) Item_Prepare_Disable(PSCROL(PREPARE_CASE_DISA));  // Disable Stepper
   if (PVISI(PREPARE_CASE_HOME)) Item_Prepare_Home(PSCROL(PREPARE_CASE_HOME));     // Auto Home
@@ -790,129 +743,85 @@ void Draw_Prepare_Menu() {
   #endif
   if (PVISI(PREPARE_CASE_LANG)) Item_Prepare_Lang(PSCROL(PREPARE_CASE_LANG));     // Language CN/EN
 
-  if (select_prepare.now != CASE_BACK) Draw_Menu_Cursor(PSCROL(select_prepare.now));
+  if (select_prepare.now) Draw_Menu_Cursor(PSCROL(select_prepare.now));
 }
 
-//
-// Control Menu
-//
-
-void Item_Control_Temp(const uint16_t row) {
+void Item_Control_Info(const uint16_t line) {
   if (HMI_IsChinese())
-    Item_AreaCopy(57, 104,  84, 116, row);
+    DWIN_Frame_AreaCopy(1, 231, 104, 258, 116, LBLX, line);
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, GET_TEXT_F(MSG_TEMPERATURE));
+      DWIN_Draw_Label(line, F("Info"));
     #else
-      Item_AreaCopy(1, 89,  83, 101, row);
+      DWIN_Frame_AreaCopy(1, 0, 104, 24, 114, LBLX, line);
     #endif
   }
-  Draw_Menu_Line(row, ICON_Temperature);
-  Draw_More_Icon(row);
-}
-
-void Item_Control_Motion(const uint16_t row) {
-  if (HMI_IsChinese())
-    Item_AreaCopy(87, 104, 114, 116, row);
-  else {
-    #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, GET_TEXT_F(MSG_MOTION));
-    #else
-      Item_AreaCopy(84, 89, 128,  99, row);
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_Motion);
-  Draw_More_Icon(row);
-}
-
-void Item_Control_Advanced(const uint16_t row) {
-  if (HMI_IsChinese())
-    Item_AreaCopy(62, 180, 120, 192, row);
-  else {
-    #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, GET_TEXT_F(MSG_ADVANCED_SETTINGS));
-    #else
-      Item_AreaCopy(82, 135, 200, 149, row);
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_AdvSet);
-  Draw_More_Icon(row);
-}
-
-void Item_Control_Info(const uint16_t row) {
-  if (HMI_IsChinese())
-    Item_AreaCopy(231, 104, 258, 116, row);
-  else {
-    #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, GET_TEXT_F(MSG_INFO_SCREEN));
-    #else
-      Item_AreaCopy(0, 104, 24, 114, row);
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_Info);
-  Draw_More_Icon(row);
 }
 
 void Draw_Control_Menu() {
   Clear_Main_Window();
 
-  #if CONTROL_CASE_TOTAL >= TROWS
+  #if CONTROL_CASE_TOTAL >= 6
     const int16_t scroll = MROWS - index_control; // Scrolled-up lines
+    #define CSCROL(L) (scroll + (L))
   #else
-    constexpr int16_t scroll = 0;
+    #define CSCROL(L) (L)
   #endif
-  #define CSCROL(L) (scroll + (L))
-  #define CLINE(L) MBASE(CSCROL(L))
-  #define CVISI(L) VISI(CONTROL_CASE_TOTAL, L, CSCROL(L))
+  #define CLINE(L)  MBASE(CSCROL(L))
+  #define CVISI(L)  WITHIN(CSCROL(L), 0, MROWS)
 
-  if (HMI_IsChinese())
-    DWIN_Frame_TitleCopy(103, 1, 28, 14);     // "Control"
+  if (CVISI(0)) Draw_Back_First(select_control.now == 0);                         // < Back
+
+  if (HMI_IsChinese()) {
+    DWIN_Frame_TitleCopy(1, 103, 1, 130, 14);                                     // "Control"
+
+    DWIN_Frame_AreaCopy(1,  57, 104,  84, 116, LBLX, CLINE(CONTROL_CASE_TEMP));   // Temperature >
+    DWIN_Frame_AreaCopy(1,  87, 104, 114, 116, LBLX, CLINE(CONTROL_CASE_MOVE));   // Motion >
+
+    #if ENABLED(EEPROM_SETTINGS)
+      DWIN_Frame_AreaCopy(1, 117, 104, 172, 116, LBLX, CLINE(CONTROL_CASE_SAVE));   // Store Configuration
+      DWIN_Frame_AreaCopy(1, 174, 103, 229, 116, LBLX, CLINE(CONTROL_CASE_LOAD));   // Read Configuration
+      DWIN_Frame_AreaCopy(1,   1, 118,  56, 131, LBLX, CLINE(CONTROL_CASE_RESET));  // Reset Configuration
+    #endif
+  }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_CONTROL));
     #else
-      DWIN_Frame_TitleCopy(128, 2, 49, 11);   // "Control"
+      DWIN_Frame_TitleCopy(1, 128, 2, 176, 12);                                         // "Control"
     #endif
-  }
-
-  if (CVISI(0)) Draw_Back_First(select_control.now == CASE_BACK);               // < Back
-  if (CVISI(CONTROL_CASE_TEMP)) Item_Control_Temp(CSCROL(CONTROL_CASE_TEMP));   // Temperature >
-  if (CVISI(CONTROL_CASE_MOVE)) Item_Control_Motion(CSCROL(CONTROL_CASE_MOVE)); // Motion >
-
-  if (HMI_IsChinese()) {
-    #if ENABLED(EEPROM_SETTINGS)
-      Item_AreaCopy(117, 104, 172, 116, CSCROL(CONTROL_CASE_SAVE));   // "Store Configuration"
-      Item_AreaCopy(174, 103, 229, 116, CSCROL(CONTROL_CASE_LOAD));   // "Read Configuration"
-      Item_AreaCopy(  1, 118,  56, 131, CSCROL(CONTROL_CASE_RESET));  // "Reset Configuration"
-    #endif
-  }
-  else {
     #ifdef USE_STRING_TITLES
+      if (CVISI(CONTROL_CASE_TEMP)) DWIN_Draw_Label(CLINE(CONTROL_CASE_TEMP), GET_TEXT_F(MSG_TEMPERATURE));
+      if (CVISI(CONTROL_CASE_MOVE)) DWIN_Draw_Label(CLINE(CONTROL_CASE_MOVE), GET_TEXT_F(MSG_MOTION));
       #if ENABLED(EEPROM_SETTINGS)
-        if (CVISI(CONTROL_CASE_SAVE)) DWIN_Draw_Label(CSCROL(CONTROL_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));        // "Store Configuration"
-        if (CVISI(CONTROL_CASE_LOAD)) DWIN_Draw_Label(CSCROL(CONTROL_CASE_LOAD), GET_TEXT_F(MSG_LOAD_EEPROM));         // "Read Configuration"
-        if (CVISI(CONTROL_CASE_RESET)) DWIN_Draw_Label(CSCROL(CONTROL_CASE_RESET), GET_TEXT_F(MSG_RESTORE_DEFAULTS));  // "Reset Configuration"
+        if (CVISI(CONTROL_CASE_SAVE)) DWIN_Draw_Label(CLINE(CONTROL_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));
+        if (CVISI(CONTROL_CASE_LOAD)) DWIN_Draw_Label(CLINE(CONTROL_CASE_LOAD), GET_TEXT_F(MSG_LOAD_EEPROM));
+        if (CVISI(CONTROL_CASE_RESET)) DWIN_Draw_Label(CLINE(CONTROL_CASE_RESET), GET_TEXT_F(MSG_RESTORE_DEFAULTS));
       #endif
     #else
+      if (CVISI(CONTROL_CASE_TEMP)) DWIN_Frame_AreaCopy(1,  1, 89,  83, 101, LBLX, CLINE(CONTROL_CASE_TEMP));           // Temperature >
+      if (CVISI(CONTROL_CASE_MOVE)) DWIN_Frame_AreaCopy(1, 84, 89, 128,  99, LBLX, CLINE(CONTROL_CASE_MOVE));           // Motion >
       #if ENABLED(EEPROM_SETTINGS)
-        if (CVISI(CONTROL_CASE_SAVE))
-          Item_AreaCopy(150,  89, 263, 102, CSCROL(CONTROL_CASE_SAVE));       // "Store Configuration"
+        if (CVISI(CONTROL_CASE_SAVE)) DWIN_Frame_AreaCopy(1, 148,  89, 268, 101, LBLX     , CLINE(CONTROL_CASE_SAVE));  // "Store Configuration"
         if (CVISI(CONTROL_CASE_LOAD)) {
-          Item_AreaCopy( 26, 104,  57, 114, CSCROL(CONTROL_CASE_LOAD));       // "Read"
-          Item_AreaCopy(182,  89, 263, 102, CSCROL(CONTROL_CASE_LOAD), 34);   // "Configuration"
+          DWIN_Frame_AreaCopy(1,  26, 104,  57, 114, LBLX     , CLINE(CONTROL_CASE_LOAD));  // "Read"
+          DWIN_Frame_AreaCopy(1, 182,  89, 268, 101, LBLX + 34, CLINE(CONTROL_CASE_LOAD));  // "Configuration"
         }
         if (CVISI(CONTROL_CASE_RESET)) {
-          Item_AreaCopy( 59, 104,  93, 114, CSCROL(CONTROL_CASE_RESET));      // "Reset"
-          Item_AreaCopy(182,  89, 263, 102, CSCROL(CONTROL_CASE_RESET), 37);  // "Configuration"
+          DWIN_Frame_AreaCopy(1,  59, 104,  93, 114, LBLX     , CLINE(CONTROL_CASE_RESET)); // "Reset"
+          DWIN_Frame_AreaCopy(1, 182,  89, 268, 101, LBLX + 37, CLINE(CONTROL_CASE_RESET)); // "Configuration"
         }
       #endif
     #endif
   }
 
-  if (CVISI(CONTROL_CASE_ADVSET)) Item_Control_Advanced(CSCROL(CONTROL_CASE_ADVSET));
-  if (CVISI(CONTROL_CASE_INFO)) Item_Control_Info(CSCROL(CONTROL_CASE_INFO));
+  if (CVISI(CONTROL_CASE_ADVSET)) {
+    DWIN_Draw_Label(CLINE(CONTROL_CASE_ADVSET), GET_TEXT_F(MSG_ADVANCED_SETTINGS));  // Advanced Settings
+  }
 
-  if (select_control.now != CASE_BACK && CVISI(select_control.now))
+  if (CVISI(CONTROL_CASE_INFO)) Item_Control_Info(CLINE(CONTROL_CASE_INFO));
+
+  if (select_control.now && CVISI(select_control.now))
     Draw_Menu_Cursor(CSCROL(select_control.now));
 
   // Draw icons and lines
@@ -925,140 +834,169 @@ void Draw_Control_Menu() {
     } \
   } while(0)
 
+  _TEMP_ICON(CONTROL_CASE_TEMP, ICON_Temperature, true);
+  _TEMP_ICON(CONTROL_CASE_MOVE, ICON_Motion, true);
+
   #if ENABLED(EEPROM_SETTINGS)
     _TEMP_ICON(CONTROL_CASE_SAVE, ICON_WriteEEPROM, false);
     _TEMP_ICON(CONTROL_CASE_LOAD, ICON_ReadEEPROM, false);
     _TEMP_ICON(CONTROL_CASE_RESET, ICON_ResumeEEPROM, false);
   #endif
-}
 
-//
-// Tune Menu
-//
+  _TEMP_ICON(CONTROL_CASE_ADVSET, ICON_AdvSet, true);
+  _TEMP_ICON(CONTROL_CASE_INFO, ICON_Info, true);
+}
 
 void Draw_Tune_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(73, 2, 28, 12);       // "Tune"
-    Item_AreaCopy(116, 164, 171, 176, TUNE_CASE_SPEED);
+    DWIN_Frame_TitleCopy(1, 73, 2, 100, 13);
+    DWIN_Frame_AreaCopy(1, 116, 164, 171, 176, LBLX, MBASE(TUNE_CASE_SPEED));
     #if HAS_HOTEND
-      Item_AreaCopy(1, 134, 56, 146, TUNE_CASE_TEMP);
+      DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX, MBASE(TUNE_CASE_TEMP));
     #endif
     #if HAS_HEATED_BED
-      Item_AreaCopy(58, 134, 113, 146, TUNE_CASE_BED);
+      DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX, MBASE(TUNE_CASE_BED));
     #endif
     #if HAS_FAN
-      Item_AreaCopy(115, 134, 170, 146, TUNE_CASE_FAN);
+      DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX, MBASE(TUNE_CASE_FAN));
     #endif
     #if HAS_ZOFFSET_ITEM
-      Item_AreaCopy(174, 164, 223, 177, TUNE_CASE_ZOFF);
+      DWIN_Frame_AreaCopy(1, 174, 164, 223, 177, LBLX, MBASE(TUNE_CASE_ZOFF));
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_TUNE));
     #else
-      DWIN_Frame_TitleCopy(94, 2, 33, 11);    // "Tune"
+      DWIN_Frame_AreaCopy(1, 94, 2, 126, 12, 14, 9);
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(TUNE_CASE_SPEED, GET_TEXT_F(MSG_SPEED));
+      DWIN_Draw_Label(MBASE(TUNE_CASE_SPEED), GET_TEXT_F(MSG_SPEED));
       #if HAS_HOTEND
-        DWIN_Draw_Label(TUNE_CASE_TEMP, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
+        DWIN_Draw_Label(MBASE(TUNE_CASE_TEMP), GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
       #endif
       #if HAS_HEATED_BED
-        DWIN_Draw_Label(TUNE_CASE_BED, GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
+        DWIN_Draw_Label(MBASE(TUNE_CASE_BED), GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
       #endif
       #if HAS_FAN
-        DWIN_Draw_Label(TUNE_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
+        DWIN_Draw_Label(MBASE(TUNE_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
       #endif
-      DWIN_Draw_Label(TUNE_CASE_ZOFF, GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
+      DWIN_Draw_Label(MBASE(TUNE_CASE_ZOFF), GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
     #else
-      Item_AreaCopy(1, 179, 92, 190, TUNE_CASE_SPEED);          // "Print speed"
+      DWIN_Frame_TitleCopy(1, 94, 2, 126, 12);
+      DWIN_Frame_AreaCopy(1, 1, 179, 92, 190, LBLX, MBASE(TUNE_CASE_SPEED));      // Print speed
       #if HAS_HOTEND
-        Item_AreaCopy(197, 104, 238, 114, TUNE_CASE_TEMP);      // "Hotend"
-        Item_AreaCopy(  1,  89,  83, 101, TUNE_CASE_TEMP, 44);  // "Temperature"
+        DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX, MBASE(TUNE_CASE_TEMP));  // Hotend...
+        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 44, MBASE(TUNE_CASE_TEMP)); // ...Temperature
       #endif
       #if HAS_HEATED_BED
-        Item_AreaCopy(240, 104, 264, 114, TUNE_CASE_BED);       // "Bed"
-        Item_AreaCopy(  1,  89,  83, 101, TUNE_CASE_BED, 27);   // "Temperature"
+        DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX, MBASE(TUNE_CASE_BED));   // Bed...
+        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 27, MBASE(TUNE_CASE_BED));  // ...Temperature
       #endif
       #if HAS_FAN
-        Item_AreaCopy(0, 119, 64, 132, TUNE_CASE_FAN);          // "Fan speed"
+        DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX, MBASE(TUNE_CASE_FAN));      // Fan speed
       #endif
       #if HAS_ZOFFSET_ITEM
-        Item_AreaCopy(93, 179, 141, 189, TUNE_CASE_ZOFF);       // "Z-offset"
+        DWIN_Frame_AreaCopy(1, 93, 179, 141, 189, LBLX, MBASE(TUNE_CASE_ZOFF));   // Z-offset
       #endif
     #endif
   }
 
-  Draw_Back_First(select_tune.now == CASE_BACK);
-  if (select_tune.now != CASE_BACK) Draw_Menu_Cursor(select_tune.now);
+  Draw_Back_First(select_tune.now == 0);
+  if (select_tune.now) Draw_Menu_Cursor(select_tune.now);
 
   Draw_Menu_Line(TUNE_CASE_SPEED, ICON_Speed);
-  Draw_Edit_Integer3(TUNE_CASE_SPEED, feedrate_percentage);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_SPEED), feedrate_percentage);
 
   #if HAS_HOTEND
     Draw_Menu_Line(TUNE_CASE_TEMP, ICON_HotendTemp);
-    Draw_Edit_Integer3(TUNE_CASE_TEMP, thermalManager.degTargetHotend(0));
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_TEMP), thermalManager.degTargetHotend(0));
   #endif
   #if HAS_HEATED_BED
     Draw_Menu_Line(TUNE_CASE_BED, ICON_BedTemp);
-    Draw_Edit_Integer3(TUNE_CASE_BED, thermalManager.degTargetBed());
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_BED), thermalManager.degTargetBed());
   #endif
   #if HAS_FAN
     Draw_Menu_Line(TUNE_CASE_FAN, ICON_FanSpeed);
-    Draw_Edit_Integer3(TUNE_CASE_FAN, thermalManager.fan_speed[0]);
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_FAN), thermalManager.fan_speed[0]);
   #endif
   #if HAS_ZOFFSET_ITEM
     Draw_Menu_Line(TUNE_CASE_ZOFF, ICON_Zoffset);
-    Draw_Edit_Signed_Float2(TUNE_CASE_ZOFF, BABY_Z_VAR * 100);
+    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(TUNE_CASE_ZOFF), BABY_Z_VAR * 100);
   #endif
 }
 
-//
-// Motion Menu
-//
+void draw_max_en(const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 245, 119, 269, 129, LBLX, line);   // "Max"
+}
+void draw_max_accel_en(const uint16_t line) {
+  draw_max_en(line);
+  DWIN_Frame_AreaCopy(1, 1, 135, 79, 145, LBLX + 27, line); // "Acceleration"
+}
+void draw_speed_en(const uint16_t inset, const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 184, 119, 224, 132, LBLX + inset, line); // "Speed"
+}
+void draw_jerk_en(const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 64, 119, 106, 129, LBLX + 27, line); // "Jerk"
+}
+void draw_steps_per_mm(const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 1, 151, 101, 161, LBLX, line);   // "Steps-per-mm"
+}
+void say_x(const uint16_t inset, const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 95, 104, 102, 114, LBLX + inset, line); // "X"
+}
+void say_y(const uint16_t inset, const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 104, 104, 110, 114, LBLX + inset, line); // "Y"
+}
+void say_z(const uint16_t inset, const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 112, 104, 120, 114, LBLX + inset, line); // "Z"
+}
+void say_e(const uint16_t inset, const uint16_t line) {
+  DWIN_Frame_AreaCopy(1, 237, 119, 244, 129, LBLX + inset, line); // "E"
+}
+
 void Draw_Motion_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 16, 28, 13);                        // "Motion"
-    Item_AreaCopy(173, 133, 228, 147, MOTION_CASE_RATE);        // Max speed
-    Item_AreaCopy(173, 133, 200, 147, MOTION_CASE_ACCEL);       // Max...
-    Item_AreaCopy(28, 149, 69, 161, MOTION_CASE_ACCEL, 30, 1);  // ...Acceleration
+    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28);                                     // "Motion"
+    DWIN_Frame_AreaCopy(1, 173, 133, 228, 147, LBLX, MBASE(MOTION_CASE_RATE));  // Max speed
+    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(MOTION_CASE_ACCEL));        // Max...
+    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(MOTION_CASE_ACCEL) + 1); // ...Acceleration
     #if HAS_CLASSIC_JERK
-      Item_AreaCopy(173, 133, 200, 147, MOTION_CASE_JERK);      // Max...
-      Item_AreaCopy(1, 180, 28, 192, MOTION_CASE_JERK, 30, 1);  // ...
-      Item_AreaCopy(202, 133, 228, 147, MOTION_CASE_JERK, 57);  // ...Jerk
+      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(MOTION_CASE_JERK));        // Max...
+      DWIN_Frame_AreaCopy(1, 1, 180, 28, 192, LBLX + 27, MBASE(MOTION_CASE_JERK) + 1);  // ...
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 54, MBASE(MOTION_CASE_JERK));   // ...Jerk
     #endif
-    Item_AreaCopy(153, 148, 194, 161, MOTION_CASE_STEPS);       // Flow ratio
+    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(MOTION_CASE_STEPS));         // Flow ratio
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_MOTION));
     #else
-      DWIN_Frame_TitleCopy(144, 16, 46, 11);                            // "Motion"
+      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26);                                        // "Motion"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MOTION_CASE_RATE, F("Feedrate"));                 // "Feedrate"
-      DWIN_Draw_Label(MOTION_CASE_ACCEL, GET_TEXT_F(MSG_ACCELERATION)); // "Acceleration"
+      DWIN_Draw_Label(MBASE(MOTION_CASE_RATE), F("Feedrate"));
+      DWIN_Draw_Label(MBASE(MOTION_CASE_ACCEL), GET_TEXT_F(MSG_ACCELERATION));
       #if HAS_CLASSIC_JERK
-        DWIN_Draw_Label(MOTION_CASE_JERK, GET_TEXT_F(MSG_JERK));        // "Jerk"
+        DWIN_Draw_Label(MBASE(MOTION_CASE_JERK), GET_TEXT_F(MSG_JERK));
       #endif
-      DWIN_Draw_Label(MOTION_CASE_STEPS, GET_TEXT_F(MSG_STEPS_PER_MM)); // "Steps/mm"
+      DWIN_Draw_Label(MBASE(MOTION_CASE_STEPS), GET_TEXT_F(MSG_STEPS_PER_MM));
     #else
-      say_max_en(MOTION_CASE_RATE); say_speed_en(30, MOTION_CASE_RATE); // "Max Speed"
-      say_max_accel_en(MOTION_CASE_ACCEL);                              // "Max Acceleration"
+      draw_max_en(MBASE(MOTION_CASE_RATE)); draw_speed_en(27, MBASE(MOTION_CASE_RATE)); // "Max Speed"
+      draw_max_accel_en(MBASE(MOTION_CASE_ACCEL));                                      // "Max Acceleration"
       #if HAS_CLASSIC_JERK
-        say_max_en(MOTION_CASE_JERK); say_jerk_en(MOTION_CASE_JERK);    // "Max Jerk"
+        draw_max_en(MBASE(MOTION_CASE_JERK)); draw_jerk_en(MBASE(MOTION_CASE_JERK));    // "Max Jerk"
       #endif
-      say_steps_per_mm_en(MOTION_CASE_STEPS);                           // "Steps-per-mm"
+      draw_steps_per_mm(MBASE(MOTION_CASE_STEPS));                                      // "Steps-per-mm"
     #endif
   }
 
-  Draw_Back_First(select_motion.now == CASE_BACK);
-  if (select_motion.now != CASE_BACK) Draw_Menu_Cursor(select_motion.now);
+  Draw_Back_First(select_motion.now == 0);
+  if (select_motion.now) Draw_Menu_Cursor(select_motion.now);
 
   uint8_t i = 0;
   #define _MOTION_ICON(N) Draw_Menu_Line(++i, ICON_MaxSpeed + (N) - 1)
@@ -1082,9 +1020,9 @@ void Draw_Motion_Menu() {
     if (toohigh) {
       DWIN_ICON_Show(ICON, ICON_TempTooHigh, 102, 165);
       if (HMI_IsChinese()) {
-        DWIN_Frame_AreaCopy(1, 103, 371, 237, 386,  52, 285); // Temp Too High
+        DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
         DWIN_Frame_AreaCopy(1, 151, 389, 185, 402, 187, 285);
-        DWIN_Frame_AreaCopy(1, 189, 389, 271, 402,  95, 310);
+        DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
       else {
         DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, 36, 300, F("Nozzle or Bed temperature"));
@@ -1094,7 +1032,7 @@ void Draw_Motion_Menu() {
     else {
       DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 165);
       if (HMI_IsChinese()) {
-        DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285); // Tenp Too Low
+        DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285);
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
       else {
@@ -1117,7 +1055,7 @@ void Draw_Popup_Bkgd_60() {
     Draw_Popup_Bkgd_60();
     DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 105);
     if (HMI_IsChinese()) {
-      DWIN_Frame_AreaCopy(1, 103, 371, 136, 386, 69, 240);      // Nozzle Too Cold
+      DWIN_Frame_AreaCopy(1, 103, 371, 136, 386, 69, 240);
       DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 69 + 33, 240);
       DWIN_ICON_Show(ICON, ICON_Confirm_C, 86, 280);
     }
@@ -1133,7 +1071,7 @@ void Popup_Window_Resume() {
   Clear_Popup_Area();
   Draw_Popup_Bkgd_105();
   if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);    // Resume Interrupted Print
+    DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);
     DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 192);
     DWIN_ICON_Show(ICON, ICON_Cancel_C,    26, 307);
     DWIN_ICON_Show(ICON, ICON_Continue_C, 146, 307);
@@ -1152,7 +1090,7 @@ void Popup_Window_Home(const bool parking/*=false*/) {
   Draw_Popup_Bkgd_60();
   DWIN_ICON_Show(ICON, ICON_BLTouch, 101, 105);
   if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 0, 371, 33, 386, 85, 240);       // Wait for Move to Complete
+    DWIN_Frame_AreaCopy(1, 0, 371, 33, 386, 85, 240);
     DWIN_Frame_AreaCopy(1, 203, 286, 271, 302, 118, 240);
     DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
   }
@@ -1169,7 +1107,7 @@ void Popup_Window_Home(const bool parking/*=false*/) {
     Draw_Popup_Bkgd_60();
     DWIN_ICON_Show(ICON, ICON_AutoLeveling, 101, 105);
     if (HMI_IsChinese()) {
-      DWIN_Frame_AreaCopy(1, 0, 371, 100, 386, 84, 240);    // Wait for Leveling
+      DWIN_Frame_AreaCopy(1, 0, 371, 100, 386, 84, 240);
       DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
     }
     else {
@@ -1194,15 +1132,15 @@ void Popup_window_PauseOrStop() {
   Clear_Main_Window();
   Draw_Popup_Bkgd_60();
   if (HMI_IsChinese()) {
-         if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);    // Pause
-    else if (select_print.now == PRINT_STOP) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);    // Stop
-    DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150); // Print
+         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
+    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
+    DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
     DWIN_ICON_Show(ICON, ICON_Confirm_C, 26, 280);
     DWIN_ICON_Show(ICON, ICON_Cancel_C, 146, 280);
   }
   else {
-         if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
-    else if (select_print.now == PRINT_STOP) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
+         if (select_print.now == 1) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
+    else if (select_print.now == 2) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
     DWIN_ICON_Show(ICON, ICON_Confirm_E, 26, 280);
     DWIN_ICON_Show(ICON, ICON_Cancel_E, 146, 280);
   }
@@ -1210,40 +1148,36 @@ void Popup_window_PauseOrStop() {
 }
 
 void Draw_Printing_Screen() {
-  const uint16_t y = 168;
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(30, 1, 42, 14);              // "Printing"
-    DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  43, y);  // "Printing Time"
-    DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 178, y);  // "Remain"
+    DWIN_Frame_AreaCopy(1, 30,  1,  71, 14,  14,   9);  // Tune
+    DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 188);  // Pause
+    DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 188);  // Stop
   }
   else {
-    DWIN_Frame_TitleCopy(42, 0, 47, 14);              // "Printing"
-    DWIN_Frame_AreaCopy(1,   1, 43,  97, 59,  43, y); // "Printing Time"
-    DWIN_Frame_AreaCopy(1, 100, 43, 152, 56, 178, y); // "Remain"
+    DWIN_Frame_AreaCopy(1, 40,  2,  92, 14,  14,   9);  // Tune
+    DWIN_Frame_AreaCopy(1,  0, 44,  96, 58,  41, 188);  // Pause
+    DWIN_Frame_AreaCopy(1, 98, 44, 152, 58, 176, 188);  // Stop
   }
 }
 
 void Draw_Print_ProgressBar() {
-  constexpr uint16_t y = 93, h = 21;
   DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
-  DWIN_Draw_Rectangle(1, BarFill_Color, 16 + _card_percent * 240 / 100, y, 256, y + h - 1);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Percent_Color, Color_Bg_Black, 2, 117, y + 40, _card_percent);
-  DWIN_Draw_String(false, font8x16, Percent_Color, Color_Bg_Black, 133, y + 40, F("%"));
+  DWIN_Draw_Rectangle(1, BarFill_Color, 16 + _card_percent * 240 / 100, 93, 256, 113);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Percent_Color, Color_Bg_Black, 2, 117, 133, _card_percent);
+  DWIN_Draw_String(false, font8x16, Percent_Color, Color_Bg_Black, 133, 133, F("%"));
 }
 
 void Draw_Print_ProgressElapsed() {
-  constexpr uint16_t x = 45, y = 192;
   duration_t elapsed = print_job_timer.duration(); // print timer
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x, y, elapsed.value / 3600);
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, x + 8 * 2, y, F(":"));
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x + 8 * 3, y, (elapsed.value % 3600) / 60);
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 42, 212, elapsed.value / 3600);
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 58, 212, F(":"));
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 66, 212, (elapsed.value % 3600) / 60);
 }
 
 void Draw_Print_ProgressRemain() {
-  constexpr uint16_t x = 179, y = 192;
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x, y, _remain_time / 3600);
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, x + 8 * 2, y, F(":"));
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x + 8 * 3, y, (_remain_time % 3600) / 60);
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 176, 212, _remain_time / 3600);
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 192, 212, F(":"));
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 200, 212, (_remain_time % 3600) / 60);
 }
 
 void Goto_PrintProcess() {
@@ -1253,7 +1187,7 @@ void Goto_PrintProcess() {
   Draw_Printing_Screen();
 
   ICON_Tune();
-  ICON_ResumeOrPause();
+  if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
   ICON_Stop();
 
   // Copy into filebuf string before entry
@@ -1261,8 +1195,8 @@ void Goto_PrintProcess() {
   const int8_t npos = _MAX(0U, DWIN_WIDTH - strlen(name) * MENU_CHR_W) / 2;
   DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, npos, 60, name);
 
-  DWIN_ICON_Show(ICON, ICON_PrintTime,   17, 163);
-  DWIN_ICON_Show(ICON, ICON_RemainTime, 150, 161);
+  DWIN_ICON_Show(ICON, ICON_PrintTime, 17, 193);
+  DWIN_ICON_Show(ICON, ICON_RemainTime, 150, 191);
 
   Draw_Print_ProgressBar();
   Draw_Print_ProgressElapsed();
@@ -1275,12 +1209,12 @@ void Goto_MainMenu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese())
-    DWIN_Frame_TitleCopy(2, 2, 26, 13);   // "Home" etc
+    DWIN_Frame_TitleCopy(1, 2, 2, 27, 14); // "Home"
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_MAIN));
     #else
-      DWIN_Frame_TitleCopy(0, 2, 40, 11); // "Home"
+      DWIN_Frame_TitleCopy(1, 0, 2, 39, 12);
     #endif
   }
 
@@ -1289,14 +1223,14 @@ void Goto_MainMenu() {
   ICON_Print();
   ICON_Prepare();
   ICON_Control();
-  TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)();
+  TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(select_page.now == 3);
 }
 
-inline EncoderState get_encoder_state() {
+inline ENCODER_DiffState get_encoder_state() {
   static millis_t Encoder_ms = 0;
   const millis_t ms = millis();
   if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
-  const EncoderState state = Encoder_ReceiveAnalyze();
+  const ENCODER_DiffState state = Encoder_ReceiveAnalyze();
   if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
   return state;
 }
@@ -1317,63 +1251,60 @@ void HMI_Move_Done(const AxisEnum axis) {
 }
 
 void HMI_Move_X() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled)) {
-    Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled);
-    return HMI_Move_Done(X_AXIS);
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled))
+      return HMI_Move_Done(X_AXIS);
+    LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
+    current_position.x = HMI_ValueStruct.Move_X_scaled / MINUNITMULT;
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
+    DWIN_UpdateLCD();
+    HMI_Plan_Move(homing_feedrate(X_AXIS));
   }
-  LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
-  current_position.x = HMI_ValueStruct.Move_X_scaled / MINUNITMULT;
-  Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled, true);
-  DWIN_UpdateLCD();
-  HMI_Plan_Move(homing_feedrate(X_AXIS));
 }
 
 void HMI_Move_Y() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled)) {
-    Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled);
-    return HMI_Move_Done(Y_AXIS);
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled))
+      return HMI_Move_Done(Y_AXIS);
+    LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
+    current_position.y = HMI_ValueStruct.Move_Y_scaled / MINUNITMULT;
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
+    DWIN_UpdateLCD();
+    HMI_Plan_Move(homing_feedrate(Y_AXIS));
   }
-  LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
-  current_position.y = HMI_ValueStruct.Move_Y_scaled / MINUNITMULT;
-  Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled, true);
-  DWIN_UpdateLCD();
-  HMI_Plan_Move(homing_feedrate(Y_AXIS));
 }
 
 void HMI_Move_Z() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled)) {
-    Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled);
-    return HMI_Move_Done(Z_AXIS);
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled))
+      return HMI_Move_Done(Z_AXIS);
+    LIMIT(HMI_ValueStruct.Move_Z_scaled, (Z_MIN_POS) * MINUNITMULT, (Z_MAX_POS) * MINUNITMULT);
+    current_position.z = HMI_ValueStruct.Move_Z_scaled / MINUNITMULT;
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
+    DWIN_UpdateLCD();
+    HMI_Plan_Move(homing_feedrate(Z_AXIS));
   }
-  LIMIT(HMI_ValueStruct.Move_Z_scaled, (Z_MIN_POS) * MINUNITMULT, (Z_MAX_POS) * MINUNITMULT);
-  current_position.z = HMI_ValueStruct.Move_Z_scaled / MINUNITMULT;
-  Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled, true);
-  DWIN_UpdateLCD();
-  HMI_Plan_Move(homing_feedrate(Z_AXIS));
 }
 
 #if HAS_HOTEND
 
   void HMI_Move_E() {
     static float last_E_scaled = 0;
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scaled)) {
-      last_E_scaled = HMI_ValueStruct.Move_E_scaled;
-      Draw_Edit_Signed_Float3(4, last_E_scaled);
-      return HMI_Move_Done(E_AXIS);
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scaled)) {
+        last_E_scaled = HMI_ValueStruct.Move_E_scaled;
+        return HMI_Move_Done(E_AXIS);
+      }
+      LIMIT(HMI_ValueStruct.Move_E_scaled, last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT, last_E_scaled + (EXTRUDE_MAXLENGTH) * MINUNITMULT);
+      current_position.e = HMI_ValueStruct.Move_E_scaled / MINUNITMULT;
+      DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
+      DWIN_UpdateLCD();
+      HMI_Plan_Move(MMM_TO_MMS(FEEDRATE_E));
     }
-    LIMIT(HMI_ValueStruct.Move_E_scaled, last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT, last_E_scaled + (EXTRUDE_MAXLENGTH) * MINUNITMULT);
-    current_position.e = HMI_ValueStruct.Move_E_scaled / MINUNITMULT;
-    Draw_Edit_Signed_Float3(4, HMI_ValueStruct.Move_E_scaled, true);
-    DWIN_UpdateLCD();
-    HMI_Plan_Move(MMM_TO_MMS(FEEDRATE_E));
   }
 
 #endif
@@ -1383,32 +1314,33 @@ void HMI_Move_Z() {
   bool printer_busy() { return planner.movesplanned() || printingIsActive(); }
 
   void HMI_Zoffset() {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    uint8_t zoff_line;
-    switch (HMI_ValueStruct.show_mode) {
-      case -4: zoff_line = PREPARE_CASE_ZOFF + MROWS - index_prepare; break;
-      default: zoff_line = TUNE_CASE_ZOFF + MROWS - index_tune;
-    }
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.offset_value)) {
-      EncoderRate.enabled = false;
-      #if HAS_BED_PROBE
-        probe.offset.z = dwin_zoffset;
-        TERN_(EEPROM_SETTINGS, settings.save());
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      uint8_t zoff_line;
+      switch (HMI_ValueStruct.show_mode) {
+        case -4: zoff_line = PREPARE_CASE_ZOFF + MROWS - index_prepare; break;
+        default: zoff_line = TUNE_CASE_ZOFF + MROWS - index_tune;
+      }
+      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.offset_value)) {
+        EncoderRate.enabled = false;
+        #if HAS_BED_PROBE
+          probe.offset.z = dwin_zoffset;
+          TERN_(EEPROM_SETTINGS, settings.save());
+        #endif
+        checkkey = HMI_ValueStruct.show_mode == -4 ? Prepare : Tune;
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(zoff_line), TERN(HAS_BED_PROBE, BABY_Z_VAR * 100, HMI_ValueStruct.offset_value));
+        DWIN_UpdateLCD();
+        return;
+      }
+      LIMIT(HMI_ValueStruct.offset_value, (Z_PROBE_OFFSET_RANGE_MIN) * 100, (Z_PROBE_OFFSET_RANGE_MAX) * 100);
+      last_zoffset = dwin_zoffset;
+      dwin_zoffset = HMI_ValueStruct.offset_value / 100.0f;
+      #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+        if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
       #endif
-      checkkey = HMI_ValueStruct.show_mode == -4 ? Prepare : Tune;
-      Draw_Edit_Signed_Float2(zoff_line, TERN(HAS_BED_PROBE, BABY_Z_VAR * 100, HMI_ValueStruct.offset_value));
+      DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, MBASE(zoff_line), HMI_ValueStruct.offset_value);
       DWIN_UpdateLCD();
-      return;
     }
-    LIMIT(HMI_ValueStruct.offset_value, (Z_PROBE_OFFSET_RANGE_MIN) * 100, (Z_PROBE_OFFSET_RANGE_MAX) * 100);
-    last_zoffset = dwin_zoffset;
-    dwin_zoffset = HMI_ValueStruct.offset_value / 100.0f;
-    #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
-      if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
-    #endif
-    Draw_Edit_Signed_Float2(zoff_line, HMI_ValueStruct.offset_value, true);
-    DWIN_UpdateLCD();
   }
 
 #endif // HAS_ZOFFSET_ITEM
@@ -1416,41 +1348,42 @@ void HMI_Move_Z() {
 #if HAS_HOTEND
 
   void HMI_ETemp() {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    uint8_t temp_line;
-    switch (HMI_ValueStruct.show_mode) {
-      case -1: temp_line = TEMP_CASE_TEMP; break;
-      case -2: temp_line = PREHEAT_CASE_TEMP; break;
-      case -3: temp_line = PREHEAT_CASE_TEMP; break;
-      default: temp_line = TUNE_CASE_TEMP + MROWS - index_tune;
-    }
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.E_Temp)) {
-      EncoderRate.enabled = false;
-      if (HMI_ValueStruct.show_mode == -2) {
-        checkkey = PLAPreheat;
-        ui.material_preset[0].hotend_temp = HMI_ValueStruct.E_Temp;
-        Draw_Edit_Integer3(temp_line, ui.material_preset[0].hotend_temp);
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      uint8_t temp_line;
+      switch (HMI_ValueStruct.show_mode) {
+        case -1: temp_line = TEMP_CASE_TEMP; break;
+        case -2: temp_line = PREHEAT_CASE_TEMP; break;
+        case -3: temp_line = PREHEAT_CASE_TEMP; break;
+        default: temp_line = TUNE_CASE_TEMP + MROWS - index_tune;
+      }
+      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.E_Temp)) {
+        EncoderRate.enabled = false;
+        if (HMI_ValueStruct.show_mode == -2) {
+          checkkey = PLAPreheat;
+          ui.material_preset[0].hotend_temp = HMI_ValueStruct.E_Temp;
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(temp_line), ui.material_preset[0].hotend_temp);
+          return;
+        }
+        else if (HMI_ValueStruct.show_mode == -3) {
+          checkkey = ABSPreheat;
+          ui.material_preset[1].hotend_temp = HMI_ValueStruct.E_Temp;
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(temp_line), ui.material_preset[1].hotend_temp);
+          return;
+        }
+        else if (HMI_ValueStruct.show_mode == -1) // Temperature
+          checkkey = TemperatureID;
+        else
+          checkkey = Tune;
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(temp_line), HMI_ValueStruct.E_Temp);
+        thermalManager.setTargetHotend(HMI_ValueStruct.E_Temp, 0);
         return;
       }
-      else if (HMI_ValueStruct.show_mode == -3) {
-        checkkey = ABSPreheat;
-        ui.material_preset[1].hotend_temp = HMI_ValueStruct.E_Temp;
-        Draw_Edit_Integer3(temp_line, ui.material_preset[1].hotend_temp);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -1) // Temperature
-        checkkey = TemperatureID;
-      else
-        checkkey = Tune;
-      Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp);
-      thermalManager.setTargetHotend(HMI_ValueStruct.E_Temp, 0);
-      return;
+      // E_Temp limit
+      LIMIT(HMI_ValueStruct.E_Temp, HEATER_0_MINTEMP, thermalManager.hotend_max_target(0));
+      // E_Temp value
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(temp_line), HMI_ValueStruct.E_Temp);
     }
-    // E_Temp limit
-    LIMIT(HMI_ValueStruct.E_Temp, HEATER_0_MINTEMP, thermalManager.hotend_max_target(0));
-    // E_Temp value
-    Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp, true);
   }
 
 #endif // HAS_HOTEND
@@ -1458,41 +1391,42 @@ void HMI_Move_Z() {
 #if HAS_HEATED_BED
 
   void HMI_BedTemp() {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    uint8_t bed_line;
-    switch (HMI_ValueStruct.show_mode) {
-      case -1: bed_line = TEMP_CASE_BED; break;
-      case -2: bed_line = PREHEAT_CASE_BED; break;
-      case -3: bed_line = PREHEAT_CASE_BED; break;
-      default: bed_line = TUNE_CASE_BED + MROWS - index_tune;
-    }
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Bed_Temp)) {
-      EncoderRate.enabled = false;
-      if (HMI_ValueStruct.show_mode == -2) {
-        checkkey = PLAPreheat;
-        ui.material_preset[0].bed_temp = HMI_ValueStruct.Bed_Temp;
-        Draw_Edit_Integer3(bed_line, ui.material_preset[0].bed_temp);
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      uint8_t bed_line;
+      switch (HMI_ValueStruct.show_mode) {
+        case -1: bed_line = TEMP_CASE_BED; break;
+        case -2: bed_line = PREHEAT_CASE_BED; break;
+        case -3: bed_line = PREHEAT_CASE_BED; break;
+        default: bed_line = TUNE_CASE_BED + MROWS - index_tune;
+      }
+      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Bed_Temp)) {
+        EncoderRate.enabled = false;
+        if (HMI_ValueStruct.show_mode == -2) {
+          checkkey = PLAPreheat;
+          ui.material_preset[0].bed_temp = HMI_ValueStruct.Bed_Temp;
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(bed_line), ui.material_preset[0].bed_temp);
+          return;
+        }
+        else if (HMI_ValueStruct.show_mode == -3) {
+          checkkey = ABSPreheat;
+          ui.material_preset[1].bed_temp = HMI_ValueStruct.Bed_Temp;
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(bed_line), ui.material_preset[1].bed_temp);
+          return;
+        }
+        else if (HMI_ValueStruct.show_mode == -1)
+          checkkey = TemperatureID;
+        else
+          checkkey = Tune;
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(bed_line), HMI_ValueStruct.Bed_Temp);
+        thermalManager.setTargetBed(HMI_ValueStruct.Bed_Temp);
         return;
       }
-      else if (HMI_ValueStruct.show_mode == -3) {
-        checkkey = ABSPreheat;
-        ui.material_preset[1].bed_temp = HMI_ValueStruct.Bed_Temp;
-        Draw_Edit_Integer3(bed_line, ui.material_preset[1].bed_temp);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -1)
-        checkkey = TemperatureID;
-      else
-        checkkey = Tune;
-      Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp);
-      thermalManager.setTargetBed(HMI_ValueStruct.Bed_Temp);
-      return;
+      // Bed_Temp limit
+      LIMIT(HMI_ValueStruct.Bed_Temp, BED_MINTEMP, BED_MAX_TARGET);
+      // Bed_Temp value
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(bed_line), HMI_ValueStruct.Bed_Temp);
     }
-    // Bed_Temp limit
-    LIMIT(HMI_ValueStruct.Bed_Temp, BED_MINTEMP, BED_MAX_TARGET);
-    // Bed_Temp value
-    Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp, true);
   }
 
 #endif // HAS_HEATED_BED
@@ -1500,142 +1434,148 @@ void HMI_Move_Z() {
 #if HAS_PREHEAT && HAS_FAN
 
   void HMI_FanSpeed() {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    uint8_t fan_line;
-    switch (HMI_ValueStruct.show_mode) {
-      case -1: fan_line = TEMP_CASE_FAN; break;
-      case -2: fan_line = PREHEAT_CASE_FAN; break;
-      case -3: fan_line = PREHEAT_CASE_FAN; break;
-      default: fan_line = TUNE_CASE_FAN + MROWS - index_tune;
-    }
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      uint8_t fan_line;
+      switch (HMI_ValueStruct.show_mode) {
+        case -1: fan_line = TEMP_CASE_FAN; break;
+        case -2: fan_line = PREHEAT_CASE_FAN; break;
+        case -3: fan_line = PREHEAT_CASE_FAN; break;
+        default: fan_line = TUNE_CASE_FAN + MROWS - index_tune;
+      }
 
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Fan_speed)) {
-      EncoderRate.enabled = false;
-      if (HMI_ValueStruct.show_mode == -2) {
-        checkkey = PLAPreheat;
-        ui.material_preset[0].fan_speed = HMI_ValueStruct.Fan_speed;
-        Draw_Edit_Integer3(fan_line, ui.material_preset[0].fan_speed);
+      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Fan_speed)) {
+        EncoderRate.enabled = false;
+        if (HMI_ValueStruct.show_mode == -2) {
+          checkkey = PLAPreheat;
+          ui.material_preset[0].fan_speed = HMI_ValueStruct.Fan_speed;
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(fan_line), ui.material_preset[0].fan_speed);
+          return;
+        }
+        else if (HMI_ValueStruct.show_mode == -3) {
+          checkkey = ABSPreheat;
+          ui.material_preset[1].fan_speed = HMI_ValueStruct.Fan_speed;
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(fan_line), ui.material_preset[1].fan_speed);
+          return;
+        }
+        else if (HMI_ValueStruct.show_mode == -1)
+          checkkey = TemperatureID;
+        else
+          checkkey = Tune;
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(fan_line), HMI_ValueStruct.Fan_speed);
+        thermalManager.set_fan_speed(0, HMI_ValueStruct.Fan_speed);
         return;
       }
-      else if (HMI_ValueStruct.show_mode == -3) {
-        checkkey = ABSPreheat;
-        ui.material_preset[1].fan_speed = HMI_ValueStruct.Fan_speed;
-        Draw_Edit_Integer3(fan_line, ui.material_preset[1].fan_speed);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -1)
-        checkkey = TemperatureID;
-      else
-        checkkey = Tune;
-      Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed);
-      thermalManager.set_fan_speed(0, HMI_ValueStruct.Fan_speed);
-      return;
+      // Fan_speed limit
+      LIMIT(HMI_ValueStruct.Fan_speed, 0, 255);
+      // Fan_speed value
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(fan_line), HMI_ValueStruct.Fan_speed);
     }
-    // Fan_speed limit
-    LIMIT(HMI_ValueStruct.Fan_speed, 0, 255);
-    // Fan_speed value
-    Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed, true);
   }
 
 #endif // HAS_PREHEAT && HAS_FAN
 
 void HMI_PrintSpeed() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.print_speed)) {
-    checkkey = Tune;
-    EncoderRate.enabled = false;
-    feedrate_percentage = HMI_ValueStruct.print_speed;
-    Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed);
-    return;
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.print_speed)) {
+      checkkey = Tune;
+      EncoderRate.enabled = false;
+      feedrate_percentage = HMI_ValueStruct.print_speed;
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(select_tune.now + MROWS - index_tune), HMI_ValueStruct.print_speed);
+      return;
+    }
+    // print_speed limit
+    LIMIT(HMI_ValueStruct.print_speed, MIN_PRINT_SPEED, MAX_PRINT_SPEED);
+    // print_speed value
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(select_tune.now + MROWS - index_tune), HMI_ValueStruct.print_speed);
   }
-  // print_speed limit
-  LIMIT(HMI_ValueStruct.print_speed, MIN_PRINT_SPEED, MAX_PRINT_SPEED);
-  // print_speed value
-  Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed, true);
 }
 
 #define LAST_AXIS TERN(HAS_HOTEND, E_AXIS, Z_AXIS)
 
 void HMI_MaxFeedspeedXYZE() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Feedspeed)) {
-    checkkey = MaxSpeed;
-    EncoderRate.enabled = false;
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Feedspeed)) {
+      checkkey = MaxSpeed;
+      EncoderRate.enabled = false;
+      if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, LAST_AXIS))
+        planner.set_max_feedrate(HMI_flag.feedspeed_axis, HMI_ValueStruct.Max_Feedspeed);
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(select_speed.now), HMI_ValueStruct.Max_Feedspeed);
+      return;
+    }
+    // MaxFeedspeed limit
     if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, LAST_AXIS))
-      planner.set_max_feedrate(HMI_flag.feedspeed_axis, HMI_ValueStruct.Max_Feedspeed);
-    Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed);
-    return;
+      NOMORE(HMI_ValueStruct.Max_Feedspeed, default_max_feedrate[HMI_flag.feedspeed_axis] * 2);
+    if (HMI_ValueStruct.Max_Feedspeed < MIN_MAXFEEDSPEED) HMI_ValueStruct.Max_Feedspeed = MIN_MAXFEEDSPEED;
+    // MaxFeedspeed value
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_speed.now), HMI_ValueStruct.Max_Feedspeed);
   }
-  // MaxFeedspeed limit
-  if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, LAST_AXIS))
-    NOMORE(HMI_ValueStruct.Max_Feedspeed, default_max_feedrate[HMI_flag.feedspeed_axis] * 2);
-  if (HMI_ValueStruct.Max_Feedspeed < MIN_MAXFEEDSPEED) HMI_ValueStruct.Max_Feedspeed = MIN_MAXFEEDSPEED;
-  // MaxFeedspeed value
-  Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed, true);
 }
 
 void HMI_MaxAccelerationXYZE() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Acceleration)) {
-    checkkey = MaxAcceleration;
-    EncoderRate.enabled = false;
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Acceleration)) {
+      checkkey = MaxAcceleration;
+      EncoderRate.enabled = false;
+      if (WITHIN(HMI_flag.acc_axis, X_AXIS, LAST_AXIS))
+        planner.set_max_acceleration(HMI_flag.acc_axis, HMI_ValueStruct.Max_Acceleration);
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(select_acc.now), HMI_ValueStruct.Max_Acceleration);
+      return;
+    }
+    // MaxAcceleration limit
     if (WITHIN(HMI_flag.acc_axis, X_AXIS, LAST_AXIS))
-      planner.set_max_acceleration(HMI_flag.acc_axis, HMI_ValueStruct.Max_Acceleration);
-    Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration);
-    return;
+      NOMORE(HMI_ValueStruct.Max_Acceleration, default_max_acceleration[HMI_flag.acc_axis] * 2);
+    if (HMI_ValueStruct.Max_Acceleration < MIN_MAXACCELERATION) HMI_ValueStruct.Max_Acceleration = MIN_MAXACCELERATION;
+    // MaxAcceleration value
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_acc.now), HMI_ValueStruct.Max_Acceleration);
   }
-  // MaxAcceleration limit
-  if (WITHIN(HMI_flag.acc_axis, X_AXIS, LAST_AXIS))
-    NOMORE(HMI_ValueStruct.Max_Acceleration, default_max_acceleration[HMI_flag.acc_axis] * 2);
-  if (HMI_ValueStruct.Max_Acceleration < MIN_MAXACCELERATION) HMI_ValueStruct.Max_Acceleration = MIN_MAXACCELERATION;
-  // MaxAcceleration value
-  Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration, true);
 }
 
 #if HAS_CLASSIC_JERK
 
   void HMI_MaxJerkXYZE() {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Jerk_scaled)) {
-      checkkey = MaxJerk;
-      EncoderRate.enabled = false;
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Jerk_scaled)) {
+        checkkey = MaxJerk;
+        EncoderRate.enabled = false;
+        if (WITHIN(HMI_flag.jerk_axis, X_AXIS, LAST_AXIS))
+          planner.set_max_jerk(HMI_flag.jerk_axis, HMI_ValueStruct.Max_Jerk_scaled / 10);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 210, MBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
+        return;
+      }
+      // MaxJerk limit
       if (WITHIN(HMI_flag.jerk_axis, X_AXIS, LAST_AXIS))
-        planner.set_max_jerk(HMI_flag.jerk_axis, HMI_ValueStruct.Max_Jerk_scaled / 10);
-      Draw_Edit_Float3(select_jerk.now, HMI_ValueStruct.Max_Jerk_scaled);
-      return;
+        NOMORE(HMI_ValueStruct.Max_Jerk_scaled, default_max_jerk[HMI_flag.jerk_axis] * 2 * MINUNITMULT);
+      NOLESS(HMI_ValueStruct.Max_Jerk_scaled, (MIN_MAXJERK) * MINUNITMULT);
+      // MaxJerk value
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
     }
-    // MaxJerk limit
-    if (WITHIN(HMI_flag.jerk_axis, X_AXIS, LAST_AXIS))
-      NOMORE(HMI_ValueStruct.Max_Jerk_scaled, default_max_jerk[HMI_flag.jerk_axis] * 2 * MINUNITMULT);
-    NOLESS(HMI_ValueStruct.Max_Jerk_scaled, (MIN_MAXJERK) * MINUNITMULT);
-    // MaxJerk value
-    Draw_Edit_Float3(select_jerk.now, HMI_ValueStruct.Max_Jerk_scaled, true);
   }
 
 #endif // HAS_CLASSIC_JERK
 
 void HMI_StepXYZE() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Step_scaled)) {
-    checkkey = Step;
-    EncoderRate.enabled = false;
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Step_scaled)) {
+      checkkey = Step;
+      EncoderRate.enabled = false;
+      if (WITHIN(HMI_flag.step_axis, X_AXIS, LAST_AXIS))
+        planner.settings.axis_steps_per_mm[HMI_flag.step_axis] = HMI_ValueStruct.Max_Step_scaled / 10;
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 210, MBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
+      return;
+    }
+    // Step limit
     if (WITHIN(HMI_flag.step_axis, X_AXIS, LAST_AXIS))
-      planner.settings.axis_steps_per_mm[HMI_flag.step_axis] = HMI_ValueStruct.Max_Step_scaled / 10;
-    Draw_Edit_Float3(select_step.now, HMI_ValueStruct.Max_Step_scaled);
-    return;
+      NOMORE(HMI_ValueStruct.Max_Step_scaled, 999.9 * MINUNITMULT);
+    NOLESS(HMI_ValueStruct.Max_Step_scaled, MIN_STEP);
+    // Step value
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
   }
-  // Step limit
-  if (WITHIN(HMI_flag.step_axis, X_AXIS, LAST_AXIS))
-    NOMORE(HMI_ValueStruct.Max_Step_scaled, 999.9 * MINUNITMULT);
-  NOLESS(HMI_ValueStruct.Max_Step_scaled, MIN_STEP);
-  // Step value
-  Draw_Edit_Float3(select_step.now, HMI_ValueStruct.Max_Step_scaled, true);
 }
 
 // Draw X, Y, Z and blink if in an un-homed or un-trusted state
@@ -1702,27 +1642,30 @@ void update_variable() {
     // Tune page temperature update
     #if HAS_HOTEND
       if (_new_hotend_target)
-        Draw_Edit_Integer3(TUNE_CASE_TEMP + MROWS - index_tune, _hotendtarget);
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_TEMP + MROWS - index_tune), _hotendtarget);
     #endif
     #if HAS_HEATED_BED
       if (_new_bed_target)
-        Draw_Edit_Integer3(TUNE_CASE_BED + MROWS - index_tune, _bedtarget);
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_BED + MROWS - index_tune), _bedtarget);
     #endif
     #if HAS_FAN
       if (_new_fanspeed)
-        Draw_Edit_Integer3(TUNE_CASE_FAN + MROWS - index_tune, _fanspeed);
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_FAN + MROWS - index_tune), _fanspeed);
     #endif
   }
   else if (checkkey == TemperatureID) {
     // Temperature page temperature update
     #if HAS_HOTEND
-      if (_new_hotend_target) Draw_Edit_Integer3(TEMP_CASE_TEMP, _hotendtarget);
+      if (_new_hotend_target)
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TEMP_CASE_TEMP), _hotendtarget);
     #endif
     #if HAS_HEATED_BED
-      if (_new_bed_target) Draw_Edit_Integer3(TEMP_CASE_BED, _bedtarget);
+      if (_new_bed_target)
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TEMP_CASE_BED), _bedtarget);
     #endif
     #if HAS_FAN
-      if (_new_fanspeed) Draw_Edit_Integer3(TEMP_CASE_FAN, _fanspeed);
+      if (_new_fanspeed)
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TEMP_CASE_FAN), _fanspeed);
     #endif
   }
 
@@ -1730,34 +1673,34 @@ void update_variable() {
 
   #if HAS_HOTEND
     if (_new_hotend_temp)
-      Draw_Stat_Int(28, 384, _hotendtemp);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 384, _hotendtemp);
     if (_new_hotend_target)
-      Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 384, _hotendtarget);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, _hotendtarget);
 
     static int16_t _flow = planner.flow_percentage[0];
     if (_flow != planner.flow_percentage[0]) {
       _flow = planner.flow_percentage[0];
-      Draw_Stat_Int(116 + 2 * STAT_CHR_W, 417, _flow);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, _flow);
     }
   #endif
 
   #if HAS_HEATED_BED
     if (_new_bed_temp)
-      Draw_Stat_Int(28, 417, _bedtemp);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 417, _bedtemp);
     if (_new_bed_target)
-      Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 417, _bedtarget);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, _bedtarget);
   #endif
 
   static int16_t _feedrate = 100;
   if (_feedrate != feedrate_percentage) {
     _feedrate = feedrate_percentage;
-    Draw_Stat_Int(116 + 2 * STAT_CHR_W, 384, _feedrate);
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, _feedrate);
   }
 
   #if HAS_FAN
     if (_new_fanspeed) {
       _fanspeed = thermalManager.fan_speed[0];
-      Draw_Stat_Int(195 + 2 * STAT_CHR_W, 384, _fanspeed);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 195 + 2 * STAT_CHR_W, 384, _fanspeed);
     }
   #endif
 
@@ -1765,11 +1708,11 @@ void update_variable() {
   if (BABY_Z_VAR != _offset) {
     _offset = BABY_Z_VAR;
     if (BABY_Z_VAR < 0) {
-      Draw_Stat_Float(207, 417, -_offset * 100);
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, -_offset * 100);
       DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
     }
     else {
-      Draw_Stat_Float(207, 417, _offset * 100);
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, _offset * 100);
       DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
     }
   }
@@ -1816,6 +1759,8 @@ void HMI_SDCardInit() { card.cdroot(); }
 
 void MarlinUI::refresh() { /* Nothing to see here */ }
 
+#define ICON_Folder ICON_More
+
 #if ENABLED(SCROLL_LONG_FILENAMES)
 
   char shift_name[LONG_FILENAME_LENGTH + 1];
@@ -1836,7 +1781,7 @@ void MarlinUI::refresh() { /* Nothing to see here */ }
 
   void Init_SDItem_Shift() {
     shift_amt = 0;
-    shift_ms  = select_file.now != CASE_BACK && strlen(shift_name) > MENU_CHAR_LIMIT
+    shift_ms  = select_file.now > 0 && strlen(shift_name) > MENU_CHAR_LIMIT
            ? millis() + 750UL : 0;
   }
 
@@ -1936,7 +1881,7 @@ void HMI_SDCardUpdate() {
   if (HMI_flag.home_flag) return;
   if (DWIN_lcd_sd_status != card.isMounted()) {
     DWIN_lcd_sd_status = card.isMounted();
-    //SERIAL_ECHOLNPGM("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
+    //SERIAL_ECHOLNPAIR("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
     if (DWIN_lcd_sd_status) {
       if (checkkey == SelectFile)
         Redraw_SD_List();
@@ -1968,29 +1913,29 @@ void Draw_Status_Area(const bool with_update) {
 
   #if HAS_HOTEND
     DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
-    Draw_Stat_Int(28, 384, thermalManager.wholeDegHotend(0));
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 384, thermalManager.wholeDegHotend(0));
     DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
-    Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 384, thermalManager.degTargetHotend(0));
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.degTargetHotend(0));
 
     DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
-    Draw_Stat_Int(116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
     DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
   #endif
 
   #if HAS_HEATED_BED
     DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
-    Draw_Stat_Int(28, 417, thermalManager.wholeDegBed());
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 417, thermalManager.wholeDegBed());
     DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
-    Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
   #endif
 
   DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
-  Draw_Stat_Int(116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
+  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
   DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
 
   #if HAS_FAN
     DWIN_ICON_Show(ICON, ICON_FanSpeed, 187, 383);
-    Draw_Stat_Int(195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
   #endif
 
   #if HAS_ZOFFSET_ITEM
@@ -1998,11 +1943,11 @@ void Draw_Status_Area(const bool with_update) {
   #endif
 
   if (BABY_Z_VAR < 0) {
-    Draw_Stat_Float(207, 417, -BABY_Z_VAR * 100);
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, -BABY_Z_VAR * 100);
     DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
   }
   else {
-    Draw_Stat_Float(207, 417, BABY_Z_VAR * 100);
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, BABY_Z_VAR * 100);
     DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
   }
 
@@ -2031,22 +1976,22 @@ void Draw_Info_Menu() {
   DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(SHORT_BUILD_VERSION) * MENU_CHR_W) / 2, 195, F(SHORT_BUILD_VERSION));
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(30, 17, 28, 13);                   // "Info"
+    DWIN_Frame_TitleCopy(1, 30, 17, 57, 29); // "Info"
 
-    DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);   // "Size"
-    DWIN_Frame_AreaCopy(1,   1, 164,  56, 176, 108, 175);   // "Firmware Version"
-    DWIN_Frame_AreaCopy(1,  58, 164, 113, 176, 105, 248);   // "Contact Details"
+    DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);
+    DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);
+    DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248);
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_INFO_SCREEN));
     #else
-      DWIN_Frame_TitleCopy(192, 15, 23, 12);                // "Info"
+      DWIN_Frame_TitleCopy(1, 190, 16, 215, 26); // "Info"
     #endif
 
-    DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);   // "Size"
-    DWIN_Frame_AreaCopy(1, 146, 151, 254, 161,  82, 175);   // "Firmware Version"
-    DWIN_Frame_AreaCopy(1,   1, 164,  96, 175,  89, 248);   // "Contact details"
+    DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);
+    DWIN_Frame_AreaCopy(1, 146, 151, 254, 161, 82, 175);
+    DWIN_Frame_AreaCopy(1, 0, 165, 94, 175, 89, 248);
   }
   DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(CORP_WEBSITE) * MENU_CHR_W) / 2, 268, F(CORP_WEBSITE));
 
@@ -2060,66 +2005,67 @@ void Draw_Info_Menu() {
 void Draw_Print_File_Menu() {
   Clear_Title_Bar();
 
-  if (HMI_IsChinese())
-    DWIN_Frame_TitleCopy(0, 31, 56, 14);  // "Print file"
+  if (HMI_IsChinese()) {
+    DWIN_Frame_TitleCopy(1, 0, 31, 55, 44); // "Print file"
+  }
   else {
     #ifdef USE_STRING_HEADINGS
-      Draw_Title(GET_TEXT_F(MSG_MEDIA_MENU));
+      Draw_Title("Print file"); // TODO: GET_TEXT_F
     #else
-      DWIN_Frame_TitleCopy(52, 31, 86, 11); // "Print file"
+      DWIN_Frame_TitleCopy(1, 52, 31, 137, 41); // "Print file"
     #endif
   }
 
   Redraw_SD_List();
 }
 
-// Main Process
+/* Main Process */
 void HMI_MainMenu() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (encoder_diffState == ENCODER_DIFF_CW) {
     if (select_page.inc(4)) {
       switch (select_page.now) {
-        case PAGE_PRINT: ICON_Print(); break;
-        case PAGE_PREPARE: ICON_Print(); ICON_Prepare(); break;
-        case PAGE_CONTROL: ICON_Prepare(); ICON_Control(); break;
-        case PAGE_INFO_LEVELING: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case 0: ICON_Print(); break;
+        case 1: ICON_Print(); ICON_Prepare(); break;
+        case 2: ICON_Prepare(); ICON_Control(); break;
+        case 3: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
     if (select_page.dec()) {
       switch (select_page.now) {
-        case PAGE_PRINT: ICON_Print(); ICON_Prepare(); break;
-        case PAGE_PREPARE: ICON_Prepare(); ICON_Control(); break;
-        case PAGE_CONTROL: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
-        case PAGE_INFO_LEVELING: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case 0: ICON_Print(); ICON_Prepare(); break;
+        case 1: ICON_Prepare(); ICON_Control(); break;
+        case 2: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(0); break;
+        case 3: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_page.now) {
-      case PAGE_PRINT:
+      case 0: // Print File
         checkkey = SelectFile;
         Draw_Print_File_Menu();
         break;
 
-      case PAGE_PREPARE:
+      case 1: // Prepare
         checkkey = Prepare;
         select_prepare.reset();
         index_prepare = MROWS;
         Draw_Prepare_Menu();
         break;
 
-      case PAGE_CONTROL:
+      case 2: // Control
         checkkey = Control;
         select_control.reset();
         index_control = MROWS;
         Draw_Control_Menu();
         break;
 
-      case PAGE_INFO_LEVELING:
+      case 3: // Leveling or Info
         #if HAS_ONESTEP_LEVELING
           checkkey = Leveling;
           HMI_Leveling();
@@ -2135,7 +2081,7 @@ void HMI_MainMenu() {
 
 // Select (and Print) File
 void HMI_SelectFile() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
 
   const uint16_t hasUpDir = !card.flag.workDirIsRoot;
 
@@ -2198,8 +2144,9 @@ void HMI_SelectFile() {
           Draw_Back_First();
           TERN_(SCROLL_LONG_FILENAMES, shift_ms = 0);
         }
-        else
+        else {
           Draw_SDItem(itemnum, 0);                              // Draw the item (and init shift name)
+        }
       }
       else {
         Move_Highlight(-1, select_file.now + MROWS - index_file); // Just move highlight
@@ -2209,7 +2156,7 @@ void HMI_SelectFile() {
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_file.now == CASE_BACK) { // Back
+    if (select_file.now == 0) { // Back
       select_page.set(0);
       Goto_MainMenu();
     }
@@ -2248,14 +2195,13 @@ void HMI_SelectFile() {
       Goto_PrintProcess();
     }
   }
-
-  HMI_SelectFileExit:
-    DWIN_UpdateLCD();
+HMI_SelectFileExit:
+  DWIN_UpdateLCD();
 }
 
-// Printing
+/* Printing */
 void HMI_Printing() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (HMI_flag.done_confirm_flag) {
@@ -2270,32 +2216,43 @@ void HMI_Printing() {
   if (encoder_diffState == ENCODER_DIFF_CW) {
     if (select_print.inc(3)) {
       switch (select_print.now) {
-        case PRINT_SETUP: ICON_Tune(); break;
-        case PRINT_PAUSE_RESUME: ICON_Tune(); ICON_ResumeOrPause(); break;
-        case PRINT_STOP: ICON_ResumeOrPause(); ICON_Stop(); break;
+        case 0: ICON_Tune(); break;
+        case 1:
+          ICON_Tune();
+          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          break;
+        case 2:
+          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          ICON_Stop();
+          break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
     if (select_print.dec()) {
       switch (select_print.now) {
-        case PRINT_SETUP: ICON_Tune(); ICON_ResumeOrPause(); break;
-        case PRINT_PAUSE_RESUME: ICON_ResumeOrPause(); ICON_Stop(); break;
-        case PRINT_STOP: ICON_Stop(); break;
+        case 0:
+          ICON_Tune();
+          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          break;
+        case 1:
+          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          ICON_Stop();
+          break;
+        case 2: ICON_Stop(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_print.now) {
-      case PRINT_SETUP:
+      case 0: // Tune
         checkkey = Tune;
         HMI_ValueStruct.show_mode = 0;
         select_tune.reset();
         index_tune = MROWS;
         Draw_Tune_Menu();
         break;
-
-      case PRINT_PAUSE_RESUME:
+      case 1: // Pause
         if (HMI_flag.pause_flag) {
           ICON_Pause();
 
@@ -2319,7 +2276,7 @@ void HMI_Printing() {
         }
         break;
 
-      case PRINT_STOP:
+      case 2: // Stop
         HMI_flag.select_flag = true;
         checkkey = Print_window;
         Popup_window_PauseOrStop();
@@ -2331,9 +2288,9 @@ void HMI_Printing() {
   DWIN_UpdateLCD();
 }
 
-// Pause and Stop window
+/* Pause and Stop window */
 void HMI_PauseOrStop() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (encoder_diffState == ENCODER_DIFF_CW)
@@ -2341,16 +2298,21 @@ void HMI_PauseOrStop() {
   else if (encoder_diffState == ENCODER_DIFF_CCW)
     Draw_Select_Highlight(true);
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_print.now == PRINT_PAUSE_RESUME) {
+    if (select_print.now == 1) { // pause window
       if (HMI_flag.select_flag) {
         HMI_flag.pause_action = true;
+        ICON_Continue();
         queue.inject_P(PSTR("M25"));
       }
+      else {
+        // cancel pause
+      }
       Goto_PrintProcess();
     }
-    else if (select_print.now == PRINT_STOP) {
+    else if (select_print.now == 2) { // stop window
       if (HMI_flag.select_flag) {
         checkkey = Back_Main;
+        if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
         wait_for_heatup = wait_for_user = false;       // Stop waiting for heating/user
         card.abortFilePrintSoon();                     // Let the main loop handle SD abort
         dwin_abort_flag = true;                        // Reset feedrate, return to Home
@@ -2358,7 +2320,6 @@ void HMI_PauseOrStop() {
           host_action_cancel();
         #endif
         Popup_Window_Home(true);
-        if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
       }
       else
         Goto_PrintProcess(); // cancel stop
@@ -2371,249 +2332,89 @@ void Draw_Move_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(192, 1, 42, 14); // "Move"
-    Item_AreaCopy(58, 118, 106, 132, 1);
-    Item_AreaCopy(109, 118, 157, 132, 2);
-    Item_AreaCopy(160, 118, 209, 132, 3);
-    TERN_(HAS_HOTEND, Item_AreaCopy(212, 118, 253, 131, 4));
+    DWIN_Frame_TitleCopy(1, 192, 1, 233, 14); // "Move"
+    DWIN_Frame_AreaCopy(1, 58, 118, 106, 132, LBLX, MBASE(1));
+    DWIN_Frame_AreaCopy(1, 109, 118, 157, 132, LBLX, MBASE(2));
+    DWIN_Frame_AreaCopy(1, 160, 118, 209, 132, LBLX, MBASE(3));
+    #if HAS_HOTEND
+      DWIN_Frame_AreaCopy(1, 212, 118, 253, 131, LBLX, MBASE(4));
+    #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_MOVE_AXIS));
     #else
-      DWIN_Frame_TitleCopy(231, 2, 35, 11);   // "Move"
+      DWIN_Frame_TitleCopy(1, 231, 2, 265, 12);                     // "Move"
     #endif
-
-    #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(1, GET_TEXT_F(MSG_MOVE_X));
-      DWIN_Draw_Label(2, GET_TEXT_F(MSG_MOVE_Y));
-      DWIN_Draw_Label(3, GET_TEXT_F(MSG_MOVE_Z));
-      TERN_(HAS_HOTEND, DWIN_Draw_Label(4, GET_TEXT_F(MSG_MOVE_E)));
-    #else
-      say_move_en(1); say_x_en(38, 1); // "Move X"
-      say_move_en(2); say_y_en(38, 2); // "Move Y"
-      say_move_en(3); say_z_en(38, 3); // "Move Z"
-      TERN_(HAS_HOTEND, (say_move_en(4), Item_AreaCopy(99, 194, 151, 204, 4, 38))); // "Move Extruder"
+    draw_move_en(MBASE(1)); say_x(36, MBASE(1));                    // "Move X"
+    draw_move_en(MBASE(2)); say_y(36, MBASE(2));                    // "Move Y"
+    draw_move_en(MBASE(3)); say_z(36, MBASE(3));                    // "Move Z"
+    #if HAS_HOTEND
+      DWIN_Frame_AreaCopy(1, 123, 192, 176, 202, LBLX, MBASE(4));   // "Extruder"
     #endif
   }
 
-  Draw_Back_First(select_axis.now == CASE_BACK);
-  if (select_axis.now != CASE_BACK) Draw_Menu_Cursor(select_axis.now);
+  Draw_Back_First(select_axis.now == 0);
+  if (select_axis.now) Draw_Menu_Cursor(select_axis.now);
 
   // Draw separators and icons
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MoveX + i);
 }
 
-void Item_Adv_HomeOffsets(const uint8_t row) {
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Set Home Offsets"
-  }
-  else {
-    #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
-    #else
-      Item_AreaCopy(1,  76, 102,  87, row); // "Set Home Offsets"
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_HomeOffset);
-  Draw_More_Icon(row);
-}
-
-#if HAS_ONESTEP_LEVELING
-
-  void Item_Adv_ProbeOffsets(const uint8_t row) {
-    if (false && HMI_IsChinese()) {
-      // TODO: Chinese "Probe Offsets"
-    }
-    else {
-      #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_OFFSETS));
-      #else
-        say_probe_offs_en(row);
-      #endif
-    }
-    Draw_Menu_Line(row, ICON_ProbeOffset);
-    Draw_More_Icon(row);
-  }
-
-#endif
-
-void Item_Adv_HotendPID(const uint8_t row) {
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Hotend PID"
-  }
-  else {
-    #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, F("Hotend PID"));
-    #else
-      Item_AreaCopy(96, 104, 167, 114, row); // "Hotend PID"
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_PIDNozzle);
-}
-
-void Item_Adv_BedPID(const uint8_t row) {
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Bed PID"
-  }
-  else {
-    #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(row, F("Bed PID"));
-    #else
-      Item_AreaCopy(241, 104, 263, 115, row);     // "Bed"
-      Item_AreaCopy(145, 104, 167, 114, row, 27); // "PID"
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_PIDbed);
-}
-
-#if ENABLED(POWER_LOSS_RECOVERY)
-
-  void Item_Adv_PLR(const uint8_t row) {
-    if (false && HMI_IsChinese()) {
-      // TODO: Chinese "Power-loss Recovery"
-    }
-    else {
-      #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_OFFSETS));
-      #else
-        Item_AreaCopy(1, 208, 137, 221, row);  // "Power-loss Recovery"
-      #endif
-    }
-    Draw_Menu_Line(row, ICON_Motion);
-    Draw_Checkbox_Line(row, recovery.enabled);
-  }
-
-#endif
-
-void Draw_AdvancedSettings_Menu() {
+void Draw_AdvSet_Menu() {
   Clear_Main_Window();
 
-  #if ADVSET_CASE_TOTAL >= TROWS
+  #if ADVSET_CASE_TOTAL >= 6
     const int16_t scroll = MROWS - index_advset; // Scrolled-up lines
+    #define ASCROL(L) (scroll + (L))
   #else
-    constexpr int16_t scroll = 0;
+    #define ASCROL(L) (L)
   #endif
-  #define ASCROL(L) (scroll + (L))
-  #define AVISI(L) VISI(ADVSET_CASE_TOTAL, L, ASCROL(L))
 
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Advanced Settings"
-  }
-  else {
-    #ifdef USE_STRING_HEADINGS
-      Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
-    #else
-      DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
-    #endif
-  }
+  #define AVISI(L)  WITHIN(ASCROL(L), 0, MROWS)
 
-  if (AVISI(0)) Draw_Back_First(select_advset.now == CASE_BACK);
-  if (AVISI(ADVSET_CASE_HOMEOFF)) Item_Adv_HomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF));      // Set Home Offsets >
+  Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
+
+  if (AVISI(0)) Draw_Back_First(select_advset.now == 0);
+  if (AVISI(ADVSET_CASE_HOMEOFF)) Draw_Menu_Line(ASCROL(ADVSET_CASE_HOMEOFF), ICON_HomeOff, GET_TEXT(MSG_SET_HOME_OFFSETS),true);  // Home Offset >
   #if HAS_ONESTEP_LEVELING
-    if (AVISI(ADVSET_CASE_PROBEOFF)) Item_Adv_ProbeOffsets(ASCROL(ADVSET_CASE_PROBEOFF)); // Probe Offsets >
+    if (AVISI(ADVSET_CASE_PROBEOFF)) Draw_Menu_Line(ASCROL(ADVSET_CASE_PROBEOFF), ICON_ProbeOff, GET_TEXT(MSG_ZPROBE_OFFSETS),true);  // Probe Offset >
   #endif
-  if (AVISI(ADVSET_CASE_HEPID)) Item_Adv_HotendPID(ASCROL(ADVSET_CASE_HEPID));            // Nozzle PID
-  if (AVISI(ADVSET_CASE_BEDPID)) Item_Adv_BedPID(ASCROL(ADVSET_CASE_BEDPID));             // Bed PID
+  if (AVISI(ADVSET_CASE_HEPID)) Draw_Menu_Line(ASCROL(ADVSET_CASE_HEPID), ICON_PIDNozzle, "Hotend PID", false);  // Nozzle PID
+  if (AVISI(ADVSET_CASE_BEDPID)) Draw_Menu_Line(ASCROL(ADVSET_CASE_BEDPID), ICON_PIDbed, "Bed PID", false);  // Bed PID
   #if ENABLED(POWER_LOSS_RECOVERY)
-    if (AVISI(ADVSET_CASE_PWRLOSSR)) Item_Adv_PLR(ASCROL(ADVSET_CASE_PWRLOSSR));          // Power-loss recovery
+    if (AVISI(ADVSET_CASE_PWRLOSSR)) {
+      Draw_Menu_Line(ASCROL(ADVSET_CASE_PWRLOSSR), ICON_Motion, "Power-loss recovery", false);  // Power-loss recovery
+      Draw_Chkb_Line(ASCROL(ADVSET_CASE_PWRLOSSR), recovery.enabled);
+    }
   #endif
-  if (select_advset.now != CASE_BACK) Draw_Menu_Cursor(ASCROL(select_advset.now));
-}
-
-void Item_HomeOffs_X(const uint8_t row) {
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Home Offset X"
-  }
-  else {
-    #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X));
-    #else
-      say_home_offs_en(row); say_x_en(75, row);   // "Home Offset X"
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_HomeOffset);
-  Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffX_scaled);
-}
-
-void Item_HomeOffs_Y(const uint8_t row) {
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Home Offset Y"
-  }
-  else {
-    #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
-    #else
-      say_home_offs_en(row); say_y_en(75, row);   // "Home Offset X"
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_HomeOffset);
-  Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffY_scaled);
-}
-
-void Item_HomeOffs_Z(const uint8_t row) {
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Home Offset Z"
-  }
-  else {
-    #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
-    #else
-      say_home_offs_en(row); say_z_en(75, row);   // "Home Offset Z"
-    #endif
-  }
-  Draw_Menu_Line(row, ICON_HomeOffset);
-  Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffZ_scaled);
+  if (select_advset.now) Draw_Menu_Cursor(ASCROL(select_advset.now));
 }
 
 void Draw_HomeOff_Menu() {
   Clear_Main_Window();
-  if (false && HMI_IsChinese()) {
-    // TODO: Chinese "Home Offsets"
-  }
-  else {
-    #ifdef USE_STRING_HEADINGS
-      Draw_Title(GET_TEXT_F(MSG_SET_HOME_OFFSETS));
-    #else
-      DWIN_Frame_TitleCopy(1, 401, 91, 12);         // "Home Offsets"
-    #endif
-  }
-  Draw_Back_First(select_item.now == CASE_BACK);
-  Item_HomeOffs_X(1);                               // "Home Offset X"
-  Item_HomeOffs_Y(2);                               // "Home Offset Y"
-  Item_HomeOffs_Z(3);                               // "Home Offset Z"
-  if (select_item.now != CASE_BACK) Draw_Menu_Cursor(select_item.now);
+  Draw_Title(GET_TEXT_F(MSG_SET_HOME_OFFSETS));                 // Home Offsets
+  Draw_Back_First(select_item.now == 0);
+  Draw_Menu_Line(1, ICON_HomeOffX, GET_TEXT(MSG_HOME_OFFSET_X));  // Home X Offset
+  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Home_OffX_scaled);
+  Draw_Menu_Line(2, ICON_HomeOffY, GET_TEXT(MSG_HOME_OFFSET_Y));  // Home Y Offset
+  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Home_OffY_scaled);
+  Draw_Menu_Line(3, ICON_HomeOffZ, GET_TEXT(MSG_HOME_OFFSET_Z));  // Home Y Offset
+  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(3), HMI_ValueStruct.Home_OffZ_scaled);
+  if (select_item.now) Draw_Menu_Cursor(select_item.now);
 }
 
 #if HAS_ONESTEP_LEVELING
-
   void Draw_ProbeOff_Menu() {
     Clear_Main_Window();
-    Draw_Back_First(select_item.now == CASE_BACK);
-    if (false && HMI_IsChinese()) {
-      // TODO: Chinese "Probe Offsets"
-    }
-    else {
-      #ifdef USE_STRING_HEADINGS
-        Draw_Title(GET_TEXT_F(MSG_ZPROBE_OFFSETS));
-      #else
-        DWIN_Frame_TitleCopy(124, 431, 91, 12);                             // "Probe Offsets"
-      #endif
-      #ifdef USE_STRING_TITLES
-        Draw_Menu_LineF(1, ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
-        Draw_Menu_LineF(2, ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
-      #else
-        say_probe_offs_en(1); say_x_en(75, 1);  // "Probe Offset X"
-        say_probe_offs_en(2); say_y_en(75, 2);  // "Probe Offset Y"
-      #endif
-    }
-
-    Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Probe_OffX_scaled);
-    Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Probe_OffY_scaled);
-
-    if (select_item.now != CASE_BACK) Draw_Menu_Cursor(select_item.now);
+    Draw_Title(GET_TEXT_F(MSG_ZPROBE_OFFSETS));                 // Probe Offsets
+    Draw_Back_First(select_item.now == 0);
+    Draw_Menu_Line(1, ICON_ProbeOffX, GET_TEXT(MSG_ZPROBE_XOFFSET));  // Probe X Offset
+    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
+    Draw_Menu_Line(2, ICON_ProbeOffY, GET_TEXT(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
+    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
+    if (select_item.now) Draw_Menu_Cursor(select_item.now);
   }
-
 #endif
 
 #include "../../../libs/buzzer.h"
@@ -2630,9 +2431,9 @@ void HMI_AudioFeedback(const bool success=true) {
   #endif
 }
 
-// Prepare
+/* Prepare */
 void HMI_Prepare() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -2685,26 +2486,26 @@ void HMI_Prepare() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_prepare.now) {
-      case CASE_BACK:
+      case 0: // Back
         select_page.set(1);
         Goto_MainMenu();
         break;
-      case PREPARE_CASE_MOVE:
+      case PREPARE_CASE_MOVE: // Axis move
         checkkey = AxisMove;
         select_axis.reset();
         Draw_Move_Menu();
 
-        Draw_Edit_Float3(1, current_position.x * MINUNITMULT);
-        Draw_Edit_Float3(2, current_position.y * MINUNITMULT);
-        Draw_Edit_Float3(3, current_position.z * MINUNITMULT);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(1), current_position.x * MINUNITMULT);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(2), current_position.y * MINUNITMULT);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(3), current_position.z * MINUNITMULT);
         #if HAS_HOTEND
           HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
-          Draw_Edit_Signed_Float3(4, HMI_ValueStruct.Move_E_scaled);
+          DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
         #endif
         break;
-
-      case PREPARE_CASE_DISA: queue.inject_P(PSTR("M84")); break;
-
+      case PREPARE_CASE_DISA: // Disable steppers
+        queue.inject_P(PSTR("M84"));
+        break;
       case PREPARE_CASE_HOME: // Homing
         checkkey = Last_Prepare;
         index_prepare = MROWS;
@@ -2712,12 +2513,12 @@ void HMI_Prepare() {
         Popup_Window_Home();
         break;
       #if HAS_ZOFFSET_ITEM
-        case PREPARE_CASE_ZOFF:
+        case PREPARE_CASE_ZOFF: // Z-offset
           #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
             checkkey = Homeoffset;
             HMI_ValueStruct.show_mode = -4;
             HMI_ValueStruct.offset_value = BABY_Z_VAR * 100;
-            Draw_Edit_Signed_Float2(PREPARE_CASE_ZOFF + MROWS - index_prepare, HMI_ValueStruct.offset_value, true);
+            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, MBASE(PREPARE_CASE_ZOFF + MROWS - index_prepare), HMI_ValueStruct.offset_value);
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
@@ -2727,24 +2528,24 @@ void HMI_Prepare() {
           break;
       #endif
       #if HAS_PREHEAT
-        case PREPARE_CASE_PLA:
+        case PREPARE_CASE_PLA: // PLA preheat
           TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0));
           TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[0].bed_temp));
           TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed));
           break;
-        case PREPARE_CASE_ABS:
+        case PREPARE_CASE_ABS: // ABS preheat
           TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0));
           TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[1].bed_temp));
           TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed));
           break;
-        case PREPARE_CASE_COOL:
+        case PREPARE_CASE_COOL: // Cool
           TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
           #if HAS_HOTEND || HAS_HEATED_BED
             thermalManager.disable_all_heaters();
           #endif
           break;
       #endif
-      case PREPARE_CASE_LANG:
+      case PREPARE_CASE_LANG: // Toggle Language
         HMI_ToggleLanguage();
         Draw_Prepare_Menu();
         break;
@@ -2758,82 +2559,81 @@ void Draw_Temperature_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(236, 2, 28, 12); // "Temperature"
+    DWIN_Frame_TitleCopy(1, 236, 2, 263, 13); // "Temperature"
     #if HAS_HOTEND
-      Item_AreaCopy(1, 134, 56, 146, TEMP_CASE_TEMP);
+      DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX, MBASE(TEMP_CASE_TEMP));
     #endif
     #if HAS_HEATED_BED
-      Item_AreaCopy(58, 134, 113, 146, TEMP_CASE_BED);
+      DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX, MBASE(TEMP_CASE_BED));
     #endif
     #if HAS_FAN
-      Item_AreaCopy(115, 134, 170, 146, TEMP_CASE_FAN);
+      DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX, MBASE(TEMP_CASE_FAN));
     #endif
     #if HAS_HOTEND
-      Item_AreaCopy(100, 89, 178, 101, TEMP_CASE_PLA);
-      Item_AreaCopy(180, 89, 260, 100, TEMP_CASE_ABS);
+      DWIN_Frame_AreaCopy(1, 100, 89, 178, 101, LBLX, MBASE(TEMP_CASE_PLA));
+      DWIN_Frame_AreaCopy(1, 180, 89, 260, 100, LBLX, MBASE(TEMP_CASE_ABS));
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_TEMPERATURE));
     #else
-      DWIN_Frame_TitleCopy(56, 15, 85, 14);   // "Temperature"
+      DWIN_Frame_TitleCopy(1, 56, 16, 141, 28);                                       // "Temperature"
     #endif
     #ifdef USE_STRING_TITLES
       #if HAS_HOTEND
-        DWIN_Draw_Label(TEMP_CASE_TEMP, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
+        DWIN_Draw_Label(MBASE(TEMP_CASE_TEMP), GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
       #endif
       #if HAS_HEATED_BED
-        DWIN_Draw_Label(TEMP_CASE_BED, GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
+        DWIN_Draw_Label(MBASE(TEMP_CASE_BED), GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
       #endif
       #if HAS_FAN
-        DWIN_Draw_Label(TEMP_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
+        DWIN_Draw_Label(MBASE(TEMP_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
       #endif
       #if HAS_HOTEND
-        DWIN_Draw_Label(TEMP_CASE_PLA, F(PREHEAT_1_LABEL " Preheat Settings"));
-        DWIN_Draw_Label(TEMP_CASE_ABS, F(PREHEAT_2_LABEL " Preheat Settings"));
+        DWIN_Draw_Label(MBASE(TEMP_CASE_PLA), F("PLA Preheat Settings"));
+        DWIN_Draw_Label(MBASE(TEMP_CASE_ABS), F("ABS Preheat Settings"));
       #endif
     #else
       #if HAS_HOTEND
-        Item_AreaCopy(197, 104, 238, 114, TEMP_CASE_TEMP);    // "Nozzle"
-        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_TEMP, 44);  // "Temperature"
+        DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX, MBASE(TEMP_CASE_TEMP));      // Nozzle...
+        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 44, MBASE(TEMP_CASE_TEMP));     // ...Temperature
       #endif
       #if HAS_HEATED_BED
-        Item_AreaCopy(240, 104, 264, 114, TEMP_CASE_BED);     // "Bed"
-        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_BED, 27);   // "Temperature"
+        DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX, MBASE(TEMP_CASE_BED));       // Bed...
+        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 27, MBASE(TEMP_CASE_BED));      // ...Temperature
       #endif
       #if HAS_FAN
-        Item_AreaCopy(  1, 119,  61, 132, TEMP_CASE_FAN);     // "Fan speed"
+        DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX, MBASE(TEMP_CASE_FAN));          // Fan speed
       #endif
       #if HAS_HOTEND
-        Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_PLA);     // "Preheat"
-        say_pla_en(52, TEMP_CASE_PLA);                        // "PLA"
-        Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_PLA, 79); // "Settings"
-
-        Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_ABS);     // "Preheat"
-        say_abs_en(52, TEMP_CASE_ABS);                        // "ABS"
-        Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_ABS, 81); // "Settings"
+        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(TEMP_CASE_PLA));         // Preheat...
+        DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX + 52, MBASE(TEMP_CASE_PLA));    // ...PLA
+        DWIN_Frame_AreaCopy(1, 131, 119, 182, 132, LBLX + 79, MBASE(TEMP_CASE_PLA));  // PLA setting
+        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(TEMP_CASE_ABS));         // Preheat...
+        DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX + 52, MBASE(TEMP_CASE_ABS));    // ...ABS
+        DWIN_Frame_AreaCopy(1, 131, 119, 182, 132, LBLX + 81, MBASE(TEMP_CASE_ABS));  // ABS setting
       #endif
     #endif
   }
 
-  Draw_Back_First(select_temp.now == CASE_BACK);
-  if (select_temp.now != CASE_BACK) Draw_Menu_Cursor(select_temp.now);
+  Draw_Back_First(select_temp.now == 0);
+  if (select_temp.now) Draw_Menu_Cursor(select_temp.now);
 
   // Draw icons and lines
   uint8_t i = 0;
   #define _TMENU_ICON(N) Draw_Menu_Line(++i, ICON_SetEndTemp + (N) - 1)
   #if HAS_HOTEND
     _TMENU_ICON(TEMP_CASE_TEMP);
-    Draw_Edit_Integer3(i, thermalManager.degTargetHotend(0));
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), thermalManager.degTargetHotend(0));
   #endif
   #if HAS_HEATED_BED
     _TMENU_ICON(TEMP_CASE_BED);
-    Draw_Edit_Integer3(i, thermalManager.degTargetBed());
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), thermalManager.degTargetBed());
   #endif
   #if HAS_FAN
     _TMENU_ICON(TEMP_CASE_FAN);
-    Draw_Edit_Integer3(i, thermalManager.fan_speed[0]);
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), thermalManager.fan_speed[0]);
   #endif
   #if HAS_HOTEND
     // PLA/ABS items have submenus
@@ -2844,9 +2644,9 @@ void Draw_Temperature_Menu() {
   #endif
 }
 
-// Control
+/* Control */
 void HMI_Control() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -2859,14 +2659,20 @@ void HMI_Control() {
         Scroll_Menu(DWIN_SCROLL_UP);
 
         switch (index_control) {  // Last menu items
-          case CONTROL_CASE_ADVSET: Item_Control_Advanced(MROWS); break;
-          case CONTROL_CASE_INFO:   Item_Control_Info(MROWS);     break;
+          case CONTROL_CASE_ADVSET:  // Advanced Settings >
+            Draw_Menu_Item(MROWS, ICON_AdvSet, GET_TEXT(MSG_ADVANCED_SETTINGS), true);
+            break;
+          case CONTROL_CASE_INFO:    // Info >
+            Item_Control_Info(MBASE(MROWS));
+            Draw_Menu_Icon(MROWS, ICON_Info);
+            break;
           default: break;
         }
 
       }
-      else
+      else {
         Move_Highlight(1, select_control.now + MROWS - index_control);
+      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
@@ -2875,53 +2681,59 @@ void HMI_Control() {
         index_control--;
         Scroll_Menu(DWIN_SCROLL_DOWN);
         switch (index_control) {  // First menu items
-          case MROWS:     Draw_Back_First();      break;
-          case MROWS + 1: Item_Control_Temp(0);   break;
-          case MROWS + 2: Item_Control_Motion(0); break;
+          case MROWS :
+          Draw_Back_First();
+            break;
+          case MROWS + 1: // Temperature >
+            Draw_Menu_Line(0, ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), true);
+            break;
+          case MROWS + 2: // Move >
+            Draw_Menu_Line(0, ICON_Motion, GET_TEXT(MSG_MOTION), true);
           default: break;
         }
       }
-      else
+      else {
         Move_Highlight(-1, select_control.now + MROWS - index_control);
+      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_control.now) {
-      case CASE_BACK:
+      case 0: // Back
         select_page.set(2);
         Goto_MainMenu();
         break;
-      case CONTROL_CASE_TEMP:
+      case CONTROL_CASE_TEMP: // Temperature
         checkkey = TemperatureID;
         HMI_ValueStruct.show_mode = -1;
         select_temp.reset();
         Draw_Temperature_Menu();
         break;
-      case CONTROL_CASE_MOVE:
+      case CONTROL_CASE_MOVE: // Motion
         checkkey = Motion;
         select_motion.reset();
         Draw_Motion_Menu();
         break;
       #if ENABLED(EEPROM_SETTINGS)
-        case CONTROL_CASE_SAVE: {
+        case CONTROL_CASE_SAVE: { // Write EEPROM
           const bool success = settings.save();
           HMI_AudioFeedback(success);
         } break;
-        case CONTROL_CASE_LOAD: {
+        case CONTROL_CASE_LOAD: { // Read EEPROM
           const bool success = settings.load();
           HMI_AudioFeedback(success);
         } break;
-        case CONTROL_CASE_RESET:
+        case CONTROL_CASE_RESET: // Reset EEPROM
           settings.reset();
           HMI_AudioFeedback();
           break;
       #endif
-      case CONTROL_CASE_ADVSET:
+      case CONTROL_CASE_ADVSET: // Advanced Settings
         checkkey = AdvSet;
         select_advset.reset();
-        Draw_AdvancedSettings_Menu();
+        Draw_AdvSet_Menu();
         break;
-      case CONTROL_CASE_INFO:
+      case CONTROL_CASE_INFO: // Info
         checkkey = Info;
         Draw_Info_Menu();
         break;
@@ -2931,31 +2743,34 @@ void HMI_Control() {
   DWIN_UpdateLCD();
 }
 
+
 #if HAS_ONESTEP_LEVELING
-  // Leveling
+
+  /* Leveling */
   void HMI_Leveling() {
     Popup_Window_Leveling();
     DWIN_UpdateLCD();
     queue.inject_P(PSTR("G28O\nG29"));
   }
+
 #endif
 
-// Axis Move
+/* Axis Move */
 void HMI_AxisMove() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     // popup window resume
-    if (HMI_flag.cold_flag) {
+    if (HMI_flag.ETempTooLow_flag) {
       if (encoder_diffState == ENCODER_DIFF_ENTER) {
-        HMI_flag.cold_flag = false;
+        HMI_flag.ETempTooLow_flag = false;
         HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
         Draw_Move_Menu();
-        Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled);
-        Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled);
-        Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled);
-        Draw_Edit_Signed_Float3(4, 0);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(4), 0);
         DWIN_UpdateLCD();
       }
       return;
@@ -2971,7 +2786,7 @@ void HMI_AxisMove() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_axis.now) {
-      case CASE_BACK:
+      case 0: // Back
         checkkey = Prepare;
         select_prepare.set(1);
         index_prepare = MROWS;
@@ -2980,26 +2795,27 @@ void HMI_AxisMove() {
       case 1: // X axis move
         checkkey = Move_X;
         HMI_ValueStruct.Move_X_scaled = current_position.x * MINUNITMULT;
-        Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled, true);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 1, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
         EncoderRate.enabled = true;
         break;
       case 2: // Y axis move
         checkkey = Move_Y;
         HMI_ValueStruct.Move_Y_scaled = current_position.y * MINUNITMULT;
-        Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled, true);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 1, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
         EncoderRate.enabled = true;
         break;
       case 3: // Z axis move
         checkkey = Move_Z;
         HMI_ValueStruct.Move_Z_scaled = current_position.z * MINUNITMULT;
-        Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled, true);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 1, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
         EncoderRate.enabled = true;
         break;
         #if HAS_HOTEND
           case 4: // Extruder
-            #if ENABLED(PREVENT_COLD_EXTRUSION)
+            // window tips
+            #ifdef PREVENT_COLD_EXTRUSION
               if (thermalManager.tooColdToExtrude(0)) {
-                HMI_flag.cold_flag = true;
+                HMI_flag.ETempTooLow_flag = true;
                 Popup_Window_ETempTooLow();
                 DWIN_UpdateLCD();
                 return;
@@ -3007,7 +2823,7 @@ void HMI_AxisMove() {
             #endif
             checkkey = Extruder;
             HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
-            Draw_Edit_Signed_Float3(4, HMI_ValueStruct.Move_E_scaled, true);
+            DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3016,9 +2832,9 @@ void HMI_AxisMove() {
   DWIN_UpdateLCD();
 }
 
-// TemperatureID
+/* TemperatureID */
 void HMI_Temperature() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3030,38 +2846,38 @@ void HMI_Temperature() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_temp.now) {
-      case CASE_BACK:
+      case 0: // Back
         checkkey = Control;
         select_control.set(1);
         index_control = MROWS;
         Draw_Control_Menu();
         break;
       #if HAS_HOTEND
-        case TEMP_CASE_TEMP:
+        case TEMP_CASE_TEMP: // Nozzle temperature
           checkkey = ETemp;
           HMI_ValueStruct.E_Temp = thermalManager.degTargetHotend(0);
-          Draw_Edit_Integer3(1, HMI_ValueStruct.E_Temp, true);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(1), HMI_ValueStruct.E_Temp);
           EncoderRate.enabled = true;
           break;
       #endif
       #if HAS_HEATED_BED
-        case TEMP_CASE_BED:
+        case TEMP_CASE_BED: // Bed temperature
           checkkey = BedTemp;
           HMI_ValueStruct.Bed_Temp = thermalManager.degTargetBed();
-          Draw_Edit_Integer3(2, HMI_ValueStruct.Bed_Temp, true);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(2), HMI_ValueStruct.Bed_Temp);
           EncoderRate.enabled = true;
           break;
       #endif
       #if HAS_FAN
-        case TEMP_CASE_FAN:
+        case TEMP_CASE_FAN: // Fan speed
           checkkey = FanSpeed;
           HMI_ValueStruct.Fan_speed = thermalManager.fan_speed[0];
-          Draw_Edit_Integer3(3, HMI_ValueStruct.Fan_speed, true);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(3), HMI_ValueStruct.Fan_speed);
           EncoderRate.enabled = true;
           break;
       #endif
       #if HAS_HOTEND
-        case TEMP_CASE_PLA: {
+        case TEMP_CASE_PLA: { // PLA preheat setting
           checkkey = PLAPreheat;
           select_PLA.reset();
           HMI_ValueStruct.show_mode = -2;
@@ -3069,53 +2885,53 @@ void HMI_Temperature() {
           Clear_Main_Window();
 
           if (HMI_IsChinese()) {
-            DWIN_Frame_TitleCopy(59, 16, 81, 14);                       // "PLA Settings"
-            Item_AreaCopy(100, 89, 124, 101, PREHEAT_CASE_TEMP);
-            Item_AreaCopy(1, 134, 56, 146, PREHEAT_CASE_TEMP, 24);      // PLA nozzle temp
+            DWIN_Frame_TitleCopy(1, 59, 16, 139, 29);                                         // "PLA Settings"
+            DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_TEMP));
+            DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX + 24, MBASE(PREHEAT_CASE_TEMP));     // PLA nozzle temp
             #if HAS_HEATED_BED
-              Item_AreaCopy(100, 89, 124, 101, PREHEAT_CASE_BED);
-              Item_AreaCopy(58, 134, 113, 146, PREHEAT_CASE_BED, 24);   // PLA bed temp
+              DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_BED));
+              DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX + 24, MBASE(PREHEAT_CASE_BED));  // PLA bed temp
             #endif
             #if HAS_FAN
-              Item_AreaCopy(100, 89, 124, 101, PREHEAT_CASE_FAN);
-              Item_AreaCopy(115, 134, 170, 146, PREHEAT_CASE_FAN, 24);  // PLA fan speed
+              DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_FAN));
+              DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX + 24, MBASE(PREHEAT_CASE_FAN)); // PLA fan speed
             #endif
             #if ENABLED(EEPROM_SETTINGS)
-              Item_AreaCopy(72, 148, 151, 162, PREHEAT_CASE_SAVE);      // Save PLA configuration
+              DWIN_Frame_AreaCopy(1, 72, 148, 151, 162, LBLX, MBASE(PREHEAT_CASE_SAVE));      // Save PLA configuration
             #endif
           }
           else {
             #ifdef USE_STRING_HEADINGS
-              Draw_Title(PREHEAT_1_LABEL " Settings"); // TODO: GET_TEXT_F
+              Draw_Title("PLA Settings"); // TODO: GET_TEXT_F
             #else
-              DWIN_Frame_TitleCopy(56, 15, 85, 14);                       // "Temperature"  TODO: "PLA Settings"
+              DWIN_Frame_TitleCopy(1, 56, 16, 141, 28);                                       // "PLA Settings"
             #endif
             #ifdef USE_STRING_TITLES
-              DWIN_Draw_Label(PREHEAT_CASE_TEMP, F("Nozzle Temp"));
+              DWIN_Draw_Label(MBASE(PREHEAT_CASE_TEMP), F("Nozzle Temp"));
               #if HAS_HEATED_BED
-                DWIN_Draw_Label(PREHEAT_CASE_BED, F("Bed Temp"));
+                DWIN_Draw_Label(MBASE(PREHEAT_CASE_BED), F("Bed Temp"));
               #endif
               #if HAS_FAN
-                DWIN_Draw_Label(PREHEAT_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
+                DWIN_Draw_Label(MBASE(PREHEAT_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                DWIN_Draw_Label(PREHEAT_CASE_SAVE, GET_TEXT_F(MSG_STORE_EEPROM));
+                DWIN_Draw_Label(MBASE(PREHEAT_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));
               #endif
             #else
-              say_pla_en(0, PREHEAT_CASE_TEMP);                           // "PLA"
-              Item_AreaCopy(198, 104, 237, 114, PREHEAT_CASE_TEMP, 27);   // "Nozzle"
-              Item_AreaCopy(1,  89,  81, 102, PREHEAT_CASE_TEMP, 71);     // "Temperature"
+              DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX, MBASE(PREHEAT_CASE_TEMP));
+              DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX + 27, MBASE(PREHEAT_CASE_TEMP));
+              DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 71, MBASE(PREHEAT_CASE_TEMP));      // PLA nozzle temp
               #if HAS_HEATED_BED
-                say_pla_en(0, PREHEAT_CASE_BED);                          // "PLA"
-                Item_AreaCopy(240, 104, 264, 114, PREHEAT_CASE_BED, 27);  // "Bed"
-                Item_AreaCopy(1, 89, 83, 101, PREHEAT_CASE_BED, 54);      // "Temperature"
+                DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX, MBASE(PREHEAT_CASE_BED) + 3);
+                DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX + 27, MBASE(PREHEAT_CASE_BED) + 3);
+                DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 54, MBASE(PREHEAT_CASE_BED) + 3); // PLA bed temp
               #endif
               #if HAS_FAN
-                say_pla_en(0, PREHEAT_CASE_FAN);                          // "PLA"
-                Item_AreaCopy(0, 119, 64, 132, PREHEAT_CASE_FAN, 27);     // "Fan speed"
+                DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX, MBASE(PREHEAT_CASE_FAN));
+                DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX + 27, MBASE(PREHEAT_CASE_FAN));    // PLA fan speed
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                Item_AreaCopy(98, 164, 233, 177, PREHEAT_CASE_SAVE);      // "Save PLA parameters"
+                DWIN_Frame_AreaCopy(1, 97, 165, 229, 177, LBLX, MBASE(PREHEAT_CASE_SAVE));      // Save PLA configuration
               #endif
             #endif
           }
@@ -3124,14 +2940,14 @@ void HMI_Temperature() {
 
           uint8_t i = 0;
           Draw_Menu_Line(++i, ICON_SetEndTemp);
-          Draw_Edit_Integer3(i, ui.material_preset[0].hotend_temp);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[0].hotend_temp);
           #if HAS_HEATED_BED
             Draw_Menu_Line(++i, ICON_SetBedTemp);
-            Draw_Edit_Integer3(i, ui.material_preset[0].bed_temp);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[0].bed_temp);
           #endif
           #if HAS_FAN
             Draw_Menu_Line(++i, ICON_FanSpeed);
-            Draw_Edit_Integer3(i, ui.material_preset[0].fan_speed);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[0].fan_speed);
           #endif
           #if ENABLED(EEPROM_SETTINGS)
             Draw_Menu_Line(++i, ICON_WriteEEPROM);
@@ -3146,56 +2962,56 @@ void HMI_Temperature() {
           Clear_Main_Window();
 
           if (HMI_IsChinese()) {
-            DWIN_Frame_TitleCopy(142, 16, 82, 14);                        // "ABS Settings"
+            DWIN_Frame_TitleCopy(1, 142, 16, 223, 29);                                        // "ABS Settings"
 
-            Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_TEMP);
-            Item_AreaCopy(1, 134, 56, 146, PREHEAT_CASE_TEMP, 24);        // ABS nozzle temp
+            DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_TEMP));
+            DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX + 24, MBASE(PREHEAT_CASE_TEMP));    // ABS nozzle temp
             #if HAS_HEATED_BED
-              Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_BED);
-              Item_AreaCopy(58, 134, 113, 146, PREHEAT_CASE_BED, 24);     // ABS bed temp
+              DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_BED));
+              DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX + 24, MBASE(PREHEAT_CASE_BED));  // ABS bed temp
             #endif
             #if HAS_FAN
-              Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_FAN);
-              Item_AreaCopy(115, 134, 170, 146, PREHEAT_CASE_FAN, 24);    // ABS fan speed
+              DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_FAN));
+              DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX + 24, MBASE(PREHEAT_CASE_FAN)); // ABS fan speed
             #endif
             #if ENABLED(EEPROM_SETTINGS)
-              Item_AreaCopy(72, 148, 151, 162, PREHEAT_CASE_SAVE);
-              Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_SAVE, 28, 2); // Save ABS configuration
+              DWIN_Frame_AreaCopy(1, 72, 148, 151, 162, LBLX, MBASE(PREHEAT_CASE_SAVE));
+              DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX + 28, MBASE(PREHEAT_CASE_SAVE) + 2);   // Save ABS configuration
             #endif
           }
           else {
             #ifdef USE_STRING_HEADINGS
               Draw_Title("ABS Settings"); // TODO: GET_TEXT_F
             #else
-              DWIN_Frame_TitleCopy(56, 15, 85, 14);                       // "Temperature"  TODO: "ABS Settings"
+              DWIN_Frame_TitleCopy(1, 56, 16, 141, 28);                                                  // "ABS Settings"
             #endif
             #ifdef USE_STRING_TITLES
-              DWIN_Draw_Label(PREHEAT_CASE_TEMP, F("Nozzle Temp"));
+              DWIN_Draw_Label(MBASE(PREHEAT_CASE_TEMP), F("Nozzle Temp"));
               #if HAS_HEATED_BED
-                DWIN_Draw_Label(PREHEAT_CASE_BED, F("Bed Temp"));
+                DWIN_Draw_Label(MBASE(PREHEAT_CASE_BED), F("Bed Temp"));
               #endif
               #if HAS_FAN
-                DWIN_Draw_Label(PREHEAT_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
+                DWIN_Draw_Label(MBASE(PREHEAT_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                DWIN_Draw_Label(PREHEAT_CASE_SAVE, GET_TEXT_F(MSG_STORE_EEPROM));
+                DWIN_Draw_Label(MBASE(PREHEAT_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));
               #endif
             #else
-              say_abs_en(0, PREHEAT_CASE_TEMP);                           // "ABS"
-              Item_AreaCopy(197, 104, 238, 114, PREHEAT_CASE_TEMP, 29);   // "Nozzle"
-              Item_AreaCopy(1,  89,  34, 102, PREHEAT_CASE_TEMP, 73);     // "Temp"
+              DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX, MBASE(PREHEAT_CASE_TEMP));
+              DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX + 27, MBASE(PREHEAT_CASE_TEMP));
+              DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 71, MBASE(PREHEAT_CASE_TEMP));      // ABS nozzle temp
               #if HAS_HEATED_BED
-                say_abs_en(0, PREHEAT_CASE_BED);                          // "ABS"
-                Item_AreaCopy(240, 104, 264, 114, PREHEAT_CASE_BED, 29);  // "Bed"
-                Item_AreaCopy(1,  89,  83, 102, PREHEAT_CASE_BED, 56);    // "Temperature"
+                DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX, MBASE(PREHEAT_CASE_BED) + 3);
+                DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX + 27, MBASE(PREHEAT_CASE_BED) + 3);
+                DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 54, MBASE(PREHEAT_CASE_BED) + 3); // ABS bed temp
               #endif
               #if HAS_FAN
-                say_abs_en(0, PREHEAT_CASE_FAN);                          // "ABS"
-                Item_AreaCopy(0, 119,  64, 132, PREHEAT_CASE_FAN, 29);    // "Fan speed"
+                DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX, MBASE(PREHEAT_CASE_FAN));
+                DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX + 27, MBASE(PREHEAT_CASE_FAN));             // ABS fan speed
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                Item_AreaCopy(98, 165, 233, 177, PREHEAT_CASE_SAVE);      // "Save PLA parameters"
-                say_abs_en(33, PREHEAT_CASE_SAVE);                        // "ABS"
+                DWIN_Frame_AreaCopy(1, 97, 165, 229, 177, LBLX, MBASE(PREHEAT_CASE_SAVE));
+                DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX + 33, MBASE(PREHEAT_CASE_SAVE));                     // Save ABS configuration
               #endif
             #endif
           }
@@ -3204,14 +3020,14 @@ void HMI_Temperature() {
 
           uint8_t i = 0;
           Draw_Menu_Line(++i, ICON_SetEndTemp);
-          Draw_Edit_Integer3(i, ui.material_preset[1].hotend_temp);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[1].hotend_temp);
           #if HAS_HEATED_BED
             Draw_Menu_Line(++i, ICON_SetBedTemp);
-            Draw_Edit_Integer3(i, ui.material_preset[1].bed_temp);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[1].bed_temp);
           #endif
           #if HAS_FAN
             Draw_Menu_Line(++i, ICON_FanSpeed);
-            Draw_Edit_Integer3(i, ui.material_preset[1].fan_speed);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[1].fan_speed);
           #endif
           #if ENABLED(EEPROM_SETTINGS)
             Draw_Menu_Line(++i, ICON_WriteEEPROM);
@@ -3229,53 +3045,63 @@ void Draw_Max_Speed_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 16, 28, 13);          // "Max Speed (mm/s)"
+    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Max Speed (mm/s)"
 
-    auto say_max_speed_cn = [](const uint8_t line) {
-      Item_AreaCopy(173, 133, 228, 147, line);    // "Max speed"
+    auto say_max_speed = [](const uint16_t row) {
+      DWIN_Frame_AreaCopy(1, 173, 133, 228, 147, LBLX, row);              // "Max speed"
     };
 
-    say_max_speed_cn(1);                          // "Max speed"
-    Item_AreaCopy(229, 133, 236, 147, 1, 58);     // "X"
-    say_max_speed_cn(2);                          // "Max speed"
-    Item_AreaCopy(1, 150, 7, 160, 2, 58, 3);      // "Y"
-    say_max_speed_cn(3);                          // "Max speed"
-    Item_AreaCopy(9, 150, 16, 160, 3, 58, 3);     // "Z"
+    say_max_speed(MBASE(1));                                              // "Max speed"
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 58, MBASE(1));      // X
+    say_max_speed(MBASE(2));                                              // "Max speed"
+    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 58, MBASE(2) + 3);      // Y
+    say_max_speed(MBASE(3));                                              // "Max speed"
+    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 58, MBASE(3) + 3);     // Z
     #if HAS_HOTEND
-      say_max_speed_cn(4);                        // "Max speed"
-      Item_AreaCopy(18, 150, 25, 160, 4, 58, 3);  // "E"
+      say_max_speed(MBASE(4));                                            // "Max speed"
+      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 58, MBASE(4) + 3);  // E
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title("Max Speed (mm/s)"); // TODO: GET_TEXT_F
     #else
-      DWIN_Frame_TitleCopy(144, 16, 46, 11);                  // "Max Speed (mm/s)"
+      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26); // "Max Speed (mm/s)"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(1, F("Max Feedrate X"));
-      DWIN_Draw_Label(2, F("Max Feedrate Y"));
-      DWIN_Draw_Label(3, F("Max Feedrate Z"));
+      DWIN_Draw_Label(MBASE(1), F("Max Feedrate X"));
+      DWIN_Draw_Label(MBASE(2), F("Max Feedrate Y"));
+      DWIN_Draw_Label(MBASE(3), F("Max Feedrate Z"));
       #if HAS_HOTEND
-        DWIN_Draw_Label(4, F("Max Feedrate E"));
+        DWIN_Draw_Label(MBASE(4), F("Max Feedrate E"));
       #endif
     #else
-      say_max_en(1); say_speed_en(30, 1); say_x_en(73, 1);    // "Max Speed X"
-      say_max_en(2); say_speed_en(30, 2); say_y_en(73, 2);    // "Max Speed Y"
-      say_max_en(3); say_speed_en(30, 3); say_z_en(73, 3);    // "Max Speed Z"
+      draw_max_en(MBASE(1));          // "Max"
+      DWIN_Frame_AreaCopy(1, 184, 119, 234, 132, LBLX + 27, MBASE(1)); // "Speed X"
+
+      draw_max_en(MBASE(2));          // "Max"
+      draw_speed_en(27, MBASE(2));    // "Speed"
+      say_y(70, MBASE(2));            // "Y"
+
+      draw_max_en(MBASE(3));          // "Max"
+      draw_speed_en(27, MBASE(3));    // "Speed"
+      say_z(70, MBASE(3));            // "Z"
+
       #if HAS_HOTEND
-        say_max_en(4); say_speed_en(30, 4); say_e_en(73, 4);  // "Max Speed E"
+        draw_max_en(MBASE(4));        // "Max"
+        draw_speed_en(27, MBASE(4));  // "Speed"
+        say_e(70, MBASE(4));          // "E"
       #endif
     #endif
   }
 
   Draw_Back_First();
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxSpeedX + i);
-  Draw_Edit_Integer4(1, planner.settings.max_feedrate_mm_s[X_AXIS]);
-  Draw_Edit_Integer4(2, planner.settings.max_feedrate_mm_s[Y_AXIS]);
-  Draw_Edit_Integer4(3, planner.settings.max_feedrate_mm_s[Z_AXIS]);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(1), planner.settings.max_feedrate_mm_s[X_AXIS]);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(2), planner.settings.max_feedrate_mm_s[Y_AXIS]);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(3), planner.settings.max_feedrate_mm_s[Z_AXIS]);
   #if HAS_HOTEND
-    Draw_Edit_Integer4(4, planner.settings.max_feedrate_mm_s[E_AXIS]);
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(4), planner.settings.max_feedrate_mm_s[E_AXIS]);
   #endif
 }
 
@@ -3283,53 +3109,53 @@ void Draw_Max_Accel_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 16, 28, 13);            // "Acceleration"
+    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Acceleration"
 
-    Item_AreaCopy(173, 133, 200, 147, 1);
-    Item_AreaCopy( 28, 149,  69, 161, 1, 30, 1);
-    Item_AreaCopy(229, 133, 236, 147, 1, 74);       // Max acceleration X
-    Item_AreaCopy(173, 133, 200, 147, 2);
-    Item_AreaCopy( 28, 149,  69, 161, 2, 30, 1);
-    Item_AreaCopy(  1, 150,   7, 160, 2, 74, 2);    // Max acceleration Y
-    Item_AreaCopy(173, 133, 200, 147, 3);
-    Item_AreaCopy( 28, 149,  69, 161, 3, 30, 1);
-    Item_AreaCopy(  9, 150,  16, 160, 3, 74, 2);    // Max acceleration Z
+    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(1));
+    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(1) + 1);
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 71, MBASE(1));   // Max acceleration X
+    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(2));
+    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(2) + 1);
+    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 71, MBASE(2) + 2);   // Max acceleration Y
+    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(3));
+    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(3) + 1);
+    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 71, MBASE(3) + 2);  // Max acceleration Z
     #if HAS_HOTEND
-      Item_AreaCopy(173, 133, 200, 147, 4);
-      Item_AreaCopy( 28, 149,  69, 161, 4, 30, 1);
-      Item_AreaCopy( 18, 150,  25, 160, 4, 74, 2);  // Max acceleration E
+      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(4));
+      DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(4) + 1);
+      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 71, MBASE(4) + 2); // Max acceleration E
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_ACCELERATION));
     #else
-      DWIN_Frame_TitleCopy(144, 16, 46, 11);    // "Acceleration"
+      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26);          // "Acceleration"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(1, F("Max Accel X"));
-      DWIN_Draw_Label(2, F("Max Accel Y"));
-      DWIN_Draw_Label(3, F("Max Accel Z"));
+      DWIN_Draw_Label(MBASE(1), F("Max Accel X"));
+      DWIN_Draw_Label(MBASE(2), F("Max Accel Y"));
+      DWIN_Draw_Label(MBASE(3), F("Max Accel Z"));
       #if HAS_HOTEND
-        DWIN_Draw_Label(4, F("Max Accel E"));
+        DWIN_Draw_Label(MBASE(4), F("Max Accel E"));
       #endif
     #else
-      say_max_accel_en(1); say_x_en(112, 1);    // "Max Acceleration X"
-      say_max_accel_en(2); say_y_en(112, 2);    // "Max Acceleration Y"
-      say_max_accel_en(3); say_z_en(112, 3);    // "Max Acceleration Z"
+      draw_max_accel_en(MBASE(1)); say_x(108, MBASE(1));  // "Max Acceleration X"
+      draw_max_accel_en(MBASE(2)); say_y(108, MBASE(2));  // "Max Acceleration Y"
+      draw_max_accel_en(MBASE(3)); say_z(108, MBASE(3));  // "Max Acceleration Z"
       #if HAS_HOTEND
-        say_max_accel_en(4); say_e_en(112, 4);  // "Max Acceleration E"
+        draw_max_accel_en(MBASE(4)); say_e(108, MBASE(4)); // "Max Acceleration E"
       #endif
     #endif
   }
 
   Draw_Back_First();
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxAccX + i);
-  Draw_Edit_Integer4(1, planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
-  Draw_Edit_Integer4(2, planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
-  Draw_Edit_Integer4(3, planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(1), planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(2), planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(3), planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
   #if HAS_HOTEND
-    Draw_Edit_Integer4(4, planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
+    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(4), planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
   #endif
 }
 
@@ -3338,57 +3164,72 @@ void Draw_Max_Accel_Menu() {
     Clear_Main_Window();
 
     if (HMI_IsChinese()) {
-      DWIN_Frame_TitleCopy(1, 16, 28, 13);            // "Jerk"
+      DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Jerk"
 
-      Item_AreaCopy(173, 133, 200, 147, 1);
-      Item_AreaCopy(  1, 180,  28, 192, 1, 30, 1);
-      Item_AreaCopy(202, 133, 228, 147, 1, 56);
-      Item_AreaCopy(229, 133, 236, 147, 1, 86);       // Max Jerk speed X
-      Item_AreaCopy(173, 133, 200, 147, 2);
-      Item_AreaCopy(  1, 180,  28, 192, 2, 30, 1);
-      Item_AreaCopy(202, 133, 228, 147, 2, 56);
-      Item_AreaCopy(  1, 150,   7, 160, 2, 86, 3);    // Max Jerk speed Y
-      Item_AreaCopy(173, 133, 200, 147, 3);
-      Item_AreaCopy(  1, 180,  28, 192, 3, 30, 1);
-      Item_AreaCopy(202, 133, 228, 147, 3, 56);
-      Item_AreaCopy(  9, 150,  16, 160, 3, 86, 3);    // Max Jerk speed Z
+      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(1));
+      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(1) + 1);
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(1));
+      DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 83, MBASE(1));        // Max Jerk speed X
+      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(2));
+      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(2) + 1);
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(2));
+      DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 83, MBASE(2) + 3);    // Max Jerk speed Y
+      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(3));
+      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(3) + 1);
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(3));
+      DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 83, MBASE(3) + 3);    // Max Jerk speed Z
       #if HAS_HOTEND
-        Item_AreaCopy(173, 133, 200, 147, 4);
-        Item_AreaCopy(  1, 180,  28, 192, 4, 30, 1);
-        Item_AreaCopy(202, 133, 228, 147, 4, 56);
-        Item_AreaCopy( 18, 150,  25, 160, 4, 86, 3);  // Max Jerk speed E
+        DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(4));
+        DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(4) + 1);
+        DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(4));
+        DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 83, MBASE(4) + 3);  // Max Jerk speed E
       #endif
     }
     else {
       #ifdef USE_STRING_HEADINGS
         Draw_Title(GET_TEXT_F(MSG_JERK));
       #else
-        DWIN_Frame_TitleCopy(144, 16, 46, 11);        // "Jerk"
+        DWIN_Frame_TitleCopy(1, 144, 16, 189, 26); // "Jerk"
       #endif
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(1, GET_TEXT_F(MSG_VA_JERK));
-        DWIN_Draw_Label(2, GET_TEXT_F(MSG_VB_JERK));
-        DWIN_Draw_Label(3, GET_TEXT_F(MSG_VC_JERK));
+        DWIN_Draw_Label(MBASE(1), F("Max Jerk X"));
+        DWIN_Draw_Label(MBASE(2), F("Max Jerk Y"));
+        DWIN_Draw_Label(MBASE(3), F("Max Jerk Z"));
         #if HAS_HOTEND
-          DWIN_Draw_Label(4, GET_TEXT_F(MSG_VE_JERK));
+          DWIN_Draw_Label(MBASE(4), F("Max Jerk E"));
         #endif
       #else
-        say_max_jerk_speed_en(1); say_x_en(102, 1);   // Max Jerk speed X
-        say_max_jerk_speed_en(2); say_y_en(102, 2);   // Max Jerk speed Y
-        say_max_jerk_speed_en(3); say_z_en(102, 3);   // Max Jerk speed Z
+        draw_max_en(MBASE(1));          // "Max"
+        draw_jerk_en(MBASE(1));         // "Jerk"
+        draw_speed_en(72, MBASE(1));    // "Speed"
+        say_x(115, MBASE(1));           // "X"
+
+        draw_max_en(MBASE(2));          // "Max"
+        draw_jerk_en(MBASE(2));         // "Jerk"
+        draw_speed_en(72, MBASE(2));    // "Speed"
+        say_y(115, MBASE(2));           // "Y"
+
+        draw_max_en(MBASE(3));          // "Max"
+        draw_jerk_en(MBASE(3));         // "Jerk"
+        draw_speed_en(72, MBASE(3));    // "Speed"
+        say_z(115, MBASE(3));           // "Z"
+
         #if HAS_HOTEND
-          say_max_jerk_speed_en(4); say_e_en(102, 4); // Max Jerk speed E
+          draw_max_en(MBASE(4));        // "Max"
+          draw_jerk_en(MBASE(4));       // "Jerk"
+          draw_speed_en(72, MBASE(4));  // "Speed"
+          say_e(115, MBASE(4));         // "E"
         #endif
       #endif
     }
 
     Draw_Back_First();
     LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxSpeedJerkX + i);
-    Draw_Edit_Float3(1, planner.max_jerk[X_AXIS] * MINUNITMULT);
-    Draw_Edit_Float3(2, planner.max_jerk[Y_AXIS] * MINUNITMULT);
-    Draw_Edit_Float3(3, planner.max_jerk[Z_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(1), planner.max_jerk[X_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(2), planner.max_jerk[Y_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(3), planner.max_jerk[Z_AXIS] * MINUNITMULT);
     #if HAS_HOTEND
-      Draw_Edit_Float3(4, planner.max_jerk[E_AXIS] * MINUNITMULT);
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(4), planner.max_jerk[E_AXIS] * MINUNITMULT);
     #endif
   }
 #endif
@@ -3397,55 +3238,55 @@ void Draw_Steps_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 16, 28, 13);            // "Steps per mm"
+    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Steps per mm"
 
-    Item_AreaCopy(153, 148, 194, 161, 1);
-    Item_AreaCopy(229, 133, 236, 147, 1, 44);       // Transmission Ratio X
-    Item_AreaCopy(153, 148, 194, 161, 2);
-    Item_AreaCopy(  1, 150,   7, 160, 2, 44, 3);    // Transmission Ratio Y
-    Item_AreaCopy(153, 148, 194, 161, 3);
-    Item_AreaCopy(  9, 150,  16, 160, 3, 44, 3);    // Transmission Ratio Z
+    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(1));
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 44, MBASE(1)); // Transmission Ratio X
+    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(2));
+    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 44, MBASE(2) + 3); // Transmission Ratio Y
+    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(3));
+    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 44, MBASE(3) + 3); // Transmission Ratio Z
     #if HAS_HOTEND
-      Item_AreaCopy(153, 148, 194, 161, 4);
-      Item_AreaCopy( 18, 150,  25, 160, 4, 44, 3);  // Transmission Ratio E
+      DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(4));
+      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 44, MBASE(4) + 3); // Transmission Ratio E
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_STEPS_PER_MM));
     #else
-      DWIN_Frame_TitleCopy(144, 16, 46, 11);        // "Steps per mm"
+      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26); // "Steps per mm"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(1, GET_TEXT_F(MSG_A_STEPS));
-      DWIN_Draw_Label(2, GET_TEXT_F(MSG_B_STEPS));
-      DWIN_Draw_Label(3, GET_TEXT_F(MSG_C_STEPS));
+      DWIN_Draw_Label(MBASE(1), F("Steps/mm X"));
+      DWIN_Draw_Label(MBASE(2), F("Steps/mm Y"));
+      DWIN_Draw_Label(MBASE(3), F("Steps/mm Z"));
       #if HAS_HOTEND
-        DWIN_Draw_Label(4, GET_TEXT_F(MSG_E_STEPS));
+        DWIN_Draw_Label(MBASE(4), F("Steps/mm E"));
       #endif
     #else
-      say_steps_per_mm_en(1); say_x_en(101, 1);     // "Steps-per-mm X"
-      say_steps_per_mm_en(2); say_y_en(101, 2);     // "Y"
-      say_steps_per_mm_en(3); say_z_en(101, 3);     // "Z"
+      draw_steps_per_mm(MBASE(1)); say_x(103, MBASE(1)); // "Steps-per-mm X"
+      draw_steps_per_mm(MBASE(2)); say_y(103, MBASE(2)); // "Y"
+      draw_steps_per_mm(MBASE(3)); say_z(103, MBASE(3)); // "Z"
       #if HAS_HOTEND
-        say_steps_per_mm_en(4); say_e_en(101, 4);   // "E"
+        draw_steps_per_mm(MBASE(4)); say_e(103, MBASE(4)); // "E"
       #endif
     #endif
   }
 
   Draw_Back_First();
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_StepX + i);
-  Draw_Edit_Float3(1, planner.settings.axis_steps_per_mm[X_AXIS] * MINUNITMULT);
-  Draw_Edit_Float3(2, planner.settings.axis_steps_per_mm[Y_AXIS] * MINUNITMULT);
-  Draw_Edit_Float3(3, planner.settings.axis_steps_per_mm[Z_AXIS] * MINUNITMULT);
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(1), planner.settings.axis_steps_per_mm[X_AXIS] * MINUNITMULT);
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(2), planner.settings.axis_steps_per_mm[Y_AXIS] * MINUNITMULT);
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(3), planner.settings.axis_steps_per_mm[Z_AXIS] * MINUNITMULT);
   #if HAS_HOTEND
-    Draw_Edit_Float3(4, planner.settings.axis_steps_per_mm[E_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(4), planner.settings.axis_steps_per_mm[E_AXIS] * MINUNITMULT);
   #endif
 }
 
-// Motion
+/* Motion */
 void HMI_Motion() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3457,30 +3298,30 @@ void HMI_Motion() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_motion.now) {
-      case CASE_BACK:
+      case 0: // Back
         checkkey = Control;
         select_control.set(CONTROL_CASE_MOVE);
         index_control = MROWS;
         Draw_Control_Menu();
         break;
-      case MOTION_CASE_RATE:
+      case MOTION_CASE_RATE:   // Max speed
         checkkey = MaxSpeed;
         select_speed.reset();
         Draw_Max_Speed_Menu();
         break;
-      case MOTION_CASE_ACCEL:
+      case MOTION_CASE_ACCEL:  // Max acceleration
         checkkey = MaxAcceleration;
         select_acc.reset();
         Draw_Max_Accel_Menu();
         break;
       #if HAS_CLASSIC_JERK
-        case MOTION_CASE_JERK:
+        case MOTION_CASE_JERK: // Max jerk
           checkkey = MaxJerk;
           select_jerk.reset();
           Draw_Max_Jerk_Menu();
          break;
       #endif
-      case MOTION_CASE_STEPS:
+      case MOTION_CASE_STEPS:  // Steps per mm
         checkkey = Step;
         select_step.reset();
         Draw_Steps_Menu();
@@ -3491,9 +3332,9 @@ void HMI_Motion() {
   DWIN_UpdateLCD();
 }
 
-// Advanced Settings
+/* Advanced Settings */
 void HMI_AdvSet() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3532,7 +3373,7 @@ void HMI_AdvSet() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_advset.now) {
-      case CASE_BACK:
+      case 0: // Back
         checkkey = Control;
         select_control.set(CONTROL_CASE_ADVSET);
         index_control = CONTROL_CASE_ADVSET;
@@ -3540,7 +3381,7 @@ void HMI_AdvSet() {
         break;
 
       #if HAS_HOME_OFFSET
-        case ADVSET_CASE_HOMEOFF:
+        case ADVSET_CASE_HOMEOFF:   // Home Offsets
           checkkey = HomeOff;
           select_item.reset();
           HMI_ValueStruct.Home_OffX_scaled = home_offset[X_AXIS] * 10;
@@ -3551,7 +3392,7 @@ void HMI_AdvSet() {
       #endif
 
       #if HAS_ONESTEP_LEVELING
-        case ADVSET_CASE_PROBEOFF:
+        case ADVSET_CASE_PROBEOFF:   // Probe Offsets
           checkkey = ProbeOff;
           select_item.reset();
           HMI_ValueStruct.Probe_OffX_scaled = probe.offset.x * 10;
@@ -3561,23 +3402,23 @@ void HMI_AdvSet() {
       #endif
 
       #if HAS_HOTEND
-        case ADVSET_CASE_HEPID:
+        case ADVSET_CASE_HEPID:   // Nozzle PID Autotune
           thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0);
           thermalManager.PID_autotune(ui.material_preset[0].hotend_temp, H_E0, 10, true);
           break;
       #endif
 
       #if HAS_HEATED_BED
-        case ADVSET_CASE_BEDPID:
+        case ADVSET_CASE_BEDPID:  // Bed PID Autotune
           thermalManager.setTargetBed(ui.material_preset[0].bed_temp);
           thermalManager.PID_autotune(ui.material_preset[0].bed_temp, H_BED, 10, true);
           break;
       #endif
 
       #if ENABLED(POWER_LOSS_RECOVERY)
-        case ADVSET_CASE_PWRLOSSR:
+        case ADVSET_CASE_PWRLOSSR:  // Power-loss recovery
           recovery.enable(!recovery.enabled);
-          Draw_Checkbox_Line(ADVSET_CASE_PWRLOSSR + MROWS - index_advset, recovery.enabled);
+          Draw_Chkb_Line(ADVSET_CASE_PWRLOSSR + MROWS - index_advset, recovery.enabled);
           break;
       #endif
       default: break;
@@ -3588,9 +3429,9 @@ void HMI_AdvSet() {
 
 #if HAS_HOME_OFFSET
 
-  // Home Offset
+  /* Home Offset */
   void HMI_HomeOff() {
-    EncoderState encoder_diffState = get_encoder_state();
+    ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3602,24 +3443,24 @@ void HMI_AdvSet() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_item.now) {
-        case CASE_BACK:
+        case 0: // Back
           checkkey = AdvSet;
           select_advset.set(ADVSET_CASE_HOMEOFF);
-          Draw_AdvancedSettings_Menu();
+          Draw_AdvSet_Menu();
           break;
         case 1: // Home Offset X
           checkkey = HomeOffX;
-          Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Home_OffX_scaled, true);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(1), HMI_ValueStruct.Home_OffX_scaled);
           EncoderRate.enabled = true;
           break;
         case 2: // Home Offset Y
           checkkey = HomeOffY;
-          Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Home_OffY_scaled, true);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(2), HMI_ValueStruct.Home_OffY_scaled);
           EncoderRate.enabled = true;
           break;
         case 3: // Home Offset Z
           checkkey = HomeOffZ;
-          Draw_Edit_Signed_Float3(3, HMI_ValueStruct.Home_OffZ_scaled, true);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(3), HMI_ValueStruct.Home_OffZ_scaled);
           EncoderRate.enabled = true;
           break;
         default: break;
@@ -3629,18 +3470,18 @@ void HMI_AdvSet() {
   }
 
   void HMI_HomeOffN(const AxisEnum axis, float &posScaled, const_float_t lo, const_float_t hi) {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-
-    if (Apply_Encoder(encoder_diffState, posScaled)) {
-      checkkey = HomeOff;
-      EncoderRate.enabled = false;
-      set_home_offset(axis, posScaled / 10);
-      Draw_Edit_Signed_Float3(select_item.now, posScaled);
-      return;
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      if (Apply_Encoder(encoder_diffState, posScaled)) {
+        checkkey = HomeOff;
+        EncoderRate.enabled = false;
+        set_home_offset(axis, posScaled / 10);
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(select_item.now), posScaled);
+        return;
+      }
+      LIMIT(posScaled, lo, hi);
+      DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 216, MBASE(select_item.now), posScaled);
     }
-    LIMIT(posScaled, lo, hi);
-    Draw_Edit_Signed_Float3(select_item.now, posScaled, true);
   }
 
   void HMI_HomeOffX() { HMI_HomeOffN(X_AXIS, HMI_ValueStruct.Home_OffX_scaled, -500, 500); }
@@ -3650,10 +3491,9 @@ void HMI_AdvSet() {
 #endif // HAS_HOME_OFFSET
 
 #if HAS_ONESTEP_LEVELING
-
-  // Probe Offset
+  /*Probe Offset */
   void HMI_ProbeOff() {
-    EncoderState encoder_diffState = get_encoder_state();
+    ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3665,19 +3505,19 @@ void HMI_AdvSet() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_item.now) {
-        case CASE_BACK:
+        case 0: // Back
           checkkey = AdvSet;
           select_advset.set(ADVSET_CASE_PROBEOFF);
-          Draw_AdvancedSettings_Menu();
+          Draw_AdvSet_Menu();
           break;
         case 1: // Probe Offset X
           checkkey = ProbeOffX;
-          Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Probe_OffX_scaled, true);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
           EncoderRate.enabled = true;
           break;
-        case 2: // Probe Offset Y
+        case 2: // Probe Offset X
           checkkey = ProbeOffY;
-          Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Probe_OffY_scaled, true);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
           EncoderRate.enabled = true;
           break;
       }
@@ -3686,18 +3526,18 @@ void HMI_AdvSet() {
   }
 
   void HMI_ProbeOffN(float &posScaled, float &offset_ref) {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-
-    if (Apply_Encoder(encoder_diffState, posScaled)) {
-      checkkey = ProbeOff;
-      EncoderRate.enabled = false;
-      offset_ref = posScaled / 10;
-      Draw_Edit_Signed_Float3(select_item.now, posScaled);
-      return;
+    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState != ENCODER_DIFF_NO) {
+      if (Apply_Encoder(encoder_diffState, posScaled)) {
+        checkkey = ProbeOff;
+        EncoderRate.enabled = false;
+        offset_ref = posScaled / 10;
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(select_item.now), posScaled);
+        return;
+      }
+      LIMIT(posScaled, -500, 500);
+      DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 216, MBASE(select_item.now), posScaled);
     }
-    LIMIT(posScaled, -500, 500);
-    Draw_Edit_Signed_Float3(select_item.now, posScaled, true);
   }
 
   void HMI_ProbeOffX() { HMI_ProbeOffN(HMI_ValueStruct.Probe_OffX_scaled, probe.offset.x); }
@@ -3705,9 +3545,9 @@ void HMI_AdvSet() {
 
 #endif // HAS_ONESTEP_LEVELING
 
-// Info
+/* Info */
 void HMI_Info() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_ENTER) {
     #if HAS_ONESTEP_LEVELING
@@ -3722,9 +3562,9 @@ void HMI_Info() {
   DWIN_UpdateLCD();
 }
 
-// Tune
+/* Tune */
 void HMI_Tune() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3734,8 +3574,9 @@ void HMI_Tune() {
         index_tune = select_tune.now;
         Scroll_Menu(DWIN_SCROLL_UP);
       }
-      else
+      else {
         Move_Highlight(1, select_tune.now + MROWS - index_tune);
+      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
@@ -3745,8 +3586,9 @@ void HMI_Tune() {
         Scroll_Menu(DWIN_SCROLL_DOWN);
         if (index_tune == MROWS) Draw_Back_First();
       }
-      else
+      else {
         Move_Highlight(-1, select_tune.now + MROWS - index_tune);
+      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
@@ -3759,14 +3601,14 @@ void HMI_Tune() {
       case TUNE_CASE_SPEED: // Print speed
         checkkey = PrintSpeed;
         HMI_ValueStruct.print_speed = feedrate_percentage;
-        Draw_Edit_Integer3(TUNE_CASE_SPEED + MROWS - index_tune, HMI_ValueStruct.print_speed, true);
+        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_SPEED + MROWS - index_tune), HMI_ValueStruct.print_speed);
         EncoderRate.enabled = true;
         break;
       #if HAS_HOTEND
         case TUNE_CASE_TEMP: // Nozzle temp
           checkkey = ETemp;
           HMI_ValueStruct.E_Temp = thermalManager.degTargetHotend(0);
-          Draw_Edit_Integer3(TUNE_CASE_TEMP + MROWS - index_tune, HMI_ValueStruct.E_Temp, true);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_TEMP + MROWS - index_tune), HMI_ValueStruct.E_Temp);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -3774,7 +3616,7 @@ void HMI_Tune() {
         case TUNE_CASE_BED: // Bed temp
           checkkey = BedTemp;
           HMI_ValueStruct.Bed_Temp = thermalManager.degTargetBed();
-          Draw_Edit_Integer3(TUNE_CASE_BED + MROWS - index_tune, HMI_ValueStruct.Bed_Temp, true);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_BED + MROWS - index_tune), HMI_ValueStruct.Bed_Temp);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -3782,7 +3624,7 @@ void HMI_Tune() {
         case TUNE_CASE_FAN: // Fan speed
           checkkey = FanSpeed;
           HMI_ValueStruct.Fan_speed = thermalManager.fan_speed[0];
-          Draw_Edit_Integer3(TUNE_CASE_FAN + MROWS - index_tune, HMI_ValueStruct.Fan_speed, true);
+          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_FAN + MROWS - index_tune), HMI_ValueStruct.Fan_speed);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -3791,7 +3633,7 @@ void HMI_Tune() {
           #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
             checkkey = Homeoffset;
             HMI_ValueStruct.offset_value = BABY_Z_VAR * 100;
-            Draw_Edit_Signed_Float2(TUNE_CASE_ZOFF + MROWS - index_tune, HMI_ValueStruct.offset_value, true);
+            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, MBASE(TUNE_CASE_ZOFF + MROWS - index_tune), HMI_ValueStruct.offset_value);
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
@@ -3808,9 +3650,9 @@ void HMI_Tune() {
 
 #if HAS_PREHEAT
 
-  // PLA Preheat
+  /* PLA Preheat */
   void HMI_PLAPreheatSetting() {
-    EncoderState encoder_diffState = get_encoder_state();
+    ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3822,38 +3664,38 @@ void HMI_Tune() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_PLA.now) {
-        case CASE_BACK:
+        case 0: // Back
           checkkey = TemperatureID;
           select_temp.now = TEMP_CASE_PLA;
           HMI_ValueStruct.show_mode = -1;
           Draw_Temperature_Menu();
           break;
         #if HAS_HOTEND
-          case PREHEAT_CASE_TEMP:
+          case PREHEAT_CASE_TEMP: // Nozzle temperature
             checkkey = ETemp;
             HMI_ValueStruct.E_Temp = ui.material_preset[0].hotend_temp;
-            Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[0].hotend_temp, true);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_TEMP), ui.material_preset[0].hotend_temp);
             EncoderRate.enabled = true;
             break;
         #endif
         #if HAS_HEATED_BED
-          case PREHEAT_CASE_BED:
+          case PREHEAT_CASE_BED: // Bed temperature
             checkkey = BedTemp;
             HMI_ValueStruct.Bed_Temp = ui.material_preset[0].bed_temp;
-            Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[0].bed_temp, true);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_BED), ui.material_preset[0].bed_temp);
             EncoderRate.enabled = true;
             break;
         #endif
         #if HAS_FAN
-          case PREHEAT_CASE_FAN:
+          case PREHEAT_CASE_FAN: // Fan speed
             checkkey = FanSpeed;
             HMI_ValueStruct.Fan_speed = ui.material_preset[0].fan_speed;
-            Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[0].fan_speed, true);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_FAN), ui.material_preset[0].fan_speed);
             EncoderRate.enabled = true;
             break;
         #endif
         #if ENABLED(EEPROM_SETTINGS)
-          case PREHEAT_CASE_SAVE: {
+          case 4: { // Save PLA configuration
             const bool success = settings.save();
             HMI_AudioFeedback(success);
           } break;
@@ -3864,9 +3706,9 @@ void HMI_Tune() {
     DWIN_UpdateLCD();
   }
 
-  // ABS Preheat
+  /* ABS Preheat */
   void HMI_ABSPreheatSetting() {
-    EncoderState encoder_diffState = get_encoder_state();
+    ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3878,38 +3720,38 @@ void HMI_Tune() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_ABS.now) {
-        case CASE_BACK:
+        case 0: // Back
           checkkey = TemperatureID;
           select_temp.now = TEMP_CASE_ABS;
           HMI_ValueStruct.show_mode = -1;
           Draw_Temperature_Menu();
           break;
         #if HAS_HOTEND
-          case PREHEAT_CASE_TEMP:
+          case PREHEAT_CASE_TEMP: // Set nozzle temperature
             checkkey = ETemp;
             HMI_ValueStruct.E_Temp = ui.material_preset[1].hotend_temp;
-            Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[1].hotend_temp, true);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_TEMP), ui.material_preset[1].hotend_temp);
             EncoderRate.enabled = true;
             break;
         #endif
         #if HAS_HEATED_BED
-          case PREHEAT_CASE_BED:
+          case PREHEAT_CASE_BED: // Set bed temperature
             checkkey = BedTemp;
             HMI_ValueStruct.Bed_Temp = ui.material_preset[1].bed_temp;
-            Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[1].bed_temp, true);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_BED), ui.material_preset[1].bed_temp);
             EncoderRate.enabled = true;
             break;
         #endif
         #if HAS_FAN
-          case PREHEAT_CASE_FAN:
+          case PREHEAT_CASE_FAN: // Set fan speed
             checkkey = FanSpeed;
             HMI_ValueStruct.Fan_speed = ui.material_preset[1].fan_speed;
-            Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[1].fan_speed, true);
+            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_FAN), ui.material_preset[1].fan_speed);
             EncoderRate.enabled = true;
             break;
         #endif
         #if ENABLED(EEPROM_SETTINGS)
-          case PREHEAT_CASE_SAVE: {
+          case PREHEAT_CASE_SAVE: { // Save ABS configuration
             const bool success = settings.save();
             HMI_AudioFeedback(success);
           } break;
@@ -3922,9 +3764,9 @@ void HMI_Tune() {
 
 #endif
 
-// Max Speed
+/* Max Speed */
 void HMI_MaxSpeed() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3939,7 +3781,7 @@ void HMI_MaxSpeed() {
       checkkey = MaxSpeed_value;
       HMI_flag.feedspeed_axis = AxisEnum(select_speed.now - 1);
       HMI_ValueStruct.Max_Feedspeed = planner.settings.max_feedrate_mm_s[HMI_flag.feedspeed_axis];
-      Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed, true);
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_speed.now), HMI_ValueStruct.Max_Feedspeed);
       EncoderRate.enabled = true;
     }
     else { // Back
@@ -3951,9 +3793,9 @@ void HMI_MaxSpeed() {
   DWIN_UpdateLCD();
 }
 
-// Max Acceleration
+/* Max Acceleration */
 void HMI_MaxAcceleration() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3968,7 +3810,7 @@ void HMI_MaxAcceleration() {
       checkkey = MaxAcceleration_value;
       HMI_flag.acc_axis = AxisEnum(select_acc.now - 1);
       HMI_ValueStruct.Max_Acceleration = planner.settings.max_acceleration_mm_per_s2[HMI_flag.acc_axis];
-      Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration, true);
+      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_acc.now), HMI_ValueStruct.Max_Acceleration);
       EncoderRate.enabled = true;
     }
     else { // Back
@@ -3981,9 +3823,9 @@ void HMI_MaxAcceleration() {
 }
 
 #if HAS_CLASSIC_JERK
-  // Max Jerk
+  /* Max Jerk */
   void HMI_MaxJerk() {
-    EncoderState encoder_diffState = get_encoder_state();
+    ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3998,7 +3840,7 @@ void HMI_MaxAcceleration() {
         checkkey = MaxJerk_value;
         HMI_flag.jerk_axis = AxisEnum(select_jerk.now - 1);
         HMI_ValueStruct.Max_Jerk_scaled = planner.max_jerk[HMI_flag.jerk_axis] * MINUNITMULT;
-        Draw_Edit_Float3(select_jerk.now, HMI_ValueStruct.Max_Jerk_scaled, true);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
         EncoderRate.enabled = true;
       }
       else { // Back
@@ -4011,9 +3853,9 @@ void HMI_MaxAcceleration() {
   }
 #endif // HAS_CLASSIC_JERK
 
-// Step
+/* Step */
 void HMI_Step() {
-  EncoderState encoder_diffState = get_encoder_state();
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -4028,7 +3870,7 @@ void HMI_Step() {
       checkkey = Step_value;
       HMI_flag.step_axis = AxisEnum(select_step.now - 1);
       HMI_ValueStruct.Max_Step_scaled = planner.settings.axis_steps_per_mm[HMI_flag.step_axis] * MINUNITMULT;
-      Draw_Edit_Float3(select_step.now, HMI_ValueStruct.Max_Step_scaled, true);
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
       EncoderRate.enabled = true;
     }
     else { // Back
@@ -4092,7 +3934,7 @@ void EachMomentUpdate() {
     else if (HMI_flag.pause_flag != printingIsPaused()) {
       // print status update
       HMI_flag.pause_flag = printingIsPaused();
-      ICON_ResumeOrPause();
+      if (HMI_flag.pause_flag) ICON_Continue(); else ICON_Pause();
     }
   }
 
@@ -4163,13 +4005,16 @@ void EachMomentUpdate() {
       Popup_Window_Resume();
       update_selection(true);
 
+      // TODO: Get the name of the current file from someplace
+      //
+      //(void)recovery.interrupted_file_exists();
       char * const name = card.longest_filename();
       const int8_t npos = _MAX(0U, DWIN_WIDTH - strlen(name) * (MENU_CHR_W)) / 2;
       DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, npos, 252, name);
       DWIN_UpdateLCD();
 
       while (recovery_flag) {
-        EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+        ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
         if (encoder_diffState != ENCODER_DIFF_NO) {
           if (encoder_diffState == ENCODER_DIFF_ENTER) {
             recovery_flag = false;
@@ -4280,9 +4125,9 @@ void DWIN_CompletedLeveling() {
 }
 
 void DWIN_StatusChanged(const char *text) {
-  DWIN_Draw_Rectangle(1, Color_Bg_Blue, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 24);
+  DWIN_Draw_Rectangle(1, Color_Bg_Blue, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
   const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(text) * MENU_CHR_W) / 2;
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 3, F(text));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 2, F(text));
   DWIN_UpdateLCD();
 }
 
@@ -4292,4 +4137,10 @@ void DWIN_StatusChanged_P(PGM_P const pstr) {
   DWIN_StatusChanged(str);
 }
 
+// GUI extension
+void DWIN_Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool mode=false) {
+  DWIN_Draw_String(true, font8x16, Select_Color, bcolor, x + 4, y, F(mode ? "x" : " "));
+  DWIN_Draw_Rectangle(0, color, x + 2, y + 2, x + 17, y + 17);
+}
+
 #endif // DWIN_CREALITY_LCD
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index d4afe46..2808fea 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -26,7 +26,7 @@
  */
 
 #include "dwin_lcd.h"
-#include "../common/encoder.h"
+#include "rotary_encoder.h"
 #include "../../../libs/BL24CXX.h"
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -144,21 +144,36 @@ typedef struct {
 
 typedef struct {
   uint8_t language;
-  bool pause_flag:1;    // printing is paused
-  bool pause_action:1;  // flag a pause action
-  bool print_finish:1;  // print was finished
-  bool select_flag:1;   // Popup button selected
-  bool home_flag:1;     // homing in course
-  bool heat_flag:1;     // 0: heating done  1: during heating
+  bool pause_flag:1;
+  bool pause_action:1;
+  bool print_finish:1;
   bool done_confirm_flag:1;
+  bool select_flag:1;
+  bool home_flag:1;
+  bool heat_flag:1;  // 0: heating done  1: during heating
   #if ENABLED(PREVENT_COLD_EXTRUSION)
-    bool cold_flag:1;
+    bool ETempTooLow_flag:1;
+  #endif
+  #if HAS_LEVELING
+    bool leveling_offset_flag:1;
   #endif
   AxisEnum feedspeed_axis, acc_axis, jerk_axis, step_axis;
-} HMI_flag_t;
+} HMI_Flag_t;
 
 extern HMI_value_t HMI_ValueStruct;
-extern HMI_flag_t HMI_flag;
+extern HMI_Flag_t HMI_flag;
+
+// Show ICO
+void ICON_Print(bool show);
+void ICON_Prepare(bool show);
+void ICON_Control(bool show);
+void ICON_Leveling(bool show);
+void ICON_StartInfo(bool show);
+
+void ICON_Setting(bool show);
+void ICON_Pause(bool show);
+void ICON_Continue(bool show);
+void ICON_Stop(bool show);
 
 #if HAS_HOTEND || HAS_HEATED_BED
   // Popup message window
@@ -246,6 +261,7 @@ void EachMomentUpdate();
 void DWIN_HandleScreen();
 void DWIN_StatusChanged(const char *text);
 void DWIN_StatusChanged_P(PGM_P const pstr);
+void DWIN_Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool mode /* = false*/);
 
 inline void DWIN_StartHoming() { HMI_flag.home_flag = true; }
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
index fee2293..1ce95bd 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
@@ -35,13 +35,94 @@
 #include "../../../inc/MarlinConfig.h"
 
 #include "dwin_lcd.h"
+#include <string.h> // for memset
 
 //#define DEBUG_OUT 1
 #include "../../../core/debug_out.h"
 
+// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
+// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
+uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
+uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
+uint8_t databuf[26] = { 0 };
+uint8_t receivedType;
+
+int recnum = 0;
+
+inline void DWIN_Byte(size_t &i, const uint16_t bval) {
+  DWIN_SendBuf[++i] = bval;
+}
+
+inline void DWIN_Word(size_t &i, const uint16_t wval) {
+  DWIN_SendBuf[++i] = wval >> 8;
+  DWIN_SendBuf[++i] = wval & 0xFF;
+}
+
+inline void DWIN_Long(size_t &i, const uint32_t lval) {
+  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
+  DWIN_SendBuf[++i] = lval & 0xFF;
+}
+
+inline void DWIN_String(size_t &i, char * const string) {
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, strlen(string));
+  memcpy(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+inline void DWIN_String(size_t &i, const __FlashStringHelper * string) {
+  if (!string) return;
+  const size_t len = strlen_P((PGM_P)string); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
+  if (len == 0) return;
+  memcpy(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+// Send the data in the buffer and the packet end
+inline void DWIN_Send(size_t &i) {
+  ++i;
+  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
+  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
+}
+
 /*-------------------------------------- System variable function --------------------------------------*/
 
-void DWIN_Startup() {
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void) {
+  #ifndef LCD_BAUDRATE
+    #define LCD_BAUDRATE 115200
+  #endif
+  LCD_SERIAL.begin(LCD_BAUDRATE);
+  const millis_t serial_connect_timeout = millis() + 1000UL;
+  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+
+  size_t i = 0;
+  DWIN_Byte(i, 0x00);
+  DWIN_Send(i);
+
+  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
+    databuf[recnum] = LCD_SERIAL.read();
+    // ignore the invalid data
+    if (databuf[0] != FHONE) { // prevent the program from running.
+      if (recnum > 0) {
+        recnum = 0;
+        ZERO(databuf);
+      }
+      continue;
+    }
+    delay(10);
+    recnum++;
+  }
+
+  return ( recnum >= 3
+        && databuf[0] == FHONE
+        && databuf[1] == '\0'
+        && databuf[2] == 'O'
+        && databuf[3] == 'K' );
+}
+
+void DWIN_Startup(void) {
   DEBUG_ECHOPGM("\r\nDWIN handshake ");
   delay(750);   // Delay here or init later in the boot process
   if (DWIN_Handshake()) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
@@ -52,14 +133,255 @@ void DWIN_Startup() {
   DWIN_UpdateLCD();
 }
 
+// Set the backlight luminance
+//  luminance: (0x00-0xFF)
+void DWIN_Backlight_SetLuminance(const uint8_t luminance) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x30);
+  DWIN_Byte(i, _MAX(luminance, 0x1F));
+  DWIN_Send(i);
+}
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x34);
+  DWIN_Byte(i, 0x5A);
+  DWIN_Byte(i, 0xA5);
+  DWIN_Byte(i, dir);
+  DWIN_Send(i);
+}
+
+// Update display
+void DWIN_UpdateLCD(void) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x3D);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x01);
+  DWIN_Word(i, color);
+  DWIN_Send(i);
+}
+
+// Draw a point
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x02);
+  DWIN_Word(i, color);
+  DWIN_Byte(i, width);
+  DWIN_Byte(i, height);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x03);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
+                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x05);
+  DWIN_Byte(i, mode);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x09);
+  DWIN_Byte(i, (mode << 7) | dir);
+  DWIN_Word(i, dis);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  widthAdjust: true=self-adjust character width; false=no adjustment
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string) {
+  uint8_t widthAdjust = 0;
+  size_t i = 0;
+  DWIN_Byte(i, 0x11);
+  // Bit 7: widthAdjust
+  // Bit 6: bShow
+  // Bit 5-4: Unused (0)
+  // Bit 3-0: size
+  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_String(i, string);
+  DWIN_Send(i);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  // Bit 7: bshow
+  // Bit 6: 1 = signed; 0 = unsigned number;
+  // Bit 5: zeroFill
+  // Bit 4: zeroMode
+  // Bit 3-0: size
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, 0); // fNum
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  #if 0
+    for (char count = 0; count < 8; count++) {
+      DWIN_Byte(i, value);
+      value >>= 8;
+      if (!(value & 0xFF)) break;
+    }
+  #else
+    // Write a big-endian 64 bit integer
+    const size_t p = i + 1;
+    for (char count = 8; count--;) { // 7..0
+      ++i;
+      DWIN_SendBuf[p + count] = value;
+      value >>= 8;
+    }
+  #endif
+
+  DWIN_Send(i);
+}
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  //uint8_t *fvalue = (uint8_t*)&value;
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, fNum);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Long(i, value);
+  /*
+  DWIN_Byte(i, fvalue[3]);
+  DWIN_Byte(i, fvalue[2]);
+  DWIN_Byte(i, fvalue[1]);
+  DWIN_Byte(i, fvalue[0]);
+  */
+  DWIN_Send(i);
+}
+
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id) {
+  size_t i = 0;
+  DWIN_Word(i, 0x2200);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);     // AA 23 00 00 00 00 08 00 01 02 03 CC 33 C3 3C
+}
+
 // Draw an Icon
 //  libID: Icon library ID
 //  picID: Icon ID
 //  x/y: Upper-left point
 void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  DWIN_ICON_Show(true, false, false, libID, picID, x, y);
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x23);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, 0x80 | libID);
+  //DWIN_Byte(i, libID);
+  DWIN_Byte(i, picID);
+  DWIN_Send(i);
+}
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x25);
+  DWIN_Byte(i, n);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);
 }
 
 // Copy area from virtual display area to current screen
@@ -67,7 +389,8 @@ void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
   size_t i = 0;
   DWIN_Byte(i, 0x27);
   DWIN_Byte(i, 0x80 | cacheID);
@@ -80,4 +403,73 @@ void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint
   DWIN_Send(i);
 }
 
+// Animate a series of icons
+//  animID: Animation ID; 0x00-0x0F
+//  animate: true on; false off;
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x28);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  // Bit 7: animation on or off
+  // Bit 6: start from begin or end
+  // Bit 5-4: unused (0)
+  // Bit 3-0: animID
+  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
+  DWIN_Byte(i, libID);
+  DWIN_Byte(i, picIDs);
+  DWIN_Byte(i, picIDe);
+  DWIN_Byte(i, interval);
+  DWIN_Send(i);
+}
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x29);
+  DWIN_Word(i, state);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Memory functions ----------------------------------------*/
+// The LCD has an additional 32KB SRAM and 16KB Flash
+
+// Data can be written to the sram and save to one of the jpeg page files
+
+// Write Data Memory
+//  command 0x31
+//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Data: data
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+// Read Data Memory
+//  command 0x32
+//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Length: leangth of data to read; 0x01-0xF0
+//
+//  Response:
+//    Type, Address, Length, Data
+
+// Write Picture Memory
+//  Write the contents of the 32KB SRAM data memory into the designated image memory space
+//  Issued: 0x5A, 0xA5, PIC_ID
+//  Response: 0xA5 0x4F 0x4B
+//
+//  command 0x33
+//  0x5A, 0xA5
+//  PicId: Picture Memory location, 0x00-0x0F
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
 #endif // DWIN_CREALITY_LCD
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
index 115781f..e5e79df 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -29,22 +29,341 @@
  * @brief    迪文屏控制操作函数
  ********************************************************************************/
 
+#include <stdint.h>
+
+#define RECEIVED_NO_DATA         0x00
+#define RECEIVED_SHAKE_HAND_ACK  0x01
+
+#define FHONE                    0xAA
+
+#define DWIN_SCROLL_UP   2
+#define DWIN_SCROLL_DOWN 3
+
 #define DWIN_WIDTH  272
 #define DWIN_HEIGHT 480
 
-#include "../common/dwin_api.h"
-#include "../common/dwin_set.h"
-#include "../common/dwin_font.h"
-#include "../common/dwin_color.h"
+// Character matrix width x height
+//#define LCD_WIDTH ((DWIN_WIDTH) / 8)
+//#define LCD_HEIGHT ((DWIN_HEIGHT) / 12)
+
+// Picture ID
+#define DWIN_Boot_Screen    0
+#define Language_English    1
+#define Language_Chinese    2
+
+// ICON ID
+#define ICON                      0x09
+
+#define ICON_LOGO                  0
+#define ICON_Print_0               1
+#define ICON_Print_1               2
+#define ICON_Prepare_0             3
+#define ICON_Prepare_1             4
+#define ICON_Control_0             5
+#define ICON_Control_1             6
+#define ICON_Leveling_0            7
+#define ICON_Leveling_1            8
+#define ICON_HotendTemp            9
+#define ICON_BedTemp              10
+#define ICON_Speed                11
+#define ICON_Zoffset              12
+#define ICON_Back                 13
+#define ICON_File                 14
+#define ICON_PrintTime            15
+#define ICON_RemainTime           16
+#define ICON_Setup_0              17
+#define ICON_Setup_1              18
+#define ICON_Pause_0              19
+#define ICON_Pause_1              20
+#define ICON_Continue_0           21
+#define ICON_Continue_1           22
+#define ICON_Stop_0               23
+#define ICON_Stop_1               24
+#define ICON_Bar                  25
+#define ICON_More                 26
+
+#define ICON_Axis                 27
+#define ICON_CloseMotor           28
+#define ICON_Homing               29
+#define ICON_SetHome              30
+#define ICON_PLAPreheat           31
+#define ICON_ABSPreheat           32
+#define ICON_Cool                 33
+#define ICON_Language             34
+
+#define ICON_MoveX                35
+#define ICON_MoveY                36
+#define ICON_MoveZ                37
+#define ICON_Extruder             38
+
+#define ICON_Temperature          40
+#define ICON_Motion               41
+#define ICON_WriteEEPROM          42
+#define ICON_ReadEEPROM           43
+#define ICON_ResumeEEPROM         44
+#define ICON_Info                 45
+
+#define ICON_SetEndTemp           46
+#define ICON_SetBedTemp           47
+#define ICON_FanSpeed             48
+#define ICON_SetPLAPreheat        49
+#define ICON_SetABSPreheat        50
+
+#define ICON_MaxSpeed             51
+#define ICON_MaxAccelerated       52
+#define ICON_MaxJerk              53
+#define ICON_Step                 54
+#define ICON_PrintSize            55
+#define ICON_Version              56
+#define ICON_Contact              57
+#define ICON_StockConfiguraton    58
+#define ICON_MaxSpeedX            59
+#define ICON_MaxSpeedY            60
+#define ICON_MaxSpeedZ            61
+#define ICON_MaxSpeedE            62
+#define ICON_MaxAccX              63
+#define ICON_MaxAccY              64
+#define ICON_MaxAccZ              65
+#define ICON_MaxAccE              66
+#define ICON_MaxSpeedJerkX        67
+#define ICON_MaxSpeedJerkY        68
+#define ICON_MaxSpeedJerkZ        69
+#define ICON_MaxSpeedJerkE        70
+#define ICON_StepX                71
+#define ICON_StepY                72
+#define ICON_StepZ                73
+#define ICON_StepE                74
+#define ICON_Setspeed             75
+#define ICON_SetZOffset           76
+#define ICON_Rectangle            77
+#define ICON_BLTouch              78
+#define ICON_TempTooLow           79
+#define ICON_AutoLeveling         80
+#define ICON_TempTooHigh          81
+#define ICON_NoTips_C             82
+#define ICON_NoTips_E             83
+#define ICON_Continue_C           84
+#define ICON_Continue_E           85
+#define ICON_Cancel_C             86
+#define ICON_Cancel_E             87
+#define ICON_Confirm_C            88
+#define ICON_Confirm_E            89
+#define ICON_Info_0               90
+#define ICON_Info_1               91
+
+#define ICON_AdvSet               ICON_Language
+#define ICON_HomeOff              ICON_AdvSet
+#define ICON_HomeOffX             ICON_StepX
+#define ICON_HomeOffY             ICON_StepY
+#define ICON_HomeOffZ             ICON_StepZ
+#define ICON_ProbeOff             ICON_AdvSet
+#define ICON_ProbeOffX            ICON_StepX
+#define ICON_ProbeOffY            ICON_StepY
+#define ICON_PIDNozzle            ICON_SetEndTemp
+#define ICON_PIDbed               ICON_SetBedTemp
+
+/**
+ * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
+ * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
+ * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
+ */
+#define font6x12  0x00
+#define font8x16  0x01
+#define font10x20 0x02
+#define font12x24 0x03
+#define font14x28 0x04
+#define font16x32 0x05
+#define font20x40 0x06
+#define font24x48 0x07
+#define font28x56 0x08
+#define font32x64 0x09
 
 #define DWIN_FONT_MENU  font10x20
 #define DWIN_FONT_STAT  font10x20
 #define DWIN_FONT_HEAD  font10x20
 #define DWIN_FONT_ALERT font14x28
 
+// Color
+#define Color_White       0xFFFF
+#define Color_Yellow      0xFF0F
+#define Color_Error_Red   0xB000  // Error!
+#define Color_Bg_Red      0xF00F  // Red background color
+#define Color_Bg_Window   0x31E8  // Popup background color
+#define Color_Bg_Blue     0x1125  // Dark blue background color
+#define Color_Bg_Black    0x0841  // Black background color
+#define Color_IconBlue    0x45FA  // Lighter blue that matches icons/accents
+#define Popup_Text_Color  0xD6BA  // Popup font background color
+#define Line_Color        0x3A6A  // Split line color
+#define Rectangle_Color   0xEE2F  // Blue square cursor color
+#define Percent_Color     0xFE29  // Percentage color
+#define BarFill_Color     0x10E4  // Fill color of progress bar
+#define Select_Color      0x33BB  // Selected color
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void);
+
+// Common DWIN startup
+void DWIN_Startup(void);
+
+// Set the backlight luminance
+//  luminance: (0x00-0xFF)
+void DWIN_Backlight_SetLuminance(const uint8_t luminance);
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir);
+
+// Update display
+void DWIN_UpdateLCD(void);
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color);
+
+// Draw a point
+//  color: point color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a Horizontal line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xLength: Line Length
+inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
+}
+
+// Draw a Vertical line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  yLength: Line Length
+inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
+                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a box
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xSize/ySize: box size
+inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
+  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string);
+
+class __FlashStringHelper;
+
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, (char *)title);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id);
+
+// Draw an Icon
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
+
+// Unzip the JPG picture to virtual display area #1
+//  id: Picture ID
+inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
+
 // Copy area from virtual display area to current screen
 //  cacheID: virtual area number
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
+
+// Animate a series of icons
+//  animID: Animation ID  up to 16
+//  animate: animation on or off
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
+                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state);
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
index 1339c39..58adf97 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
@@ -86,7 +86,7 @@ void FileNavigator::refresh() { filelist.refresh(); }
 
 void FileNavigator::changeDIR(const char *folder) {
   if (currentfolderdepth >= MAX_FOLDER_DEPTH) return; // limit the folder depth
-  DEBUG_ECHOLNPGM("FD:" , folderdepth, " FP:",currentindex, " currentfolder:", currentfoldername, " enter:", folder);
+  DEBUG_ECHOLNPAIR("FD:" , folderdepth, " FP:",currentindex, " currentfolder:", currentfoldername, " enter:", folder);
   currentfolderindex[currentfolderdepth] = currentindex;
   strcat(currentfoldername, folder);
   strcat(currentfoldername, "/");
@@ -96,7 +96,7 @@ void FileNavigator::changeDIR(const char *folder) {
 }
 
 void FileNavigator::upDIR() {
-  DEBUG_ECHOLNPGM("upDIR() from D:", currentfolderdepth, " N:", currentfoldername);
+  DEBUG_ECHOLNPAIR("upDIR() from D:", currentfolderdepth, " N:", currentfoldername);
   if (!filelist.isAtRootDir()) {
     filelist.upDir();
     currentfolderdepth--;
@@ -117,7 +117,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
   if (skip == 0) return;
   while (skip > 0) {
     if (filelist.seek(currentindex)) {
-      DEBUG_ECHOLNPGM("CI:", currentindex, " FD:", currentfolderdepth, " N:", skip, " ", filelist.longFilename());
+      DEBUG_ECHOLNPAIR("CI:", currentindex, " FD:", currentfolderdepth, " N:", skip, " ", filelist.longFilename());
       if (!filelist.isDir()) {
         skip--;
         currentindex++;
@@ -151,7 +151,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
     }
     lastpanelindex = index;
 
-    DEBUG_ECHOLNPGM("index=", index, " currentindex=", currentindex);
+    DEBUG_ECHOLNPAIR("index=", index, " currentindex=", currentindex);
 
     if (currentindex == 0 && currentfolderdepth > 0) { // Add a link to go up a folder
       // The new panel ignores entries that don't end in .GCO or .gcode so add and pad them.
@@ -169,7 +169,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
     for (uint16_t seek = currentindex; seek < currentindex + filesneeded; seek++) {
       if (filelist.seek(seek)) {
         sendFile(paneltype);
-        DEBUG_ECHOLNPGM("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'");
+        DEBUG_ECHOLNPAIR("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'");
       }
     }
   }
@@ -212,7 +212,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
 #else // Flat file list
 
   void FileNavigator::getFiles(uint16_t index, panel_type_t paneltype, uint8_t filesneeded) {
-    DEBUG_ECHOLNPGM("getFiles() I:", index," L:", lastpanelindex);
+    DEBUG_ECHOLNPAIR("getFiles() I:", index," L:", lastpanelindex);
     // if we're searching backwards, jump back to start and search forward
     if (index < lastpanelindex) {
       reset();
@@ -248,7 +248,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
     TFTSer.println(filelist.shortFilename());
     if (currentfolderdepth > 0) TFTSer.print(currentfoldername);
     TFTSer.println(filelist.longFilename());
-    DEBUG_ECHOLNPGM("/", currentfoldername, "", filelist.shortFilename(), " ", filelist.longFilename());
+    DEBUG_ECHOLNPAIR("/", currentfoldername, "", filelist.shortFilename(), " ", filelist.longFilename());
   }
 
 #endif // Flat file list
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index 5cd0922..0f6f8ab 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -107,12 +107,12 @@ namespace ExtUI {
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       // Called when any mesh points are updated
-      //SERIAL_ECHOLNPGM("onMeshUpdate() x:", xpos, " y:", ypos, " z:", zval);
+      //SERIAL_ECHOLNPAIR("onMeshUpdate() x:", xpos, " y:", ypos, " z:", zval);
     }
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const probe_state_t state) {
       // Called to indicate a special condition
-      //SERIAL_ECHOLNPGM("onMeshUpdate() x:", xpos, " y:", ypos, " state:", state);
+      //SERIAL_ECHOLNPAIR("onMeshUpdate() x:", xpos, " y:", ypos, " state:", state);
     }
   #endif
 
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 42364f2..0ecb138 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -104,7 +104,7 @@ void ChironTFT::Startup() {
   PlayTune(BEEPER_PIN, TERN(AC_DEFAULT_STARTUP_TUNE, Anycubic_PowerOn, GB_PowerOn), 1);
 
   #if ACDEBUGLEVEL
-    SERIAL_ECHOLNPGM("AC Debug Level ", ACDEBUGLEVEL);
+    SERIAL_ECHOLNPAIR("AC Debug Level ", ACDEBUGLEVEL);
   #endif
   SendtoTFTLN(AC_msg_ready);
 }
@@ -128,13 +128,13 @@ void ChironTFT::IdleLoop()  {
 void ChironTFT::PrinterKilled(PGM_P error,PGM_P component)  {
   SendtoTFTLN(AC_msg_kill_lcd);
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPGM("PrinterKilled()\nerror: ", error , "\ncomponent: ", component);
+    SERIAL_ECHOLNPAIR("PrinterKilled()\nerror: ", error , "\ncomponent: ", component);
   #endif
 }
 
 void ChironTFT::MediaEvent(media_event_t event)  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPGM("ProcessMediaStatus() ", event);
+    SERIAL_ECHOLNPAIR("ProcessMediaStatus() ", event);
   #endif
   switch (event) {
     case AC_media_inserted:
@@ -154,8 +154,8 @@ void ChironTFT::MediaEvent(media_event_t event)  {
 
 void ChironTFT::TimerEvent(timer_event_t event)  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPGM("TimerEvent() ", event);
-    SERIAL_ECHOLNPGM("Printer State: ", printer_state);
+    SERIAL_ECHOLNPAIR("TimerEvent() ", event);
+    SERIAL_ECHOLNPAIR("Printer State: ", printer_state);
   #endif
 
   switch (event) {
@@ -184,7 +184,7 @@ void ChironTFT::TimerEvent(timer_event_t event)  {
 
 void ChironTFT::FilamentRunout()  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPGM("FilamentRunout() printer_state ", printer_state);
+    SERIAL_ECHOLNPAIR("FilamentRunout() printer_state ", printer_state);
   #endif
   // 1 Signal filament out
   last_error = AC_error_filament_runout;
@@ -195,7 +195,7 @@ void ChironTFT::FilamentRunout()  {
 void ChironTFT::ConfirmationRequest(const char * const msg)  {
   // M108 continue
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPGM("ConfirmationRequest() ", msg, " printer_state:", printer_state);
+    SERIAL_ECHOLNPAIR("ConfirmationRequest() ", msg, " printer_state:", printer_state);
   #endif
   switch (printer_state) {
     case AC_printer_pausing: {
@@ -232,8 +232,8 @@ void ChironTFT::ConfirmationRequest(const char * const msg)  {
 
 void ChironTFT::StatusChange(const char * const msg)  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPGM("StatusChange() ", msg);
-    SERIAL_ECHOLNPGM("printer_state:", printer_state);
+    SERIAL_ECHOLNPAIR("StatusChange() ", msg);
+    SERIAL_ECHOLNPAIR("printer_state:", printer_state);
   #endif
   bool msg_matched = false;
   // The only way to get printer status is to parse messages
@@ -348,7 +348,7 @@ bool ChironTFT::ReadTFTCommand() {
   if (command_ready || command_len == MAX_CMND_LEN) {
     panel_command[command_len] = '\0';
     #if ACDEBUG(AC_ALL)
-      SERIAL_ECHOLNPGM("len(",command_len,") < ", panel_command);
+      SERIAL_ECHOLNPAIR("len(",command_len,") < ", panel_command);
     #endif
     command_ready = true;
   }
@@ -360,13 +360,13 @@ int8_t ChironTFT::FindToken(char c) {
   do {
     if (panel_command[pos] == c) {
       #if ACDEBUG(AC_INFO)
-        SERIAL_ECHOLNPGM("Tpos:", pos, " ", c);
+        SERIAL_ECHOLNPAIR("Tpos:", pos, " ", c);
       #endif
       return pos;
     }
   } while(++pos < command_len);
   #if ACDEBUG(AC_INFO)
-    SERIAL_ECHOLNPGM("Not found: ", c);
+    SERIAL_ECHOLNPAIR("Not found: ", c);
   #endif
   return -1;
 }
@@ -381,7 +381,7 @@ void ChironTFT::CheckHeaters() {
     if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) {
       SendtoTFTLN(AC_msg_nozzle_temp_abnormal);
       last_error = AC_error_abnormal_temp_t0;
-      SERIAL_ECHOLNPGM("Extruder temp abnormal! : ", temp);
+      SERIAL_ECHOLNPAIR("Extruder temp abnormal! : ", temp);
       break;
     }
     delay_ms(500);
@@ -396,7 +396,7 @@ void ChironTFT::CheckHeaters() {
     if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) {
       SendtoTFTLN(AC_msg_nozzle_temp_abnormal);
       last_error = AC_error_abnormal_temp_bed;
-      SERIAL_ECHOLNPGM("Bed temp abnormal! : ", temp);
+      SERIAL_ECHOLNPAIR("Bed temp abnormal! : ", temp);
       break;
     }
     delay_ms(500);
@@ -423,7 +423,7 @@ void ChironTFT::CheckHeaters() {
 void ChironTFT::SendFileList(int8_t startindex) {
   // Respond to panel request for 4 files starting at index
   #if ACDEBUG(AC_INFO)
-    SERIAL_ECHOLNPGM("## SendFileList ## ", startindex);
+    SERIAL_ECHOLNPAIR("## SendFileList ## ", startindex);
   #endif
   SendtoTFTLN(PSTR("FN "));
   filenavigator.getFiles(startindex, panel_type, 4);
@@ -440,7 +440,7 @@ void ChironTFT::SelectFile() {
     selectedfile[command_len - 5] = '\0';
   }
   #if ACDEBUG(AC_FILE)
-    SERIAL_ECHOLNPGM(" Selected File: ",selectedfile);
+    SERIAL_ECHOLNPAIR(" Selected File: ",selectedfile);
   #endif
   switch (selectedfile[0]) {
     case '/':   // Valid file selected
@@ -561,7 +561,7 @@ void ChironTFT::PanelInfo(uint8_t req) {
       TFTSer.print(ui8tostr2(time % 60));
       SendtoTFT(PSTR(" M"));
       #if ACDEBUG(AC_ALL)
-        SERIAL_ECHOLNPGM("Print time ", ui8tostr2(time / 60), ":", ui8tostr2(time % 60));
+        SERIAL_ECHOLNPAIR("Print time ", ui8tostr2(time / 60), ":", ui8tostr2(time % 60));
       #endif
     } break;
 
@@ -702,7 +702,7 @@ void ChironTFT::PanelAction(uint8_t req) {
         char MoveCmnd[30];
         sprintf_P(MoveCmnd, PSTR("G91\nG0%s\nG90"), panel_command + 3);
         #if ACDEBUG(AC_ACTION)
-          SERIAL_ECHOLNPGM("Move: ", MoveCmnd);
+          SERIAL_ECHOLNPAIR("Move: ", MoveCmnd);
         #endif
         setSoftEndstopState(true);  // enable endstops
         injectCommands(MoveCmnd);
@@ -781,7 +781,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
 
           if (isPositionKnown()) {
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPGM("Moving to mesh point at x: ", pos.x, " y: ", pos.y, " z: ", pos_z);
+              SERIAL_ECHOLNPAIR("Moving to mesh point at x: ", pos.x, " y: ", pos.y, " z: ", pos_z);
             #endif
             // Go up before moving
             setAxisPosition_mm(3.0,Z);
@@ -790,7 +790,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
             setAxisPosition_mm(20 + (93 * pos.y), Y);
             setAxisPosition_mm(0.0, Z);
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPGM("Current Z: ", getAxisPosition_mm(Z));
+              SERIAL_ECHOLNPAIR("Current Z: ", getAxisPosition_mm(Z));
             #endif
           }
         }
@@ -858,17 +858,17 @@ void ChironTFT::PanelProcess(uint8_t req) {
           // From the leveling panel use the all points UI to adjust the print pos.
           if (isPrinting()) {
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPGM("Change Zoffset from:", live_Zoffset, " to ", live_Zoffset + Zshift);
+              SERIAL_ECHOLNPAIR("Change Zoffset from:", live_Zoffset, " to ", live_Zoffset + Zshift);
             #endif
             if (isAxisPositionKnown(Z)) {
               #if ACDEBUG(AC_INFO)
                 const float currZpos = getAxisPosition_mm(Z);
-                SERIAL_ECHOLNPGM("Nudge Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
+                SERIAL_ECHOLNPAIR("Nudge Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
               #endif
               // Use babystepping to adjust the head position
               int16_t steps = mmToWholeSteps(constrain(Zshift,-0.05,0.05), Z);
               #if ACDEBUG(AC_INFO)
-                SERIAL_ECHOLNPGM("Steps to move Z: ", steps);
+                SERIAL_ECHOLNPAIR("Steps to move Z: ", steps);
               #endif
               babystepAxis_steps(steps, Z);
               live_Zoffset += Zshift;
@@ -882,12 +882,12 @@ void ChironTFT::PanelProcess(uint8_t req) {
               const float currval = getMeshPoint(pos);
               setMeshPoint(pos, constrain(currval + Zshift, AC_LOWEST_MESHPOINT_VAL, 2));
               #if ACDEBUG(AC_INFO)
-                SERIAL_ECHOLNPGM("Change mesh point X", x," Y",y ," from ", currval, " to ", getMeshPoint(pos) );
+                SERIAL_ECHOLNPAIR("Change mesh point X", x," Y",y ," from ", currval, " to ", getMeshPoint(pos) );
               #endif
             }
             const float currZOffset = getZOffset_mm();
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPGM("Change probe offset from ", currZOffset, " to  ", currZOffset + Zshift);
+              SERIAL_ECHOLNPAIR("Change probe offset from ", currZOffset, " to  ", currZOffset + Zshift);
             #endif
 
             setZOffset_mm(currZOffset + Zshift);
@@ -898,7 +898,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
               // Move Z axis
               const float currZpos = getAxisPosition_mm(Z);
               #if ACDEBUG(AC_INFO)
-                SERIAL_ECHOLNPGM("Move Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
+                SERIAL_ECHOLNPAIR("Move Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
               #endif
               setAxisPosition_mm(currZpos+constrain(Zshift,-0.05,0.05),Z);
             }
@@ -930,8 +930,8 @@ void ChironTFT::PanelProcess(uint8_t req) {
         float currmesh = getMeshPoint(pos);
         float newval   = atof(&panel_command[11])/100;
         #if ACDEBUG(AC_INFO)
-          SERIAL_ECHOLNPGM("Change mesh point x:", pos.x, " y:", pos.y);
-          SERIAL_ECHOLNPGM("from ", currmesh, " to ", newval);
+          SERIAL_ECHOLNPAIR("Change mesh point x:", pos.x, " y:", pos.y);
+          SERIAL_ECHOLNPAIR("from ", currmesh, " to ", newval);
         #endif
         // Update Meshpoint
         setMeshPoint(pos,newval);
@@ -942,7 +942,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
             setSoftEndstopState(false);
             float currZpos = getAxisPosition_mm(Z);
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPGM("Move Z pos from ", currZpos, " to ", currZpos + constrain(newval - currmesh, -0.05, 0.05));
+              SERIAL_ECHOLNPAIR("Move Z pos from ", currZpos, " to ", currZpos + constrain(newval - currmesh, -0.05, 0.05));
             #endif
             setAxisPosition_mm(currZpos + constrain(newval - currmesh, -0.05, 0.05), Z);
           }
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
index d9157fc..70ac149 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#pragma once
 
 /**
  * lcd/extui/anycubic_chiron/chiron_defs.h
@@ -29,6 +28,7 @@
  *  (not affiliated with Anycubic, Ltd.)
  */
 
+#pragma once
 #include "../../../inc/MarlinConfigPre.h"
 //#define ACDEBUGLEVEL 4
 
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index b739e83..3277ad4 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -143,7 +143,7 @@ void AnycubicTFTClass::OnKillTFT() {
 
 void AnycubicTFTClass::OnSDCardStateChange(bool isInserted) {
   #if ENABLED(ANYCUBIC_LCD_DEBUG)
-    SERIAL_ECHOLNPGM("TFT Serial Debug: OnSDCardStateChange event triggered...", isInserted);
+    SERIAL_ECHOLNPAIR("TFT Serial Debug: OnSDCardStateChange event triggered...", isInserted);
   #endif
   DoSDCardStateCheck();
 }
@@ -164,7 +164,7 @@ void AnycubicTFTClass::OnFilamentRunout() {
 
 void AnycubicTFTClass::OnUserConfirmRequired(const char * const msg) {
   #if ENABLED(ANYCUBIC_LCD_DEBUG)
-    SERIAL_ECHOLNPGM("TFT Serial Debug: OnUserConfirmRequired triggered... ", msg);
+    SERIAL_ECHOLNPAIR("TFT Serial Debug: OnUserConfirmRequired triggered... ", msg);
   #endif
 
   #if ENABLED(SDSUPPORT)
@@ -557,7 +557,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
 
         #if ENABLED(ANYCUBIC_LCD_DEBUG)
           if ((a_command > 7) && (a_command != 20))   // No debugging of status polls, please!
-            SERIAL_ECHOLNPGM("TFT Serial Command: ", TFTcmdbuffer[TFTbufindw]);
+            SERIAL_ECHOLNPAIR("TFT Serial Command: ", TFTcmdbuffer[TFTbufindw]);
         #endif
 
         switch (a_command) {
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index 262dcea..c2390d6 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_DGUS_LCD_CLASSIC
+#if HAS_DGUS_LCD
 
 #if HOTENDS > 2
   #warning "More than 2 hotends not implemented on DGUS Display UI."
@@ -154,19 +154,19 @@ void DGUSDisplay::ProcessRx() {
 
       case DGUS_IDLE: // Waiting for the first header byte
         receivedbyte = LCD_SERIAL.read();
-        //DEBUG_ECHOPGM("< ",x);
+        //DEBUG_ECHOPAIR("< ",x);
         if (DGUS_HEADER1 == receivedbyte) rx_datagram_state = DGUS_HEADER1_SEEN;
         break;
 
       case DGUS_HEADER1_SEEN: // Waiting for the second header byte
         receivedbyte = LCD_SERIAL.read();
-        //DEBUG_ECHOPGM(" ",x);
+        //DEBUG_ECHOPAIR(" ",x);
         rx_datagram_state = (DGUS_HEADER2 == receivedbyte) ? DGUS_HEADER2_SEEN : DGUS_IDLE;
         break;
 
       case DGUS_HEADER2_SEEN: // Waiting for the length byte
         rx_datagram_len = LCD_SERIAL.read();
-        DEBUG_ECHOPGM(" (", rx_datagram_len, ") ");
+        DEBUG_ECHOPAIR(" (", rx_datagram_len, ") ");
 
         // Telegram min len is 3 (command and one word of payload)
         rx_datagram_state = WITHIN(rx_datagram_len, 3, DGUS_RX_BUFFER_SIZE) ? DGUS_WAIT_TELEGRAM : DGUS_IDLE;
@@ -178,14 +178,14 @@ void DGUSDisplay::ProcessRx() {
         Initialized = true; // We've talked to it, so we defined it as initialized.
         uint8_t command = LCD_SERIAL.read();
 
-        DEBUG_ECHOPGM("# ", command);
+        DEBUG_ECHOPAIR("# ", command);
 
         uint8_t readlen = rx_datagram_len - 1;  // command is part of len.
         unsigned char tmp[rx_datagram_len - 1];
         unsigned char *ptmp = tmp;
         while (readlen--) {
           receivedbyte = LCD_SERIAL.read();
-          DEBUG_ECHOPGM(" ", receivedbyte);
+          DEBUG_ECHOPAIR(" ", receivedbyte);
           *ptmp++ = receivedbyte;
         }
         DEBUG_ECHOPGM(" # ");
@@ -206,7 +206,7 @@ void DGUSDisplay::ProcessRx() {
         if (command == DGUS_CMD_READVAR) {
           const uint16_t vp = tmp[0] << 8 | tmp[1];
           //const uint8_t dlen = tmp[2] << 1;  // Convert to Bytes. (Display works with words)
-          //DEBUG_ECHOPGM(" vp=", vp, " dlen=", dlen);
+          //DEBUG_ECHOPAIR(" vp=", vp, " dlen=", dlen);
           DGUS_VP_Variable ramcopy;
           if (populate_VPVar(vp, &ramcopy)) {
             if (ramcopy.set_by_display_handler)
@@ -215,7 +215,7 @@ void DGUSDisplay::ProcessRx() {
               DEBUG_ECHOLNPGM(" VPVar found, no handler.");
           }
           else
-            DEBUG_ECHOLNPGM(" VPVar not found:", vp);
+            DEBUG_ECHOLNPAIR(" VPVar not found:", vp);
 
           rx_datagram_state = DGUS_IDLE;
           break;
@@ -260,12 +260,12 @@ bool DGUSDisplay::no_reentrance = false;
 #define sw_barrier() asm volatile("": : :"memory");
 
 bool populate_VPVar(const uint16_t VP, DGUS_VP_Variable * const ramcopy) {
-  // DEBUG_ECHOPGM("populate_VPVar ", VP);
+  // DEBUG_ECHOPAIR("populate_VPVar ", VP);
   const DGUS_VP_Variable *pvp = DGUSLCD_FindVPVar(VP);
-  // DEBUG_ECHOLNPGM(" pvp ", (uint16_t )pvp);
+  // DEBUG_ECHOLNPAIR(" pvp ", (uint16_t )pvp);
   if (!pvp) return false;
   memcpy_P(ramcopy, pvp, sizeof(DGUS_VP_Variable));
   return true;
 }
 
-#endif // HAS_DGUS_LCD_CLASSIC
+#endif // HAS_DGUS_LCD
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 16576f7..5c108d0 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_DGUS_LCD_CLASSIC
+#if HAS_DGUS_LCD
 
 #include "DGUSScreenHandler.h"
 
@@ -110,8 +110,8 @@ void DGUSScreenHandler::setstatusmessagePGM(PGM_P const msg) {
 // Send an 8 bit or 16 bit value to the display.
 void DGUSScreenHandler::DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    //DEBUG_ECHOPGM(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
-    //DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
+    //DEBUG_ECHOPAIR(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
+    //DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
     if (var.size > 1)
       dgusdisplay.WriteVariable(var.VP, *(int16_t*)var.memadr);
     else
@@ -122,8 +122,8 @@ void DGUSScreenHandler::DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var) {
 // Send an uint8_t between 0 and 255 to the display, but scale to a percentage (0..100)
 void DGUSScreenHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    //DEBUG_ECHOPGM(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
-    //DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
+    //DEBUG_ECHOPAIR(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
+    //DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
     uint16_t tmp = *(uint8_t *) var.memadr + 1; // +1 -> avoid rounding issues for the display.
     tmp = map(tmp, 0, 255, 0, 100);
     dgusdisplay.WriteVariable(var.VP, tmp);
@@ -132,9 +132,9 @@ void DGUSScreenHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var) {
 
 // Send the current print progress to the display.
 void DGUSScreenHandler::DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var) {
-  //DEBUG_ECHOPGM(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
+  //DEBUG_ECHOPAIR(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
   uint16_t tmp = ExtUI::getProgress_percent();
-  //DEBUG_ECHOLNPGM(" data ", tmp);
+  //DEBUG_ECHOLNPAIR(" data ", tmp);
   dgusdisplay.WriteVariable(var.VP, tmp);
 }
 
@@ -151,9 +151,9 @@ void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) {
 void DGUSScreenHandler::DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr) {
   if (var.memadr) {
     uint16_t value = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("FAN value get:", value);
+    DEBUG_ECHOLNPAIR("FAN value get:", value);
     *(uint8_t*)var.memadr = map(constrain(value, 0, 100), 0, 100, 0, 255);
-    DEBUG_ECHOLNPGM("FAN value change:", *(uint8_t*)var.memadr);
+    DEBUG_ECHOLNPAIR("FAN value change:", *(uint8_t*)var.memadr);
   }
 }
 
@@ -234,8 +234,8 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var) {
 
   void DGUSScreenHandler::DGUSLCD_SendFanStatusToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
-      DEBUG_ECHOPGM(" DGUSLCD_SendFanStatusToDisplay ", var.VP);
-      DEBUG_ECHOLNPGM(" data ", *(uint8_t *)var.memadr);
+      DEBUG_ECHOPAIR(" DGUSLCD_SendFanStatusToDisplay ", var.VP);
+      DEBUG_ECHOLNPAIR(" data ", *(uint8_t *)var.memadr);
       uint16_t data_to_send = 0;
       if (*(uint8_t *) var.memadr) data_to_send = 1;
       dgusdisplay.WriteVariable(var.VP, data_to_send);
@@ -247,8 +247,8 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var) {
 // Send heater status value to the display.
 void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    DEBUG_ECHOPGM(" DGUSLCD_SendHeaterStatusToDisplay ", var.VP);
-    DEBUG_ECHOLNPGM(" data ", *(int16_t *)var.memadr);
+    DEBUG_ECHOPAIR(" DGUSLCD_SendHeaterStatusToDisplay ", var.VP);
+    DEBUG_ECHOLNPAIR(" data ", *(int16_t *)var.memadr);
     uint16_t data_to_send = 0;
     if (*(int16_t *) var.memadr) data_to_send = 1;
     dgusdisplay.WriteVariable(var.VP, data_to_send);
@@ -261,11 +261,11 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
     // In FYSETC UI design there are 10 statuses to loop
     static uint16_t period = 0;
     static uint16_t index = 0;
-    //DEBUG_ECHOPGM(" DGUSLCD_SendWaitingStatusToDisplay ", var.VP);
-    //DEBUG_ECHOLNPGM(" data ", swap16(index));
+    //DEBUG_ECHOPAIR(" DGUSLCD_SendWaitingStatusToDisplay ", var.VP);
+    //DEBUG_ECHOLNPAIR(" data ", swap16(index));
     if (period++ > DGUS_UI_WAITING_STATUS_PERIOD) {
       dgusdisplay.WriteVariable(var.VP, index);
-      //DEBUG_ECHOLNPGM(" data ", swap16(index));
+      //DEBUG_ECHOLNPAIR(" data ", swap16(index));
       if (++index >= DGUS_UI_WAITING_STATUS) index = 0;
       period = 0;
     }
@@ -307,7 +307,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
     const int16_t scroll = (int16_t)swap16(*(uint16_t*)val_ptr);
     if (scroll) {
       top_file += scroll;
-      DEBUG_ECHOPGM("new topfile calculated:", top_file);
+      DEBUG_ECHOPAIR("new topfile calculated:", top_file);
       if (top_file < 0) {
         top_file = 0;
         DEBUG_ECHOLNPGM("Top of filelist reached");
@@ -317,7 +317,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
         NOLESS(max_top, 0);
         NOMORE(top_file, max_top);
       }
-      DEBUG_ECHOPGM("new topfile adjusted:", top_file);
+      DEBUG_ECHOPAIR("new topfile adjusted:", top_file);
     }
     else if (!filelist.isAtRootDir()) {
       IF_DISABLED(DGUS_LCD_UI_MKS, filelist.upDir());
@@ -371,7 +371,7 @@ const DGUS_VP_Variable* DGUSLCD_FindVPVar(const uint16_t vp) {
     ++ret;
   } while (1);
 
-  DEBUG_ECHOLNPGM("FindVPVar NOT FOUND ", vp);
+  DEBUG_ECHOLNPAIR("FindVPVar NOT FOUND ", vp);
   return nullptr;
 }
 
@@ -476,7 +476,7 @@ void DGUSScreenHandler::HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_p
   const int16_t lock = swap16(*(uint16_t*)val_ptr);
   strcpy_P(buf, lock ? PSTR("M18") : PSTR("M17"));
 
-  //DEBUG_ECHOPGM(" ", buf);
+  //DEBUG_ECHOPAIR(" ", buf);
   queue.enqueue_one_now(buf);
 }
 
@@ -499,7 +499,7 @@ void DGUSScreenHandler::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_
   DEBUG_ECHOLNPGM("HandleStepPerMMChanged");
 
   uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   float value = (float)value_raw / 10;
   ExtUI::axis_t axis;
   switch (var.VP) {
@@ -519,7 +519,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
   DEBUG_ECHOLNPGM("HandleStepPerMMExtruderChanged");
 
   uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   float value = (float)value_raw / 10;
   ExtUI::extruder_t extruder;
   switch (var.VP) {
@@ -696,7 +696,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
 #endif
 
 void DGUSScreenHandler::UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup) {
-  DEBUG_ECHOLNPGM("SetNewScreen: ", newscreen);
+  DEBUG_ECHOLNPAIR("SetNewScreen: ", newscreen);
   if (!popup) {
     memmove(&past_screens[1], &past_screens[0], sizeof(past_screens) - 1);
     past_screens[0] = current_screen;
@@ -707,18 +707,18 @@ void DGUSScreenHandler::UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup) {
 }
 
 void DGUSScreenHandler::PopToOldScreen() {
-  DEBUG_ECHOLNPGM("PopToOldScreen s=", past_screens[0]);
+  DEBUG_ECHOLNPAIR("PopToOldScreen s=", past_screens[0]);
   GotoScreen(past_screens[0], true);
   memmove(&past_screens[0], &past_screens[1], sizeof(past_screens) - 1);
   past_screens[sizeof(past_screens) - 1] = DGUSLCD_SCREEN_MAIN;
 }
 
 void DGUSScreenHandler::UpdateScreenVPData() {
-  DEBUG_ECHOPGM(" UpdateScreenVPData Screen: ", current_screen);
+  DEBUG_ECHOPAIR(" UpdateScreenVPData Screen: ", current_screen);
 
   const uint16_t *VPList = DGUSLCD_FindScreenVPMapList(current_screen);
   if (!VPList) {
-    DEBUG_ECHOLNPGM(" NO SCREEN FOR: ", current_screen);
+    DEBUG_ECHOLNPAIR(" NO SCREEN FOR: ", current_screen);
     ScreenComplete = true;
     return; // nothing to do, likely a bug or boring screen.
   }
@@ -729,7 +729,7 @@ void DGUSScreenHandler::UpdateScreenVPData() {
   bool sent_one = false;
   do {
     uint16_t VP = pgm_read_word(VPList);
-    DEBUG_ECHOPGM(" VP: ", VP);
+    DEBUG_ECHOPAIR(" VP: ", VP);
     if (!VP) {
       update_ptr = 0;
       DEBUG_ECHOLNPGM(" UpdateScreenVPData done");
@@ -745,14 +745,14 @@ void DGUSScreenHandler::UpdateScreenVPData() {
       // Send the VP to the display, but try to avoid overrunning the Tx Buffer.
       // But send at least one VP, to avoid getting stalled.
       if (rcpy.send_to_display_handler && (!sent_one || expected_tx <= dgusdisplay.GetFreeTxBuffer())) {
-        //DEBUG_ECHOPGM(" calling handler for ", rcpy.VP);
+        //DEBUG_ECHOPAIR(" calling handler for ", rcpy.VP);
         sent_one = true;
         rcpy.send_to_display_handler(rcpy);
       }
       else {
         // auto x=dgusdisplay.GetFreeTxBuffer();
-        //DEBUG_ECHOLNPGM(" tx almost full: ", x);
-        //DEBUG_ECHOPGM(" update_ptr ", update_ptr);
+        //DEBUG_ECHOLNPAIR(" tx almost full: ", x);
+        //DEBUG_ECHOPAIR(" update_ptr ", update_ptr);
         ScreenComplete = false;
         return; // please call again!
       }
@@ -767,9 +767,9 @@ void DGUSScreenHandler::GotoScreen(DGUSLCD_Screens screen, bool ispopup) {
 }
 
 void DGUSDisplay::RequestScreen(DGUSLCD_Screens screen) {
-  DEBUG_ECHOLNPGM("GotoScreen ", screen);
+  DEBUG_ECHOLNPAIR("GotoScreen ", screen);
   const unsigned char gotoscreen[] = { 0x5A, 0x01, (unsigned char) (screen >> 8U), (unsigned char) (screen & 0xFFU) };
   WriteVariable(0x84, gotoscreen, sizeof(gotoscreen));
 }
 
-#endif // HAS_DGUS_LCD_CLASSIC
+#endif // HAS_DGUS_LCD
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 4f15827..55546ca 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -26,7 +26,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_DGUS_LCD_CLASSIC
+#if HAS_DGUS_LCD
 
 #include "../ui_api.h"
 #include "DGUSDisplay.h"
@@ -64,7 +64,7 @@ namespace ExtUI {
       ScreenHandler.SetupConfirmAction(setUserConfirmed);
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POPUP);
     }
-    else if (ScreenHandler.getCurrentScreen() == DGUSLCD_SCREEN_POPUP) {
+    else if (ScreenHandler.getCurrentScreen() == DGUSLCD_SCREEN_POPUP ) {
       ScreenHandler.SetupConfirmAction(nullptr);
       ScreenHandler.PopToOldScreen();
     }
@@ -135,9 +135,6 @@ namespace ExtUI {
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
       switch (rst) {
-        case PID_STARTED:
-          ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE));
-          break;
         case PID_BAD_EXTRUDER_NUM:
           ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
           break;
@@ -150,6 +147,7 @@ namespace ExtUI {
         case PID_DONE:
           ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
           break;
+        case PID_STARTED: break;
       }
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN);
     }
@@ -159,4 +157,4 @@ namespace ExtUI {
   void onSteppersEnabled()  {}
 }
 
-#endif // HAS_DGUS_LCD_CLASSIC
+#endif // HAS_DGUS_LCD
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 60a0f6c..ae6a31f 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -134,7 +134,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPGM("\n DEBUG target", target);
+  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
 
   if (target == DGUSLCD_SCREEN_POPUP) {
     // Special handling for popup is to return to previous menu
@@ -146,7 +146,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
@@ -190,10 +190,10 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
     char buf[6] = "G28 X";
     buf[4] = axiscode;
-    //DEBUG_ECHOPGM(" ", buf);
+    //DEBUG_ECHOPAIR(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
@@ -201,7 +201,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
@@ -215,13 +215,13 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (movevalue < 0) { value = -value; sign[0] = '-'; }
     int16_t fraction = ABS(movevalue) % 100;
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
-    //DEBUG_ECHOPGM(" ", buf);
+    //DEBUG_ECHOPAIR(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (backup_speed != speed) {
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
       queue.enqueue_one_now(buf);
-      //DEBUG_ECHOPGM(" ", buf);
+      //DEBUG_ECHOPAIR(" ", buf);
     }
     // while (!enqueue_and_echo_command(buf)) idle();
     //DEBUG_ECHOLNPGM(" ✓ ");
@@ -237,16 +237,16 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("V1:", rawvalue);
+    DEBUG_ECHOLNPAIR("V1:", rawvalue);
     float value = (float)rawvalue / 10;
-    DEBUG_ECHOLNPGM("V2:", value);
+    DEBUG_ECHOLNPAIR("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index 83f7a39..c67ec73 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -134,7 +134,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPGM("\n DEBUG target", target);
+  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
 
   if (target == DGUSLCD_SCREEN_POPUP) {
     // Special handling for popup is to return to previous menu
@@ -146,7 +146,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
@@ -190,10 +190,10 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
     char buf[6] = "G28 X";
     buf[4] = axiscode;
-    //DEBUG_ECHOPGM(" ", buf);
+    //DEBUG_ECHOPAIR(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
@@ -201,7 +201,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
@@ -215,13 +215,13 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (movevalue < 0) { value = -value; sign[0] = '-'; }
     int16_t fraction = ABS(movevalue) % 100;
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
-    //DEBUG_ECHOPGM(" ", buf);
+    //DEBUG_ECHOPAIR(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (backup_speed != speed) {
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
       queue.enqueue_one_now(buf);
-      //DEBUG_ECHOPGM(" ", buf);
+      //DEBUG_ECHOPAIR(" ", buf);
     }
     // while (!enqueue_and_echo_command(buf)) idle();
     //DEBUG_ECHOLNPGM(" ✓ ");
@@ -237,16 +237,16 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("V1:", rawvalue);
+    DEBUG_ECHOLNPAIR("V1:", rawvalue);
     float value = (float)rawvalue / 10;
-    DEBUG_ECHOLNPGM("V2:", value);
+    DEBUG_ECHOLNPAIR("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index 407782f..c78e35e 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -28,9 +28,9 @@
 #define LOGO_TIME_DELAY TERN(USE_MKS_GREEN_UI, 8000, 1500)
 
 #if ENABLED(DGUS_MKS_RUNOUT_SENSOR)
-  #define MT_DET_1_PIN     1
-  #define MT_DET_2_PIN     2
-  #define MT_DET_PIN_STATE LOW
+  #define MT_DET_1_PIN         1
+  #define MT_DET_2_PIN         2
+  #define MT_DET_PIN_INVERTING false
 #endif
 
 #define MKS_FINSH
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 60c3790..8c806f0 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -83,8 +83,8 @@ void DGUSScreenHandler::sendinfoscreen_mks(const void *line1, const void *line2,
 
 void DGUSScreenHandler::DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    //DEBUG_ECHOPGM(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
-    //DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
+    //DEBUG_ECHOPAIR(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
+    //DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
     uint16_t tmp = *(uint8_t *) var.memadr; // +1 -> avoid rounding issues for the display.
     // tmp = map(tmp, 0, 255, 0, 100);
     dgusdisplay.WriteVariable(var.VP, tmp);
@@ -109,14 +109,14 @@ void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay_MKS(DGUS_VP_Variable &var
 void DGUSScreenHandler::DGUSLCD_SetUint8(DGUS_VP_Variable &var, void *val_ptr) {
   if (var.memadr) {
     const uint16_t value = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("FAN value get:", value);
+    DEBUG_ECHOLNPAIR("FAN value get:", value);
     *(uint8_t*)var.memadr = map(constrain(value, 0, 255), 0, 255, 0, 255);
-    DEBUG_ECHOLNPGM("FAN value change:", *(uint8_t*)var.memadr);
+    DEBUG_ECHOLNPAIR("FAN value change:", *(uint8_t*)var.memadr);
   }
 }
 
 void DGUSScreenHandler::DGUSLCD_SendGbkToDisplay(DGUS_VP_Variable &var) {
-  DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
+  DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
   uint16_t *tmp = (uint16_t*) var.memadr;
   dgusdisplay.WriteVariable(var.VP, tmp, var.size, true);
 }
@@ -282,7 +282,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPGM("\n DEBUG target", target);
+  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
 
   // when the dgus had reboot, it will enter the DGUSLCD_SCREEN_MAIN page,
   // so user can change any page to use this function, an it will check
@@ -311,13 +311,13 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
 void DGUSScreenHandler::ScreenBackChange(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t target = swap16(*(uint16_t *)val_ptr);
-  DEBUG_ECHOLNPGM(" back = 0x%x", target);
+  DEBUG_ECHOLNPAIR(" back = 0x%x", target);
   switch (target) {
   }
 }
@@ -756,7 +756,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   else if (manualMoveStep == 0x02) manualMoveStep =  100;
   else if (manualMoveStep == 0x03) manualMoveStep = 1000;
 
-  DEBUG_ECHOLNPGM("QUEUE LEN:", queue.length);
+  DEBUG_ECHOLNPAIR("QUEUE LEN:", queue.length);
 
   if (!print_job_timer.isPaused() && !queue.ring_buffer.empty())
     return;
@@ -818,7 +818,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
       break;
   }
 
-  DEBUG_ECHOPGM("movevalue = ", movevalue);
+  DEBUG_ECHOPAIR("movevalue = ", movevalue);
   if (movevalue != 0 && movevalue != 5) { // get move distance
     switch (movevalue) {
       case 0x0001: movevalue =  manualMoveStep; break;
@@ -829,20 +829,20 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
     // char buf[6] = "G28 X";
     // buf[4] = axiscode;
 
     char buf[6];
     sprintf(buf, "G28 %c", axiscode);
-    //DEBUG_ECHOPGM(" ", buf);
+    //DEBUG_ECHOPAIR(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
     return;
   }
   else if (movevalue == 5) {
-    DEBUG_ECHOPGM("send M84");
+    DEBUG_ECHOPAIR("send M84");
     char buf[6];
     snprintf_P(buf,6,PSTR("M84 %c"), axiscode);
     queue.enqueue_one_now(buf);
@@ -851,7 +851,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
 
     if (!relative_mode) {
@@ -871,7 +871,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     //if (backup_speed != speed) {
     //  snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
     //  queue.enqueue_one_now(buf);
-    //  //DEBUG_ECHOPGM(" ", buf);
+    //  //DEBUG_ECHOPAIR(" ", buf);
     //}
 
     //while (!enqueue_and_echo_command(buf)) idle();
@@ -889,7 +889,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
@@ -923,7 +923,7 @@ void DGUSScreenHandler::HandleStepPerMMChanged_MKS(DGUS_VP_Variable &var, void *
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::axis_t axis;
@@ -945,7 +945,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged_MKS(DGUS_VP_Variable &var
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::extruder_t extruder;
@@ -970,7 +970,7 @@ void DGUSScreenHandler::HandleMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *va
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::axis_t axis;
@@ -992,7 +992,7 @@ void DGUSScreenHandler::HandleExtruderMaxSpeedChange_MKS(DGUS_VP_Variable &var,
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::extruder_t extruder;
@@ -1017,7 +1017,7 @@ void DGUSScreenHandler::HandleMaxAccChange_MKS(DGUS_VP_Variable &var, void *val_
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::axis_t axis;
@@ -1037,7 +1037,7 @@ void DGUSScreenHandler::HandleExtruderAccChange_MKS(DGUS_VP_Variable &var, void
   DEBUG_ECHOLNPGM("HandleExtruderAccChange_MKS");
 
   uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
+  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
   float value = (float)value_raw;
   ExtUI::extruder_t extruder;
   switch (var.VP) {
@@ -1091,9 +1091,9 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     const uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("V1:", rawvalue);
+    DEBUG_ECHOLNPAIR("V1:", rawvalue);
     const float value = 1.0f * rawvalue;
-    DEBUG_ECHOLNPGM("V2:", value);
+    DEBUG_ECHOLNPAIR("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
@@ -1495,17 +1495,17 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
         break;
 
       case UNRUNOUT_STATUS:
-        if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
+        if (READ(MT_DET_1_PIN) == LOW)
           runout_mks.runout_status = RUNOUT_STATUS;
         break;
 
       case RUNOUT_BEGIN_STATUS:
-        if (READ(MT_DET_1_PIN) != MT_DET_PIN_STATE)
+        if (READ(MT_DET_1_PIN) == HIGH)
           runout_mks.runout_status = RUNOUT_WAITTING_STATUS;
         break;
 
       case RUNOUT_WAITTING_STATUS:
-        if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
+        if (READ(MT_DET_1_PIN) == LOW)
           runout_mks.runout_status = RUNOUT_BEGIN_STATUS;
         break;
 
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index db467d7..b0759c6 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -134,7 +134,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPGM("\n DEBUG target", target);
+  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
 
   if (target == DGUSLCD_SCREEN_POPUP) {
     // Special handling for popup is to return to previous menu
@@ -146,7 +146,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
@@ -190,10 +190,10 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
     char buf[6] = "G28 X";
     buf[4] = axiscode;
-    //DEBUG_ECHOPGM(" ", buf);
+    //DEBUG_ECHOPAIR(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
@@ -201,7 +201,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
@@ -215,13 +215,13 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (movevalue < 0) { value = -value; sign[0] = '-'; }
     int16_t fraction = ABS(movevalue) % 100;
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
-    //DEBUG_ECHOPGM(" ", buf);
+    //DEBUG_ECHOPAIR(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (backup_speed != speed) {
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
       queue.enqueue_one_now(buf);
-      //DEBUG_ECHOPGM(" ", buf);
+      //DEBUG_ECHOPAIR(" ", buf);
     }
     // while (!enqueue_and_echo_command(buf)) idle();
     //DEBUG_ECHOLNPGM(" ✓ ");
@@ -237,16 +237,16 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("V1:", rawvalue);
+    DEBUG_ECHOLNPAIR("V1:", rawvalue);
     float value = (float)rawvalue / 10;
-    DEBUG_ECHOLNPGM("V2:", value);
+    DEBUG_ECHOLNPAIR("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
diff --git a/Marlin/src/lcd/extui/example/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
index f74cbee..0e7d71f 100644
--- a/Marlin/src/lcd/extui/example/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -120,7 +120,6 @@ namespace ExtUI {
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
       switch (rst) {
-        case PID_STARTED:          break;
         case PID_BAD_EXTRUDER_NUM: break;
         case PID_TEMP_TOO_HIGH:    break;
         case PID_TUNING_TIMEOUT:   break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index ebe99a3..a283183 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -178,9 +178,9 @@ bool UIFlashStorage::is_present = false;
 
     if (!is_known) {
       SERIAL_ECHO_MSG("Unable to locate supported SPI Flash Memory.");
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Manufacturer ID, got: ", manufacturer_id);
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Device Type    , got: ", device_type);
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Capacity       , got: ", capacity);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("  Manufacturer ID, got: ", manufacturer_id);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("  Device Type    , got: ", device_type);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("  Capacity       , got: ", capacity);
     }
 
     return is_known;
@@ -247,7 +247,7 @@ bool UIFlashStorage::is_present = false;
         case 0xFFFFFFFFul: return read_offset;
         case delimiter:    read_offset = offset; break;
         default:
-          SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Invalid delimiter in Flash: ", delim);
+          SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("Invalid delimiter in Flash: ", delim);
           return -1;
       }
     }
@@ -325,7 +325,7 @@ bool UIFlashStorage::is_present = false;
     }
 
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM("Writing UI settings to SPI Flash (offset ", write_addr);
+    SERIAL_ECHOPAIR("Writing UI settings to SPI Flash (offset ", write_addr);
     SERIAL_ECHOPGM(")...");
 
     const uint32_t delim = delimiter;
@@ -509,7 +509,7 @@ bool UIFlashStorage::is_present = false;
 
     bytes_remaining = get_media_file_size(slot);
     if (bytes_remaining != 0xFFFFFFFFUL) {
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Boot media file size:", bytes_remaining);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("Boot media file size:", bytes_remaining);
       addr = get_media_file_start(slot);
       return true;
     }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
index 754f6e9..4faddc6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
@@ -21,6 +21,7 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
+
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
index e8b4281..50fc5ab 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
@@ -21,6 +21,7 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
+
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
index 6a02228..f679618 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
@@ -21,6 +21,7 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
+
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index c8e5721..9faedae 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -131,11 +131,8 @@ namespace ExtUI {
   #if HAS_PID_HEATING
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
-      //SERIAL_ECHOLNPGM("OnPidTuning:", rst);
+      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
       switch (rst) {
-        case PID_STARTED:
-          StatusScreen::setStatusMessage(GET_TEXT_F(MSG_PID_AUTOTUNE));
-          break;
         case PID_BAD_EXTRUDER_NUM:
           StatusScreen::setStatusMessage(GET_TEXT_F(MSG_PID_BAD_EXTRUDER_NUM));
           break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
index 5168ef7..19f926d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
@@ -138,7 +138,7 @@
  * Settings for the Aleph Objects Color LCD User Interface
  * Datasheet https://www.hantronix.com/files/data/s1501799605s500-gh7.pdf
  */
-#elif defined(LCD_LULZBOT_CLCD_UI)
+#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
   #if !HAS_RESOLUTION
     #define TOUCH_UI_800x480
   #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index 40cddce..a10fdc3 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -1025,8 +1025,8 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
   if (Command_Space < (len + padding)) {
     #if ENABLED(TOUCH_UI_DEBUG)
       SERIAL_ECHO_START();
-      SERIAL_ECHOPGM("Waiting for ", len + padding);
-      SERIAL_ECHOLNPGM(" bytes in command queue, now free: ", Command_Space);
+      SERIAL_ECHOPAIR("Waiting for ", len + padding);
+      SERIAL_ECHOLNPAIR(" bytes in command queue, now free: ", Command_Space);
     #endif
     do {
       Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index 4e11c73..b4438a9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -199,7 +199,7 @@
   #define _NUM_ARGS(_,Z,Y,X,W,V,U,T,S,R,Q,P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A,OUT,...) OUT
   #define NUM_ARGS(V...) _NUM_ARGS(0,V,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
 
-  // SERIAL_ECHOPGM / SERIAL_ECHOPGM_P is used to output a key value pair. The key must be a string and the value can be anything
+  // SERIAL_ECHOPAIR / SERIAL_ECHOPAIR_P is used to output a key value pair. The key must be a string and the value can be anything
   // Print up to 12 pairs of values. Odd elements auto-wrapped in PSTR().
   #define __SEP_N(N,V...)   _SEP_##N(V)
   #define _SEP_N(N,V...)    __SEP_N(N,V)
@@ -218,9 +218,9 @@
   #define SERIAL_ECHO_START()
   #define SERIAL_ECHOLNPGM(str)       Serial.println(F(str))
   #define SERIAL_ECHOPGM(str)         Serial.print(F(str))
-  #define SERIAL_ECHO_MSG(V...)       SERIAL_ECHOLNPGM(V)
-  #define SERIAL_ECHOLNPGM(V...)     _SELP_N(NUM_ARGS(V),V)
-  #define SERIAL_ECHOPGM(str, val)   do{ Serial.print(F(str)); Serial.print(val); }while(0)
+  #define SERIAL_ECHO_MSG(V...)       SERIAL_ECHOLNPAIR(V)
+  #define SERIAL_ECHOLNPAIR(V...)     _SELP_N(NUM_ARGS(V),V)
+  #define SERIAL_ECHOPAIR(str, val)   do{ Serial.print(F(str)); Serial.print(val); }while(0)
 
   #define safe_delay delay
 
@@ -296,7 +296,3 @@
   #endif
 
 #endif // !__MARLIN_FIRMWARE__
-
-#ifndef SD_SPI_SPEED
-  #define SD_SPI_SPEED SPI_FULL_SPEED
-#endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
index 1ee73c1..a13c362 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
@@ -132,8 +132,8 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
     // Not enough memory to cache the display list.
     #if ENABLED(TOUCH_UI_DEBUG)
       SERIAL_ECHO_START();
-      SERIAL_ECHOPGM  ("Not enough space in GRAM to cache display list, free space: ", dl_slot_size);
-      SERIAL_ECHOLNPGM(" Required: ", dl_size);
+      SERIAL_ECHOPAIR  ("Not enough space in GRAM to cache display list, free space: ", dl_slot_size);
+      SERIAL_ECHOLNPAIR(" Required: ", dl_size);
     #endif
     dl_slot_used = 0;
     save_slot();
@@ -142,8 +142,8 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
   else {
     #if ENABLED(TOUCH_UI_DEBUG)
       SERIAL_ECHO_START();
-      SERIAL_ECHOPGM  ("Saving DL to RAMG cache, bytes: ", dl_slot_used);
-      SERIAL_ECHOLNPGM(" Free space: ", dl_slot_size);
+      SERIAL_ECHOPAIR  ("Saving DL to RAMG cache, bytes: ", dl_slot_used);
+      SERIAL_ECHOLNPAIR(" Free space: ", dl_slot_size);
     #endif
     dl_slot_used = dl_size;
     save_slot();
@@ -172,8 +172,8 @@ void DLCache::append() {
     cmd.execute();
     wait_until_idle();
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM  ("Appending to DL from RAMG cache, bytes: ", dl_slot_used);
-    SERIAL_ECHOLNPGM(" REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
+    SERIAL_ECHOPAIR  ("Appending to DL from RAMG cache, bytes: ", dl_slot_used);
+    SERIAL_ECHOLNPAIR(" REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
   #endif
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
index e99c798..bf9858f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
@@ -48,7 +48,6 @@
   #include "sound_list.h"
   #include "polygon.h"
   #include "poly_ui.h"
-  #include "arrows.h"
   #include "text_box.h"
   #include "text_ellipsis.h"
   #include "adjuster_widget.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
index 813f4f0..dd94685 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
@@ -54,33 +54,23 @@
 #define EDGE_L           0
 #define EDGE_R           0
 
-// _GRID_X and _GRID_Y computes the positions of the divisions on
+// GRID_X and GRID_Y computes the positions of the divisions on
 // the layout grid.
-#define _GRID_X(x)       ((x)*(FTDI::display_width-EDGE_R-EDGE_L)/GRID_COLS+EDGE_L)
-#define _GRID_Y(y)       ((y)*(FTDI::display_height-EDGE_B-EDGE_T)/GRID_ROWS+EDGE_T)
-
-// BOX_X, BOX_Y, BOX_W and BOX_X returns the top-left and width
-// and height of position on the grid.
-
-#define BOX_X(x)         (_GRID_X((x)-1))
-#define BOX_Y(y)         (_GRID_Y((y)-1))
-#define BOX_W(w)         (_GRID_X(w) - _GRID_X(0))
-#define BOX_H(h)         (_GRID_Y(h) - _GRID_Y(0))
+#define GRID_X(x)        ((x)*(FTDI::display_width-EDGE_R-EDGE_L)/GRID_COLS+EDGE_L)
+#define GRID_Y(y)        ((y)*(FTDI::display_height-EDGE_B-EDGE_T)/GRID_ROWS+EDGE_T)
 
 // BTN_X, BTN_Y, BTN_W and BTN_X returns the top-left and width
 // and height of a button, taking into account the button margins.
 
-#define BTN_X(x)         (BOX_X(x) + MARGIN_L)
-#define BTN_Y(y)         (BOX_Y(y) + MARGIN_T)
-#define BTN_W(w)         (BOX_W(w) - MARGIN_L - MARGIN_R)
-#define BTN_H(h)         (BOX_H(h) - MARGIN_T - MARGIN_B)
+#define BTN_X(x)         (GRID_X((x)-1) + MARGIN_L)
+#define BTN_Y(y)         (GRID_Y((y)-1) + MARGIN_T)
+#define BTN_W(w)         (GRID_X(w) - GRID_X(0) - MARGIN_L - MARGIN_R)
+#define BTN_H(h)         (GRID_Y(h) - GRID_Y(0) - MARGIN_T - MARGIN_B)
 
-// Abbreviations for common phrases, to allow a box or button
-// to be defined in one line of source.
+// Abbreviations for common phrases, to allow a button to be
+// defined in one line of source.
 #define BTN_POS(x,y)     BTN_X(x), BTN_Y(y)
 #define BTN_SIZE(w,h)    BTN_W(w), BTN_H(h)
-#define BOX_POS(x,y)     BOX_X(x), BOX_Y(y)
-#define BOX_SIZE(w,h)    BOX_W(w), BOX_H(h)
 
 // Draw a reference grid for ease of spacing out widgets.
 #define DRAW_LAYOUT_GRID \
@@ -88,13 +78,13 @@
     cmd.cmd(LINE_WIDTH(4)); \
     for (int i = 1; i <= GRID_COLS; i++) { \
       cmd.cmd(BEGIN(LINES)); \
-      cmd.cmd(VERTEX2F(_GRID_X(i) *16, 0             *16)); \
-      cmd.cmd(VERTEX2F(_GRID_X(i) *16, FTDI::display_height *16)); \
+      cmd.cmd(VERTEX2F(GRID_X(i) *16, 0             *16)); \
+      cmd.cmd(VERTEX2F(GRID_X(i) *16, FTDI::display_height *16)); \
     } \
     for (int i = 1; i < GRID_ROWS; i++) { \
       cmd.cmd(BEGIN(LINES)); \
-      cmd.cmd(VERTEX2F(0                       *16, _GRID_Y(i) *16)); \
-      cmd.cmd(VERTEX2F(FTDI::display_width     *16, _GRID_Y(i) *16)); \
+      cmd.cmd(VERTEX2F(0                       *16, GRID_Y(i) *16)); \
+      cmd.cmd(VERTEX2F(FTDI::display_width     *16, GRID_Y(i) *16)); \
     } \
     cmd.cmd(LINE_WIDTH(16)); \
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
index 44836ce..4e318ce 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
@@ -33,7 +33,7 @@ uint8_t ScreenRef::lookupScreen(onRedraw_func_t onRedraw_ptr) {
   }
   #if ENABLED(TOUCH_UI_DEBUG)
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM("Screen not found: ", (uintptr_t) onRedraw_ptr);
+    SERIAL_ECHOPAIR("Screen not found: ", (uintptr_t) onRedraw_ptr);
   #endif
   return 0xFF;
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
index a13ab8e..486c4fe 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
@@ -237,7 +237,7 @@ class CachedScreen {
       cmd.cmd(CMD_SWAP);
       cmd.execute();
       #if ENABLED(TOUCH_UI_DEBUG)
-        SERIAL_ECHOLNPGM("Time to draw screen (ms): ", millis() - start_time);
+        SERIAL_ECHOLNPAIR("Time to draw screen (ms): ", millis() - start_time);
       #endif
     }
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index 342b1e4..544c5fe 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -23,10 +23,6 @@
 
 #if ENABLED(FTDI_EXTENDED)
 
-#define IS_LINE_SEPARATOR(c) c == '\n' || c == '\t'
-#define IS_WORD_SEPARATOR(c) c == ' '
-#define IS_SEPARATOR(c) IS_LINE_SEPARATOR(c) || IS_WORD_SEPARATOR(c)
-
 namespace FTDI {
   /**
    * Given a str, end will be set to the position at which a line needs to
@@ -41,11 +37,11 @@ namespace FTDI {
       const char *next = p;
       const utf8_char_t c = get_utf8_char_and_inc(next);
       // Decide whether to break the string at this location
-      if (IS_SEPARATOR(c) || c == '\0' ) {
+      if (c == '\n' || c == '\0' || c == ' ') {
         end = p;
         result = lw;
       }
-      if (IS_LINE_SEPARATOR(c) || c == '\0') break;
+      if (c == '\n' || c == '\0') break;
       // Measure the next character
       const uint16_t cw = use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c];
       // Stop processing once string exceeds the display width
@@ -73,7 +69,7 @@ namespace FTDI {
       const uint16_t line_width = find_line_break(utf8_fm, clcd_fm, wrap_width, line_start, line_end, use_utf8);
       width  = max(width, line_width);
       height += utf8_fm.get_height();
-      if (IS_SEPARATOR(*line_end)) line_end++;
+      if (*line_end == '\n' || *line_end == ' ') line_end++;
       if (*line_end == '\0') break;
       if (line_end == line_start) break;
       line_start = line_end;
@@ -128,7 +124,7 @@ namespace FTDI {
       }
       y += utf8_fm.get_height();
 
-      if (IS_SEPARATOR(*line_end)) line_end++;
+      if (*line_end == '\n' || *line_end == ' ') line_end++;
       if (*line_end == '\0') break;
       if (line_end == line_start) break;
       line_start = line_end;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
index 463d5ad..4262dd1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
@@ -34,6 +34,7 @@ namespace FTDI {
       #define CHAR_WIDTH(c) use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c]
     #else
       #define CHAR_WIDTH(c) utf8_fm.get_char_width(c)
+      constexpr bool use_utf8 = false;
     #endif
     FontMetrics utf8_fm(font);
     CLCD::FontMetrics clcd_fm;
@@ -45,12 +46,12 @@ namespace FTDI {
     // split and still allow the ellipsis to fit.
     int16_t lineWidth = 0;
     char *breakPoint = str;
-    const char *next = str;
+    char *next = str;
     while (*next) {
       const utf8_char_t c = get_utf8_char_and_inc(next);
       lineWidth += CHAR_WIDTH(c);
       if (lineWidth + ellipsisWidth < w)
-        breakPoint = (char*)next;
+        breakPoint = next;
     }
 
     if (lineWidth > w) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index 15e613c..2da5d55 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -66,7 +66,7 @@
    *          character (this is not the unicode codepoint)
    */
 
-  utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
+  utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
     utf8_char_t val = *(uint8_t*)c++;
     if ((val & 0xC0) == 0xC0)
       while ((*c & 0xC0) == 0x80)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
index 391c8bf..3ca6dfd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
@@ -51,14 +51,14 @@ namespace FTDI {
 
     /* Returns the next character in a UTF8 string, without incrementing */
 
-    inline utf8_char_t get_utf8_char(const char *c) { return get_utf8_char_and_inc(c); }
+    inline utf8_char_t get_utf8_char(const char *c) {return get_utf8_char_and_inc(c);}
 
     void load_utf8_data(uint32_t addr);
   #else
     typedef char utf8_char_t;
 
-    inline utf8_char_t get_utf8_char_and_inc(const char *&c) { return *c++; }
-    inline utf8_char_t get_utf8_char(const char *c) { return *c; }
+    inline utf8_char_t get_utf8_char_and_inc(const char *&c) {return *c++;}
+    inline utf8_char_t get_utf8_char(const char *c) {return *c;}
 
     inline void load_utf8_data(uint32_t) {}
   #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
index 8db2d2e..552cd83 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
@@ -157,6 +157,12 @@ void BedMeshViewScreen::doProbe() {
   injectCommands_P(PSTR(BED_LEVELING_COMMANDS));
 }
 
+void BedMeshViewScreen::doMeshValidation() {
+  mydata.count = 0;
+  GOTO_SCREEN(StatusScreen);
+  injectCommands_P(PSTR("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
+}
+
 void BedMeshViewScreen::show() {
   injectCommands_P(PSTR("G29 L1"));
   GOTO_SCREEN(BedMeshViewScreen);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
index 90a90c2..0bb88f7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
@@ -43,5 +43,6 @@ class BedMeshViewScreen : public BedMeshBase, public CachedScreen<BED_MESH_VIEW_
     static bool onTouchEnd(uint8_t tag);
 
     static void doProbe();
+    static void doMeshValidation();
     static void show();
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
index 7f56653..47aac62 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
@@ -33,7 +33,7 @@ using namespace ExtUI;
 constexpr static ConfirmStartPrintDialogBoxData &mydata = screen_data.ConfirmStartPrintDialogBox;
 
 void ConfirmStartPrintDialogBox::onRedraw(draw_mode_t) {
-  const char *filename = getFilename();
+  const char *filename = getLongFilename();
   char buffer[strlen_P(GET_TEXT(MSG_START_PRINT_CONFIRMATION)) + strlen(filename) + 1];
   sprintf_P(buffer, GET_TEXT(MSG_START_PRINT_CONFIRMATION), filename);
   drawMessage((const char *)buffer);
@@ -52,10 +52,10 @@ bool ConfirmStartPrintDialogBox::onTouchEnd(uint8_t tag) {
   }
 }
 
-const char *ConfirmStartPrintDialogBox::getFilename(bool shortName) {
+const char *ConfirmStartPrintDialogBox::getFilename(bool longName) {
   FileList files;
   files.seek(mydata.file_index, true);
-  return shortName ? files.shortFilename() : files.filename();
+  return longName ? files.longFilename() : files.shortFilename();
 }
 
 void ConfirmStartPrintDialogBox::show(uint8_t file_index) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
index 1f74fde..e073ed5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
@@ -31,9 +31,10 @@ struct ConfirmStartPrintDialogBoxData {
 
 class ConfirmStartPrintDialogBox : public DialogBoxBaseClass, public UncachedScreen {
   private:
-    inline static const char *getShortFilename() {return getFilename(true);}
+    inline static const char *getShortFilename() {return getFilename(false);}
+    inline static const char *getLongFilename()  {return getFilename(true);}
 
-    static const char *getFilename(bool shortName = false);
+    static const char *getFilename(bool longName);
   public:
     static void onRedraw(draw_mode_t);
     static bool onTouchEnd(uint8_t);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
index 6935494..e46a280 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #pragma once
 
 #define FTDI_CUSTOM_USER_MENUS
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index 5076e58..aa54e88 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -26,34 +26,6 @@
 
 #ifdef FTDI_FILES_SCREEN
 
-#if ENABLED(TOUCH_UI_PORTRAIT)
-  #define GRID_COLS  6
-  #define GRID_ROWS  15
-  #define FILES_PER_PAGE 11
-  #define PREV_DIR LEFT
-  #define NEXT_DIR RIGHT
-
-  #define PREV_POS BTN_POS(1,1),  BTN_SIZE(1,2)
-  #define HEAD_POS BTN_POS(2,1),  BTN_SIZE(4,2)
-  #define NEXT_POS BTN_POS(6,1),  BTN_SIZE(1,2)
-  #define LIST_POS BTN_POS(1,3),  BTN_SIZE(6,FILES_PER_PAGE)
-  #define BTN1_POS BTN_POS(1,14), BTN_SIZE(3,2)
-  #define BTN2_POS BTN_POS(4,14), BTN_SIZE(3,2)
-#else
-  #define GRID_COLS  12
-  #define GRID_ROWS  8
-  #define FILES_PER_PAGE 6
-  #define PREV_DIR UP
-  #define NEXT_DIR DOWN
-
-  #define PREV_POS BTN_POS(12,2), BTN_SIZE(1,3)
-  #define HEAD_POS BTN_POS( 1,1), BTN_SIZE(12,1)
-  #define NEXT_POS BTN_POS(12,5), BTN_SIZE(1,4)
-  #define LIST_POS BTN_POS( 1,2), BTN_SIZE(11,FILES_PER_PAGE)
-  #define BTN1_POS BTN_POS( 1,8), BTN_SIZE(6,1)
-  #define BTN2_POS BTN_POS( 7,8), BTN_SIZE(5,1)
-#endif
-
 using namespace FTDI;
 using namespace ExtUI;
 using namespace Theme;
@@ -70,14 +42,13 @@ void FilesScreen::onEntry() {
   BaseScreen::onEntry();
 }
 
-const char *FilesScreen::getSelectedFilename(bool shortName) {
+const char *FilesScreen::getSelectedFilename(bool longName) {
   FileList files;
   files.seek(getSelectedFileIndex(), true);
-  return shortName ? files.shortFilename() : files.filename();
+  return longName ? files.longFilename() : files.shortFilename();
 }
 
 void FilesScreen::drawSelectedFile() {
-  if(mydata.selected_tag == 0xFF) return;
   FileList files;
   files.seek(getSelectedFileIndex(), true);
   mydata.flags.is_dir = files.isDir();
@@ -94,108 +65,122 @@ uint16_t FilesScreen::getSelectedFileIndex() {
 }
 
 uint16_t FilesScreen::getFileForTag(uint8_t tag) {
-  return mydata.cur_page * FILES_PER_PAGE + tag - 2;
+  return mydata.cur_page * files_per_page + tag - 2;
 }
 
-void FilesScreen::drawFileButton(int x, int y, int w, int h, const char *filename, uint8_t tag, bool is_dir, bool is_highlighted) {
-  #define SUB_COLS 6
-  #define SUB_ROWS FILES_PER_PAGE
-
-  const int bx = SUB_X(1);
-  const int by = SUB_Y(getLineForTag(tag)+1);
-  const int bw = SUB_W(6);
-  const int bh = SUB_H(1);
+#if ENABLED(TOUCH_UI_PORTRAIT)
+  #define GRID_COLS  6
+  #define GRID_ROWS (files_per_page + header_h + footer_h)
+#else
+  #define GRID_COLS  6
+  #define GRID_ROWS (files_per_page + header_h + footer_h)
+#endif
 
+void FilesScreen::drawFileButton(const char *filename, uint8_t tag, bool is_dir, bool is_highlighted) {
+  const uint8_t line = getLineForTag(tag)+1;
   CommandProcessor cmd;
   cmd.tag(tag);
   cmd.cmd(COLOR_RGB(is_highlighted ? fg_action : bg_color));
-  cmd.font(font_medium).rectangle(bx, by, bw, bh);
+  cmd.font(font_medium)
+     .rectangle( 0, BTN_Y(header_h+line), display_width, BTN_H(1));
   cmd.cmd(COLOR_RGB(is_highlighted ? normal_btn.rgb : bg_text_enabled));
+  constexpr uint16_t dim[2] = {BTN_SIZE(6,1)};
+  #define POS_AND_SHORTEN(SHORTEN) BTN_POS(1,header_h+line), dim[0] - (SHORTEN), dim[1]
+  #define POS_AND_SIZE             POS_AND_SHORTEN(0)
   #if ENABLED(SCROLL_LONG_FILENAMES)
     if (is_highlighted) {
       cmd.cmd(SAVE_CONTEXT());
-      cmd.cmd(SCISSOR_XY(x,y));
-      cmd.cmd(SCISSOR_SIZE(w,h));
       cmd.cmd(MACRO(0));
-      cmd.text(bx, by, bw, bh, filename, OPT_CENTERY | OPT_NOFIT);
+      cmd.text(POS_AND_SIZE, filename, OPT_CENTERY | OPT_NOFIT);
     } else
   #endif
-  draw_text_with_ellipsis(cmd, bx,by, bw - (is_dir ? 20 : 0), bh, filename, OPT_CENTERY, font_medium);
-  if (is_dir && !is_highlighted) cmd.text(bx, by, bw, bh, F("> "),  OPT_CENTERY | OPT_RIGHTX);
+  draw_text_with_ellipsis(cmd, POS_AND_SHORTEN(is_dir ? 20 : 0), filename, OPT_CENTERY, font_medium);
+  if (is_dir && !is_highlighted) {
+    cmd.text(POS_AND_SIZE, F("> "),  OPT_CENTERY | OPT_RIGHTX);
+  }
   #if ENABLED(SCROLL_LONG_FILENAMES)
-    if (is_highlighted) cmd.cmd(RESTORE_CONTEXT());
+    if (is_highlighted) {
+      cmd.cmd(RESTORE_CONTEXT());
+    }
   #endif
 }
 
 void FilesScreen::drawFileList() {
   FileList files;
-  mydata.num_page = max(1,ceil(float(files.count()) / FILES_PER_PAGE));
+  mydata.num_page = max(1,ceil(float(files.count()) / files_per_page));
   mydata.cur_page = min(mydata.cur_page, mydata.num_page-1);
   mydata.flags.is_root  = files.isAtRootDir();
-  mydata.flags.is_empty = true;
 
-  uint16_t fileIndex = mydata.cur_page * FILES_PER_PAGE;
-  for (uint8_t i = 0; i < FILES_PER_PAGE; i++, fileIndex++) {
-    if (!files.seek(fileIndex)) break;
-    drawFileButton(files.filename(), getTagForLine(i), files.isDir(), false);
-    mydata.flags.is_empty = false;
+  #undef MARGIN_T
+  #undef MARGIN_B
+  #define MARGIN_T 0
+  #define MARGIN_B 0
+  uint16_t fileIndex = mydata.cur_page * files_per_page;
+  for (uint8_t i = 0; i < files_per_page; i++, fileIndex++) {
+    if (files.seek(fileIndex)) {
+      drawFileButton(files.filename(), getTagForLine(i), files.isDir(), false);
+    }
+    else {
+      break;
+    }
   }
 }
 
 void FilesScreen::drawHeader() {
+  const bool prev_enabled = mydata.cur_page > 0;
+  const bool next_enabled = mydata.cur_page < (mydata.num_page - 1);
+
+  #undef MARGIN_T
+  #undef MARGIN_B
+  #define MARGIN_T 0
+  #define MARGIN_B 2
+
   char str[16];
-  sprintf_P(str, PSTR("Page %d of %d"), mydata.cur_page + 1, mydata.num_page);
+  sprintf_P(str, PSTR("Page %d of %d"),
+    mydata.cur_page + 1, mydata.num_page);
 
   CommandProcessor cmd;
   cmd.colors(normal_btn)
      .font(font_small)
-     .tag(0).button(HEAD_POS, str, OPT_CENTER | OPT_FLAT);
-}
-
-void FilesScreen::drawArrows() {
-  const bool prev_enabled = mydata.cur_page > 0;
-  const bool next_enabled = mydata.cur_page < (mydata.num_page - 1);
-
-  CommandProcessor cmd;
-  cmd.colors(normal_btn);
-  cmd.tag(242).enabled(prev_enabled).button(PREV_POS, F("")); if (prev_enabled) drawArrow(PREV_POS, PREV_DIR);
-  cmd.tag(243).enabled(next_enabled).button(NEXT_POS, F("")); if (next_enabled) drawArrow(NEXT_POS, NEXT_DIR);
+     .tag(0).button(BTN_POS(2,1), BTN_SIZE(4,header_h), str, OPT_CENTER | OPT_FLAT)
+     .font(font_medium)
+     .colors(action_btn)
+     .tag(241).enabled(prev_enabled).button(BTN_POS(1,1), BTN_SIZE(1,header_h), F("<"))
+     .tag(242).enabled(next_enabled).button(BTN_POS(6,1), BTN_SIZE(1,header_h), F(">"));
 }
 
 void FilesScreen::drawFooter() {
-  const bool has_selection = mydata.selected_tag != 0xFF;
+  #undef MARGIN_T
+  #undef MARGIN_B
+  #if ENABLED(TOUCH_UI_PORTRAIT)
+    #define MARGIN_T 15
+    #define MARGIN_B 5
+  #else
+    #define MARGIN_T 5
+    #define MARGIN_B 5
+  #endif
+  const bool    has_selection = mydata.selected_tag != 0xFF;
+  const uint8_t back_tag      = mydata.flags.is_root ? 240 : 245;
+  const uint8_t y             = GRID_ROWS - footer_h + 1;
+  const uint8_t h             = footer_h;
 
   CommandProcessor cmd;
   cmd.colors(normal_btn)
      .font(font_medium)
-     .colors(has_selection ? normal_btn : action_btn);
-
-  if (mydata.flags.is_root)
-    cmd.tag(240).button(BTN2_POS, GET_TEXT_F(MSG_BUTTON_DONE));
-  else
-    cmd.tag(245).button(BTN2_POS, F("Up Dir"));
-
-  cmd.enabled(has_selection)
+     .colors(has_selection ? normal_btn : action_btn)
+     .tag(back_tag).button(BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_DONE))
+     .enabled(has_selection)
      .colors(has_selection ? action_btn : normal_btn);
 
   if (mydata.flags.is_dir)
-    cmd.tag(244).button(BTN1_POS, GET_TEXT_F(MSG_BUTTON_OPEN));
+    cmd.tag(244).button(BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_OPEN));
   else
-    cmd.tag(241).button(BTN1_POS, GET_TEXT_F(MSG_BUTTON_PRINT));
-}
-
-void FilesScreen::drawFileButton(const char *filename, uint8_t tag, bool is_dir, bool is_highlighted) {
-  #undef  MARGIN_L
-  #undef  MARGIN_R
-  #define MARGIN_L 0
-  #define MARGIN_R 0
-  drawFileButton(LIST_POS, filename, tag, is_dir, is_highlighted);
+    cmd.tag(243).button(BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_PRINT));
 }
 
 void FilesScreen::onRedraw(draw_mode_t what) {
   if (what & FOREGROUND) {
     drawHeader();
-    drawArrows();
     drawSelectedFile();
     drawFooter();
   }
@@ -215,50 +200,48 @@ void FilesScreen::gotoPage(uint8_t page) {
 
 bool FilesScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case 240: // Done button
-      GOTO_PREVIOUS();
-      return true;
-    case 241: // Print highlighted file
-      ConfirmStartPrintDialogBox::show(getSelectedFileIndex());
-      return true;
-    case 242: // Previous page
+    case 240: GOTO_PREVIOUS();                  return true;
+    case 241:
       if (mydata.cur_page > 0) {
         gotoPage(mydata.cur_page-1);
       }
       break;
-    case 243: // Next page
+    case 242:
       if (mydata.cur_page < (mydata.num_page-1)) {
         gotoPage(mydata.cur_page+1);
       }
       break;
-    case 244: // Select directory
+    case 243:
+      ConfirmStartPrintDialogBox::show(getSelectedFileIndex());
+      return true;
+    case 244:
       {
         FileList files;
         files.changeDir(getSelectedShortFilename());
         gotoPage(0);
       }
       break;
-    case 245: // Up directory
+    case 245:
       {
         FileList files;
         files.upDir();
         gotoPage(0);
       }
       break;
-    default: // File selected
+    default:
       if (tag < 240) {
         mydata.selected_tag = tag;
         #if ENABLED(SCROLL_LONG_FILENAMES) && (FTDI_API_LEVEL >= 810)
-          mydata.scroll_pos = 0;
-          mydata.scroll_max = 0;
           if (FTDI::ftdi_chip >= 810) {
-            const char *filename = getSelectedFilename();
-            if (filename[0]) {
+            const char *longFilename = getSelectedLongFilename();
+            if (longFilename[0]) {
               CommandProcessor cmd;
-              constexpr int dim[4] = {LIST_POS};
-              const uint16_t text_width = cmd.font(font_medium).text_width(filename);
-              if (text_width > dim[2])
-                mydata.scroll_max = text_width - dim[2] + MARGIN_L + MARGIN_R + 10;
+              uint16_t text_width = cmd.font(font_medium).text_width(longFilename);
+              mydata.scroll_pos = 0;
+              if (text_width > display_width)
+                mydata.scroll_max = text_width - display_width + MARGIN_L + MARGIN_R;
+              else
+                mydata.scroll_max = 0;
             }
           }
         #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
index cb950d4..be75684 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
@@ -27,9 +27,8 @@
 
 struct FilesScreenData {
   struct {
-    uint8_t is_dir   : 1;
-    uint8_t is_root  : 1;
-    uint8_t is_empty : 1;
+    uint8_t is_dir  : 1;
+    uint8_t is_root : 1;
   } flags;
   uint8_t   selected_tag;
   uint8_t   num_page;
@@ -42,19 +41,28 @@ struct FilesScreenData {
 
 class FilesScreen : public BaseScreen, public CachedScreen<FILES_SCREEN_CACHE, FILE_SCREEN_DL_SIZE> {
   private:
+    #if ENABLED(TOUCH_UI_PORTRAIT)
+      static constexpr uint8_t header_h       = 2;
+      static constexpr uint8_t footer_h       = 2;
+      static constexpr uint8_t files_per_page = 11;
+    #else
+      static constexpr uint8_t header_h       = 1;
+      static constexpr uint8_t footer_h       = 1;
+      static constexpr uint8_t files_per_page = 6;
+    #endif
+
     static uint8_t  getTagForLine(uint8_t line) {return line + 2;}
     static uint8_t  getLineForTag(uint8_t tag)  {return  tag - 2;}
     static uint16_t getFileForTag(uint8_t tag);
     static uint16_t getSelectedFileIndex();
 
-    inline static const char *getSelectedShortFilename() {return getSelectedFilename(true);}
-    static const char *getSelectedFilename(bool shortName = false);
+    inline static const char *getSelectedShortFilename() {return getSelectedFilename(false);}
+    inline static const char *getSelectedLongFilename()  {return getSelectedFilename(true);}
+    static const char *getSelectedFilename(bool longName);
 
-    static void drawFileButton(int x, int y, int w, int h, const char *filename, uint8_t tag, bool is_dir, bool is_highlighted);
     static void drawFileButton(const char *filename, uint8_t tag, bool is_dir, bool is_highlighted);
     static void drawFileList();
     static void drawHeader();
-    static void drawArrows();
     static void drawFooter();
     static void drawSelectedFile();
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 9bc2f56..fe5324a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -123,10 +123,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
       case 5: BedMeshEditScreen::show(); break;
     #endif
     #if ENABLED(G26_MESH_VALIDATION)
-      case 6:
-        GOTO_SCREEN(StatusScreen);
-        injectCommands_P(PSTR("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
-        break;
+      case 6: BedMeshViewScreen::doMeshValidation(); break;
     #endif
     #if ENABLED(BLTOUCH)
       case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
index ed24a9d..1f3640e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
@@ -27,10 +27,8 @@
 
 #define ROUND(val) uint16_t((val)+0.5)
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wno-format"
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wno-format"
 
 /**
  * Formats a temperature string (e.g. "100°C")
@@ -105,8 +103,6 @@ void format_position(char *str, float x, float y, float z) {
   sprintf_P(str, PSTR("%s; %s; %s " S_FMT), num1, num2, num3, GET_TEXT(MSG_UNITS_MM));
 }
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
index 7c0bdd8..04cdbe9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
@@ -53,7 +53,7 @@
 #elif ENABLED(AO_EXP1_DEPRECATED_PINMAP)
 
   /**
-   * This LulzBot pinout re-purposes the UltraLCD
+   * This AlephObjects pinout re-purposes the UltraLCD
    * connector EXP1 for Software SPI (rev B, obsolete)
    */
 
@@ -74,7 +74,7 @@
   /**
    * AO_EXP1_PINMAP with TOUCH_UI_ULTIPANEL
    *
-   * This LulzBot mapping re-purposes the UltraLCD
+   * This AlephObjects mapping re-purposes the UltraLCD
    * connector EXP1 for Software SPI for display (rev C):
    *
    *     EXP2:      FTDI:   SD -or- USB [1]:     ULTRA_LCD:
@@ -106,7 +106,7 @@
   /**
    * AO_EXP2_PINMAP with TOUCH_UI_ULTIPANEL
    *
-   * The LulzBot mapping for re-purposing the UltraLCD
+   * The AlephObjects mapping for re-purposing the UltraLCD
    * connector EXP2 for hardware SPI for display and SD card
    * or USB (rev C):
    *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
index 59394b8..f7cb631 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
@@ -229,31 +229,5 @@ namespace Theme {
     0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00
   };
 
-  constexpr PROGMEM bitmap_info_t Light_Bulb_Info = {
-    .format       = L1,
-    .linestride   = 4,
-    .filter       = BILINEAR,
-    .wrapx        = BORDER,
-    .wrapy        = BORDER,
-    .RAMG_offset  = 8685,
-    .width        = 31,
-    .height       = 32,
-  };
-
-  const unsigned char Light_Bulb[128] PROGMEM = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,
-    0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x80, 0x02, 0x00,
-    0x00, 0x0F, 0xE0, 0x00, 0x00, 0x18, 0x30, 0x00, 0x00, 0x36, 0x18, 0x00,
-    0x00, 0x2C, 0x08, 0x00, 0x00, 0x58, 0x04, 0x00, 0x00, 0x50, 0x04, 0x00,
-    0x7C, 0x50, 0x04, 0x7C, 0x00, 0x40, 0x04, 0x00, 0x00, 0x40, 0x04, 0x00,
-    0x00, 0x60, 0x0C, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x10, 0x10, 0x00,
-    0x00, 0x10, 0x10, 0x00, 0x00, 0x88, 0x22, 0x00, 0x01, 0x08, 0x21, 0x00,
-    0x02, 0x08, 0x20, 0x80, 0x04, 0x0F, 0xE0, 0x40, 0x00, 0x07, 0xC0, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-
   constexpr PROGMEM uint32_t UTF8_FONT_OFFSET  = 10000;
-  constexpr PROGMEM uint32_t BACKGROUND_OFFSET = 40000;
 }; // namespace Theme
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
index 169a306..5d97358 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
@@ -20,6 +20,7 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
+
 #pragma once
 
 constexpr float x_min = 0.000000, x_max = 272.000000,
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
index 1231d31..e023599 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
@@ -21,6 +21,7 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
+
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
index c6065af..e3a30a6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
@@ -21,6 +21,7 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
+
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/malyan/malyan.cpp b/Marlin/src/lcd/extui/malyan/malyan.cpp
index 8c9bfc3..12cdcdf 100644
--- a/Marlin/src/lcd/extui/malyan/malyan.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan.cpp
@@ -122,7 +122,7 @@ void set_lcd_error_P(PGM_P const error, PGM_P const component/*=nullptr*/) {
 void process_lcd_c_command(const char *command) {
   const int target_val = command[1] ? atoi(command + 1) : -1;
   if (target_val < 0) {
-    DEBUG_ECHOLNPGM("UNKNOWN C COMMAND ", command);
+    DEBUG_ECHOLNPAIR("UNKNOWN C COMMAND ", command);
     return;
   }
   switch (command[0]) {
@@ -143,7 +143,7 @@ void process_lcd_c_command(const char *command) {
       case 'P': ExtUI::setTargetTemp_celsius(target_val, ExtUI::heater_t::BED); break;
     #endif
 
-    default: DEBUG_ECHOLNPGM("UNKNOWN C COMMAND ", command);
+    default: DEBUG_ECHOLNPAIR("UNKNOWN C COMMAND ", command);
   }
 }
 
@@ -185,7 +185,7 @@ void process_lcd_eb_command(const char *command) {
       write_to_lcd(message_buffer);
     } break;
 
-    default: DEBUG_ECHOLNPGM("UNKNOWN E/B COMMAND ", command);
+    default: DEBUG_ECHOLNPAIR("UNKNOWN E/B COMMAND ", command);
   }
 }
 
@@ -212,7 +212,7 @@ void process_lcd_j_command(const char *command) {
     case 'Y': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Y); break;
     case 'Z': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Z); break;
     case 'X': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::X); break;
-    default: DEBUG_ECHOLNPGM("UNKNOWN J COMMAND ", command);
+    default: DEBUG_ECHOLNPAIR("UNKNOWN J COMMAND ", command);
   }
 }
 
@@ -336,7 +336,7 @@ void process_lcd_s_command(const char *command) {
       #endif
     } break;
 
-    default: DEBUG_ECHOLNPGM("UNKNOWN S COMMAND ", command);
+    default: DEBUG_ECHOLNPAIR("UNKNOWN S COMMAND ", command);
   }
 }
 
@@ -360,11 +360,11 @@ void process_lcd_command(const char *command) {
       case 'C': process_lcd_c_command(current); break;
       case 'B':
       case 'E': process_lcd_eb_command(current); break;
-      default: DEBUG_ECHOLNPGM("UNKNOWN COMMAND ", command);
+      default: DEBUG_ECHOLNPAIR("UNKNOWN COMMAND ", command);
     }
   }
   else
-    DEBUG_ECHOLNPGM("UNKNOWN COMMAND FORMAT ", command);
+    DEBUG_ECHOLNPAIR("UNKNOWN COMMAND FORMAT ", command);
 }
 
 //
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
index cae534d..5815522 100644
--- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -106,11 +106,8 @@ namespace ExtUI {
 
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
-      //SERIAL_ECHOLNPGM("OnPidTuning:", rst);
+      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
       switch (rst) {
-        case PID_STARTED:
-          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE));
-          break;
         case PID_BAD_EXTRUDER_NUM:
           set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
           break;
diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
index 2fb2841..6f3d6bb 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -43,9 +43,9 @@ uint32_t SPIFlashStorage::m_startAddress;
   static uint32_t rle_compress(T *output, uint32_t outputLength, T *input, uint32_t inputLength, uint32_t& inputProcessed) {
     uint32_t count = 0, out = 0, index, i;
     T pixel;
-    // 32767 for uint16_t
-    // 127 for uint16_t
-    // calculated at compile time
+    //32767 for uint16_t
+    //127 for uint16_t
+    //calculated at compile time
     constexpr T max = (0xFFFFFFFF >> (8 * (4 - sizeof(T)))) / 2;
 
     inputProcessed = 0;
diff --git a/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
index 42abd4b..68e4d9d 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
@@ -69,14 +69,14 @@ void TFT::LCD_init() {
 }
 
 void TFT::LCD_clear(uint16_t color) {
-  setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
-  tftio.WriteMultiple(color, uint32_t(TFT_WIDTH) * uint32_t(TFT_HEIGHT));
+  setWindow(0, 0, (TFT_WIDTH), (TFT_HEIGHT));
+  tftio.WriteMultiple(color, (uint32_t)(TFT_WIDTH) * (TFT_HEIGHT));
 }
 
 void TFT::LCD_Draw_Logo() {
   #if HAS_LOGO_IN_FLASH
     setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
-    for (uint16_t i = 0; i < (TFT_HEIGHT); i++) {
+    for (uint16_t i = 0; i < (TFT_HEIGHT); i ++) {
       Pic_Logo_Read((uint8_t *)"", (uint8_t *)bmp_public_buf, (TFT_WIDTH) * 2);
       tftio.WriteSequence((uint16_t *)bmp_public_buf, TFT_WIDTH);
     }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
index 3424bf7..54a8ede 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
index 5de4a13..22196a2 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
index 28958b6..a564d86 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -57,9 +56,9 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       break;
     #if ENABLED(MKS_WIFI_MODULE)
       case ID_WIFI_PARA:
-        lv_clear_advance_settings();
-        lv_draw_wifi_settings();
-        break;
+      lv_clear_advance_settings();
+      lv_draw_wifi_settings();
+      break;
     #endif
     #if HAS_ROTARY_ENCODER
       case ID_ENCODER_SETTINGS:
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
index 5ac24c4..d52abcf 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_BED_PROBE)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index c7e6a62..3165190 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -55,7 +54,7 @@ enum {
   ID_BABY_STEP_RETURN
 };
 
-static float babystep_dist  = 0.01;
+static float babystep_dist=0.01;
 static uint8_t has_adjust_z = 0;
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
@@ -124,8 +123,9 @@ void lv_draw_baby_stepping() {
   buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABY_STEP_DIST);
   labelV = lv_label_create_empty(buttonV);
   #if HAS_ROTARY_ENCODER
-    if (gCfgItems.encoder_enable)
+    if (gCfgItems.encoder_enable) {
       lv_group_add_obj(g, buttonV);
+    }
   #endif
 
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_RETURN);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
index 5248816..645cd2e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
index 1d0ae77..56b0e8f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
index ff60f12..917b52a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+extern "C" { /* C-declarations for C++ */
 #endif
 
 void lv_draw_cloud_bind();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index a390bd9..638d0c5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -103,13 +103,15 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
         if (card.isFileOpen()) {
           feedrate_percentage = 100;
           planner.flow_percentage[0] = 100;
-          planner.e_factor[0] = planner.flow_percentage[0] * 0.01f;
+          planner.e_factor[0]        = planner.flow_percentage[0] * 0.01f;
           #if HAS_MULTI_EXTRUDER
             planner.flow_percentage[1] = 100;
-            planner.e_factor[1] = planner.flow_percentage[1] * 0.01f;
+            planner.e_factor[1]        = planner.flow_percentage[1] * 0.01f;
           #endif
           card.startOrResumeFilePrinting();
-          TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
+          #if ENABLED(POWER_LOSS_RECOVERY)
+            recovery.prepare();
+          #endif
           once_flag = false;
         }
       }
@@ -227,14 +229,14 @@ void lv_draw_dialog(uint8_t type) {
   lv_obj_t *labelDialog = lv_label_create(scr, "");
 
   if (DIALOG_IS(TYPE_FINISH_PRINT, PAUSE_MESSAGE_RESUME)) {
-    btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
-    lv_obj_t *labelOk = lv_label_create_empty(btnOk);           // Add a label to the button
-    lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
+      btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
+      lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
+      lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
   }
   else if (DIALOG_IS(PAUSE_MESSAGE_WAITING, PAUSE_MESSAGE_INSERT, PAUSE_MESSAGE_HEAT)) {
     btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
-    lv_obj_t *labelOk = lv_label_create_empty(btnOk);           // Add a label to the button
-    lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
+    lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
   }
   else if (DIALOG_IS(PAUSE_MESSAGE_PARKING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
     // nothing to do
@@ -267,7 +269,7 @@ void lv_draw_dialog(uint8_t type) {
     }
   #endif
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT)) {
-    btnCancel = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_cancel_event_cb);
+    btnCancel = lv_button_btn_create(scr, BTN_OK_X+90, BTN_OK_Y, 100, 50, btn_cancel_event_cb);
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
 
@@ -285,7 +287,7 @@ void lv_draw_dialog(uint8_t type) {
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
 
     filament_bar = lv_bar_create(scr, nullptr);
-    lv_obj_set_pos(filament_bar, (TFT_WIDTH - 400) / 2, ((TFT_HEIGHT - titleHeight) - 40) / 2);
+    lv_obj_set_pos(filament_bar, (TFT_WIDTH-400)/2, ((TFT_HEIGHT - titleHeight)-40)/2);
     lv_obj_set_size(filament_bar, 400, 25);
     lv_bar_set_style(filament_bar, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
     lv_bar_set_anim_time(filament_bar, 1000);
@@ -299,11 +301,11 @@ void lv_draw_dialog(uint8_t type) {
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);     // Add a label to the button
 
     if (DIALOG_IS(PAUSE_MESSAGE_OPTION)) {
-      lv_label_set_text(labelOk, pause_msg_menu.purgeMore);       // Set the labels text
+      lv_label_set_text(labelOk, pause_msg_menu.purgeMore);        // Set the labels text
       lv_label_set_text(labelCancel, pause_msg_menu.continuePrint);
     }
     else {
-      lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
+      lv_label_set_text(labelOk, print_file_dialog_menu.confirm);  // Set the labels text
       lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
     }
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
index c518d85..b96c65e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
index 04c6b51..4c56205 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index 6955e18..48ff562 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index b18bd28..2f9009b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -90,18 +89,20 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_extru_amount();
       break;
     case ID_E_STEP:
-      switch (uiCfg.extruStep) {
-        case uiCfg.eStepMin: uiCfg.extruStep = uiCfg.eStepMed; break;
-        case uiCfg.eStepMed: uiCfg.extruStep = uiCfg.eStepMax; break;
-        case uiCfg.eStepMax: uiCfg.extruStep = uiCfg.eStepMin; break;
+      switch (ABS(uiCfg.extruStep)) {
+        case  1: uiCfg.extruStep = 5; break;
+        case  5: uiCfg.extruStep = 10; break;
+        case 10: uiCfg.extruStep = 1; break;
+        default: break;
       }
       disp_ext_step();
       break;
     case ID_E_SPEED:
       switch (uiCfg.extruSpeed) {
-        case uiCfg.eSpeedL: uiCfg.extruSpeed = uiCfg.eSpeedN; break;
-        case uiCfg.eSpeedN: uiCfg.extruSpeed = uiCfg.eSpeedH; break;
-        case uiCfg.eSpeedH: uiCfg.extruSpeed = uiCfg.eSpeedL; break;
+        case  1: uiCfg.extruSpeed = 10; break;
+        case 10: uiCfg.extruSpeed = 20; break;
+        case 20: uiCfg.extruSpeed = 1; break;
+        default: break;
       }
       disp_ext_speed();
       break;
@@ -154,30 +155,41 @@ void lv_draw_extrusion() {
 void disp_ext_type() {
   if (uiCfg.extruderIndex == 1) {
     lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
-    if (gCfgItems.multiple_language) lv_label_set_text(labelType, extrude_menu.ext2);
+    if (gCfgItems.multiple_language) {
+      lv_label_set_text(labelType, extrude_menu.ext2);
+      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
   }
   else {
     lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
-    if (gCfgItems.multiple_language) lv_label_set_text(labelType, extrude_menu.ext1);
+    if (gCfgItems.multiple_language) {
+      lv_label_set_text(labelType, extrude_menu.ext1);
+      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
   }
-  if (gCfgItems.multiple_language)
-    lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
 }
 
 void disp_ext_speed() {
-  switch (uiCfg.extruSpeed) {
-    case uiCfg.eSpeedH: lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_high.bin");   break;
-    case uiCfg.eSpeedL: lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_slow.bin");   break;
-    case uiCfg.eSpeedN: lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_normal.bin"); break;
-  }
+  if (uiCfg.extruSpeed == 20)
+    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_high.bin");
+  else if (uiCfg.extruSpeed == 1)
+    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_slow.bin");
+  else
+    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_normal.bin");
 
   if (gCfgItems.multiple_language) {
-    switch (uiCfg.extruSpeed) {
-      case uiCfg.eSpeedH: lv_label_set_text(labelSpeed, extrude_menu.high);   break;
-      case uiCfg.eSpeedL: lv_label_set_text(labelSpeed, extrude_menu.low);    break;
-      case uiCfg.eSpeedN: lv_label_set_text(labelSpeed, extrude_menu.normal); break;
+    if (uiCfg.extruSpeed == 20) {
+      lv_label_set_text(labelSpeed, extrude_menu.high);
+      lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
+    else if (uiCfg.extruSpeed == 1) {
+      lv_label_set_text(labelSpeed, extrude_menu.low);
+      lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
+    else {
+      lv_label_set_text(labelSpeed, extrude_menu.normal);
+      lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
     }
-    lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
   }
 }
 
@@ -209,28 +221,33 @@ void disp_extru_amount() {
 }
 
 void disp_ext_step() {
-  char buf3[12];
-  sprintf_P(buf3, PSTR("%dmm"), uiCfg.extruStep);
-
-  switch (uiCfg.extruStep) {
-    case uiCfg.eStepMin: lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step1_mm.bin");  break;
-    case uiCfg.eStepMed: lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step5_mm.bin");  break;
-    case uiCfg.eStepMax: lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step10_mm.bin"); break;
-  }
+  if (uiCfg.extruStep == 1)
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step1_mm.bin");
+  else if (uiCfg.extruStep == 5)
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step5_mm.bin");
+  else if (uiCfg.extruStep == 10)
+    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step10_mm.bin");
 
   if (gCfgItems.multiple_language) {
-    switch (uiCfg.extruStep) {
-      case uiCfg.eStepMin: lv_label_set_text(labelStep, buf3); break;
-      case uiCfg.eStepMed: lv_label_set_text(labelStep, buf3); break;
-      case uiCfg.eStepMax: lv_label_set_text(labelStep, buf3); break;
+    if (uiCfg.extruStep == 1) {
+      lv_label_set_text(labelStep, extrude_menu.step_1mm);
+      lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
+    else if (uiCfg.extruStep == 5) {
+      lv_label_set_text(labelStep, extrude_menu.step_5mm);
+      lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
+    else if (uiCfg.extruStep == 10) {
+      lv_label_set_text(labelStep, extrude_menu.step_10mm);
+      lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
     }
-    lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
   }
 }
 
 void lv_clear_extrusion() {
-  if (TERN0(HAS_ROTARY_ENCODER, gCfgItems.encoder_enable))
-    lv_group_remove_all_objs(g);
+  #if HAS_ROTARY_ENCODER
+    if (gCfgItems.encoder_enable) lv_group_remove_all_objs(g);
+  #endif
   lv_obj_del(scr);
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
index b210770..ce804e6 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -44,11 +43,9 @@ enum {
   ID_F_RETURN
 };
 
-uint8_t fanPercent = 0;
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
-  const uint8_t temp = map(thermalManager.fan_speed[0], 0, 255, 0, 100);
-  if (abs(fanPercent - temp) > 2) fanPercent = temp;
+  uint8_t fanPercent = map(thermalManager.fan_speed[0], 0, 255, 0, 100);
   switch (obj->mks_obj_id) {
     case ID_F_ADD: if (fanPercent < 100) fanPercent++; break;
     case ID_F_DEC: if (fanPercent !=  0) fanPercent--; break;
@@ -58,7 +55,6 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_F_RETURN: clear_cur_ui(); draw_return_ui(); return;
   }
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
-  if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();
 }
 
 void lv_draw_fan() {
@@ -66,7 +62,7 @@ void lv_draw_fan() {
 
   scr = lv_screen_create(FAN_UI);
   // Create an Image button
-  buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
+  buttonAdd  = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
   lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
   lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
   lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
@@ -81,7 +77,7 @@ void lv_draw_fan() {
 
 void disp_fan_value() {
   #if HAS_FAN
-    sprintf_P(public_buf_l, PSTR("%s: %3d%%"), fan_menu.state, fanPercent);
+    sprintf_P(public_buf_l, PSTR("%s: %3d%%"), fan_menu.state, (int)map(thermalManager.fan_speed[0], 0, 255, 0, 100));
   #else
     sprintf_P(public_buf_l, PSTR("%s: ---"), fan_menu.state);
   #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index 8432c74..3118948 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -52,8 +51,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_FILAMNT_IN:
       uiCfg.filament_load_heat_flg = true;
       if (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
-        || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)
-      ) {
+          || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)) {
         lv_clear_filament_change();
         lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
       }
@@ -116,8 +114,9 @@ void lv_draw_filament_change() {
 
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
   #if HAS_ROTARY_ENCODER
-    if (gCfgItems.encoder_enable)
+    if (gCfgItems.encoder_enable) {
       lv_group_add_obj(g, buttonType);
+    }
   #endif
 
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
index e3ca75d..97680f3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
index fa9f7b0..bded5df 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -30,7 +29,7 @@
 #include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
-static lv_obj_t *scr, *outL, *outV = 0;
+static lv_obj_t *scr,*outL,*outV = 0;
 static int currentWritePos = 0;
 extern uint8_t public_buf[513];
 extern "C" { extern char public_buf_m[100]; }
@@ -59,7 +58,7 @@ void lv_show_gcode_output(void * that, const char * txt) {
   if (!memcmp(txt, "echo:", 5)) {
     public_buf[0] = 0; // Clear output buffer
     return;
-  }
+   }
 
   // Avoid overflow if the answer is too large
   size_t len = strlen((const char*)public_buf), tlen = strlen(txt);
@@ -69,17 +68,17 @@ void lv_show_gcode_output(void * that, const char * txt) {
   }
 }
 
-void lv_serial_capt_hook(void * userPointer, uint8_t c) {
+void lv_serial_capt_hook(void * userPointer, uint8_t c)
+{
   if (c == '\n' || currentWritePos == sizeof(public_buf_m) - 1) { // End of line, probably end of command anyway
     public_buf_m[currentWritePos] = 0;
     lv_show_gcode_output(userPointer, public_buf_m);
     currentWritePos = 0;
   }
-  else
-    public_buf_m[currentWritePos++] = c;
+  else public_buf_m[currentWritePos++] = c;
 }
-
-void lv_eom_hook(void *) {
+void lv_eom_hook(void *)
+{
   // Message is done, let's remove the hook now
   MYSERIAL1.setHook();
   // We are back from the keyboard, so let's redraw ourselves
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
index 8dba337..447fadd 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
index 212f2b4..e1ab58e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfig.h"
 
 #if HAS_TFT_LVGL_UI && USE_SENSORLESS
@@ -67,10 +66,10 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       break;
     #if Z2_SENSORLESS
       case ID_SENSITIVITY_Z2:
-        value = z2_sensitivity;
-        lv_clear_homing_sensitivity_settings();
-        lv_draw_number_key();
-        break;
+      value = z2_sensitivity;
+      lv_clear_homing_sensitivity_settings();
+      lv_draw_number_key();
+      break;
     #endif
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
index d410b20..8a97e30 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_CLASSIC_JERK)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index e1184c2..671939c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -41,10 +40,10 @@ static const char * kb_map_lc[] = {"1#", "q", "w", "e", "r", "t", "y", "u", "i",
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
 
 static const lv_btnm_ctrl_t kb_ctrl_lc_map[] = {
-  LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
-  LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
+    LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
+    LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
 
 static const char * kb_map_uc[] = {"1#", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", LV_SYMBOL_BACKSPACE, "\n",
                                    "abc", "A", "S", "D", "F", "G", "H", "J", "K", "L", LV_SYMBOL_NEW_LINE, "\n",
@@ -52,33 +51,32 @@ static const char * kb_map_uc[] = {"1#", "Q", "W", "E", "R", "T", "Y", "U", "I",
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
 
 static const lv_btnm_ctrl_t kb_ctrl_uc_map[] = {
-  LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
-  LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
+    LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
+    LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
 
-static const char * kb_map_spec[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", LV_SYMBOL_BACKSPACE, "\n",
+static const char * kb_map_spec[] = {"0", "1", "2", "3", "4" ,"5", "6", "7", "8", "9", ".", LV_SYMBOL_BACKSPACE, "\n",
                                      "abc", "+", "-", "/", "*", "=", "%", "!", "?", "#", "<", ">", "\n",
                                      "\\",  "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n",
                                      LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
 
 static const lv_btnm_ctrl_t kb_ctrl_spec_map[] = {
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
-  LV_KB_CTRL_BTN_FLAGS | 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
+    LV_KB_CTRL_BTN_FLAGS | 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
 
 static const lv_btnm_ctrl_t kb_ctrl_num_map[] = {
-  1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
-  1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
-  1, 1, 1, 2,
-  1, 1, 1, 1, 1
-};
+        1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
+        1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
+        1, 1, 1, 2,
+        1, 1, 1, 1, 1};
 
 static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
   if (event != LV_EVENT_VALUE_CHANGED) return;
 
-  lv_kb_ext_t *ext = (lv_kb_ext_t*)lv_obj_get_ext_attr(kb);
+  lv_kb_ext_t * ext = (lv_kb_ext_t * )lv_obj_get_ext_attr(kb);
   const uint16_t btn_id = lv_btnm_get_active_btn(kb);
   if (btn_id == LV_BTNM_BTN_NONE) return;
   if (lv_btnm_get_btn_ctrl(kb, btn_id, LV_BTNM_CTRL_HIDDEN | LV_BTNM_CTRL_INACTIVE)) return;
@@ -121,12 +119,12 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
       switch (keyboard_value) {
         #if ENABLED(MKS_WIFI_MODULE)
           case wifiName:
-            memcpy(uiCfg.wifi_name, ret_ta_txt, sizeof(uiCfg.wifi_name));
+            memcpy(uiCfg.wifi_name,ret_ta_txt,sizeof(uiCfg.wifi_name));
             lv_clear_keyboard();
             draw_return_ui();
             break;
           case wifiPassWord:
-            memcpy(uiCfg.wifi_key, ret_ta_txt, sizeof(uiCfg.wifi_name));
+            memcpy(uiCfg.wifi_key,ret_ta_txt,sizeof(uiCfg.wifi_name));
             lv_clear_keyboard();
             draw_return_ui();
             break;
@@ -158,8 +156,8 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
         #endif // MKS_WIFI_MODULE
         case autoLevelGcodeCommand:
           uint8_t buf[100];
-          strncpy((char *)buf, ret_ta_txt, sizeof(buf));
-          update_gcode_command(AUTO_LEVELING_COMMAND_ADDR, buf);
+          strncpy((char *)buf,ret_ta_txt,sizeof(buf));
+          update_gcode_command(AUTO_LEVELING_COMMAND_ADDR,buf);
           lv_clear_keyboard();
           draw_return_ui();
           break;
@@ -177,7 +175,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
     }
     else
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide it cursor if needed
-    return;
+  return;
   }
 
   // Add the characters to the text area if set
@@ -224,16 +222,16 @@ void lv_draw_keyboard() {
   static lv_style_t rel_style, pr_style;
 
   lv_style_copy(&rel_style, &lv_style_btn_rel);
-  rel_style.body.radius       = 0;
+  rel_style.body.radius = 0;
   rel_style.body.border.width = 1;
-  rel_style.body.main_color   = lv_color_make(0xA9, 0x62, 0x1D);
-  rel_style.body.grad_color   = lv_color_make(0xA7, 0x59, 0x0E);
+  rel_style.body.main_color = lv_color_make(0xA9, 0x62, 0x1D);
+  rel_style.body.grad_color = lv_color_make(0xA7, 0x59, 0x0E);
 
   lv_style_copy(&pr_style, &lv_style_btn_pr);
-  pr_style.body.radius       = 0;
+  pr_style.body.radius = 0;
   pr_style.body.border.width = 1;
-  pr_style.body.main_color   = lv_color_make(0x72, 0x42, 0x15);
-  pr_style.body.grad_color   = lv_color_make(0x6A, 0x3A, 0x0C);
+  pr_style.body.main_color = lv_color_make(0x72, 0x42, 0x15);
+  pr_style.body.grad_color = lv_color_make(0x6A, 0x3A, 0x0C);
 
   // Create a keyboard and apply the styles
   lv_obj_t *kb = lv_kb_create(scr, nullptr);
@@ -252,9 +250,9 @@ void lv_draw_keyboard() {
   lv_obj_align(ta, nullptr, LV_ALIGN_IN_TOP_MID, 0, 10);
   switch (keyboard_value) {
     case autoLevelGcodeCommand:
-      get_gcode_command(AUTO_LEVELING_COMMAND_ADDR, (uint8_t *)public_buf_m);
-      public_buf_m[sizeof(public_buf_m) - 1] = '\0';
-      lv_ta_set_text(ta, public_buf_m);
+    get_gcode_command(AUTO_LEVELING_COMMAND_ADDR,(uint8_t *)public_buf_m);
+    public_buf_m[sizeof(public_buf_m)-1] = 0;
+    lv_ta_set_text(ta, public_buf_m);
       break;
     case GCodeCommand:
       // Start with uppercase by default
@@ -262,7 +260,7 @@ void lv_draw_keyboard() {
       lv_btnm_set_ctrl_map(kb, kb_ctrl_uc_map);
       // Fallthrough
     default:
-      lv_ta_set_text(ta, "");
+    lv_ta_set_text(ta, "");
   }
 
   // Assign the text area to the keyboard
@@ -273,4 +271,5 @@ void lv_clear_keyboard() {
   lv_obj_del(scr);
 }
 
+
 #endif  // HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_language.cpp b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
index 3ef8c6a..3db2258 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
index 6fc8704..8c8dec8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
index 57c32c7..890db3b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
index b14dc6b..3f43da9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
index 60724aa..b927b99 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
index 1dd6a93..2cccf89 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
index 6c5fa2f..e89e2f3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.h b/Marlin/src/lcd/extui/mks_ui/draw_more.h
index 86ee6f8..74ac7e9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+extern "C" { /* C-declarations for C++ */
 #endif
 
 void lv_draw_more();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
index 7367cec..b86370e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index baa8d48..7a37dc6 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index a3cb7f6..ae770a8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
index 8be74c6..9b87df1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
index e5f6a59..485e010 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
index 8e107d4..771a98c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 1d804c3..54f0917 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -32,17 +31,10 @@
 
 static lv_obj_t *scr;
 extern lv_group_t*  g;
-static lv_obj_t *buttonType, *buttonStep, *buttonAdd, *buttonDec;
+static lv_obj_t *buttonType, *buttonStep;
 static lv_obj_t *labelType;
 static lv_obj_t *labelStep;
 static lv_obj_t *tempText1;
-static lv_obj_t *btn_pla;
-static lv_obj_t *btn_abs;
-static lv_obj_t *label_abs;
-static lv_obj_t *label_pla;
-
-static lv_style_t btn_style_pre;
-static lv_style_t btn_style_rel;
 
 enum {
   ID_P_ADD = 1,
@@ -50,9 +42,7 @@ enum {
   ID_P_TYPE,
   ID_P_STEP,
   ID_P_OFF,
-  ID_P_RETURN,
-  ID_P_ABS,
-  ID_P_PLA
+  ID_P_RETURN
 };
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
@@ -64,11 +54,10 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         thermalManager.temp_hotend[uiCfg.extruderIndex].target += uiCfg.stepHeat;
         if (uiCfg.extruderIndex == 0)
           max_target = HEATER_0_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
-        else {
-          #if HAS_MULTI_HOTEND
+        #if HAS_MULTI_HOTEND
+          else
             max_target = HEATER_1_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
-          #endif
-        }
+        #endif
         if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > max_target)
           thermalManager.setTargetHotend(max_target, uiCfg.extruderIndex);
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
@@ -93,16 +82,16 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
           thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
       }
-      else {
-        #if HAS_HEATED_BED
+      #if HAS_HEATED_BED
+        else {
           if (thermalManager.degTargetBed() > uiCfg.stepHeat)
             thermalManager.temp_bed.target -= uiCfg.stepHeat;
           else
             thermalManager.setTargetBed(0);
 
           thermalManager.start_watching_bed();
-        #endif
-      }
+        }
+      #endif
       disp_desire_temp();
       break;
     case ID_P_TYPE:
@@ -112,24 +101,25 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
             uiCfg.extruderIndex = 1;
           }
           else if (uiCfg.extruderIndex == 1) {
-            if (ENABLED(HAS_HEATED_BED)) {
+            if (TEMP_SENSOR_BED != 0) {
               uiCfg.curTempType = 1;
             }
             else {
-              uiCfg.curTempType = 0;
+              uiCfg.curTempType      = 0;
               uiCfg.extruderIndex = 0;
             }
           }
         }
         else if (uiCfg.extruderIndex == 0) {
-          uiCfg.curTempType = TERN(HAS_HEATED_BED, 1, 0);
+          if (TEMP_SENSOR_BED != 0)
+            uiCfg.curTempType = 1;
+          else
+            uiCfg.curTempType = 0;
         }
       }
       else if (uiCfg.curTempType == 1) {
         uiCfg.extruderIndex = 0;
-        uiCfg.curTempType = 0;
-        disp_add_dec();
-        disp_ext_heart();
+        uiCfg.curTempType      = 0;
       }
       disp_temp_type();
       break;
@@ -147,44 +137,30 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
       }
-      else {
-        #if HAS_HEATED_BED
+      #if HAS_HEATED_BED
+        else {
           thermalManager.temp_bed.target = 0;
           thermalManager.start_watching_bed();
-        #endif
-      }
+        }
+      #endif
       disp_desire_temp();
       break;
     case ID_P_RETURN:
       clear_cur_ui();
       draw_return_ui();
       break;
-    case ID_P_ABS:
-      thermalManager.setTargetHotend(PREHEAT_2_TEMP_HOTEND, 0);
-      break;
-    case ID_P_PLA:
-      thermalManager.setTargetHotend(PREHEAT_1_TEMP_HOTEND, 0);
-      break;
   }
 }
 
-void disp_add_dec() {
-  // Create image buttons
-  buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
-  buttonDec = lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
-}
-
 void lv_draw_preHeat() {
   scr = lv_screen_create(PRE_HEAT_UI);
 
   // Create image buttons
-  disp_add_dec();
+  lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
+  lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
 
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_TYPE);
   buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
-
-  if (uiCfg.curTempType == 0) disp_ext_heart();
-
   #if HAS_ROTARY_ENCODER
     if (gCfgItems.encoder_enable) {
       lv_group_add_obj(g, buttonType);
@@ -207,38 +183,26 @@ void lv_draw_preHeat() {
   disp_desire_temp();
 }
 
-void disp_ext_heart() {
-  btn_abs = lv_btn_create(scr, 160, 40, 80, 40, event_handler, ID_P_ABS);
-  btn_pla = lv_btn_create(scr, 260, 40, 80, 40, event_handler, ID_P_PLA);
-
-  lv_btn_set_style(btn_abs, LV_BTN_STYLE_PR, &btn_style_pre);
-  lv_btn_set_style(btn_abs, LV_BTN_STYLE_REL, &btn_style_rel);
-  lv_btn_set_style(btn_pla, LV_BTN_STYLE_PR, &btn_style_pre);
-  lv_btn_set_style(btn_pla, LV_BTN_STYLE_REL, &btn_style_rel);
-
-  label_abs = lv_label_create(btn_abs, PREHEAT_2_LABEL);
-  label_pla = lv_label_create(btn_pla, PREHEAT_1_LABEL);
-}
-
 void disp_temp_type() {
   if (uiCfg.curTempType == 0) {
     if (uiCfg.extruderIndex == 1) {
-      lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
       if (gCfgItems.multiple_language) {
         lv_label_set_text(labelType, preheat_menu.ext2);
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
       }
     }
     else {
-      lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
       if (gCfgItems.multiple_language) {
         lv_label_set_text(labelType, preheat_menu.ext1);
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
       }
     }
+
   }
   else {
-    lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
+  lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
     if (gCfgItems.multiple_language) {
       lv_label_set_text(labelType, preheat_menu.hotbed);
       lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
index 023f122..2993a95 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
@@ -30,8 +30,6 @@ void lv_clear_preHeat();
 void disp_temp_type();
 void disp_step_heat();
 void disp_desire_temp();
-void disp_ext_heart();
-void disp_add_dec();
 
 #ifdef __cplusplus
   } /* C-declarations for C++ */
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index ebad708..5e1dfae 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index 58bbbfb..e3915ad 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -160,8 +159,8 @@ void lv_draw_printing() {
 
   buttonZpos = lv_imgbtn_create(scr, "F:/bmp_zpos_state.bin", 350, 86, event_handler, ID_BABYSTEP);
 
-  buttonPause  = lv_imgbtn_create(scr, uiCfg.print_state == WORKING ? "F:/bmp_pause.bin" : "F:/bmp_resume.bin", 5, 240, event_handler, ID_PAUSE);
-  buttonStop   = lv_imgbtn_create(scr, "F:/bmp_stop.bin", 165, 240, event_handler, ID_STOP);
+  buttonPause = lv_imgbtn_create(scr, uiCfg.print_state == WORKING ? "F:/bmp_pause.bin" : "F:/bmp_resume.bin", 5, 240, event_handler, ID_PAUSE);
+  buttonStop = lv_imgbtn_create(scr, "F:/bmp_stop.bin", 165, 240, event_handler, ID_STOP);
   buttonOperat = lv_imgbtn_create(scr, "F:/bmp_operate.bin", 325, 240, event_handler, ID_OPTION);
 
   #if HAS_ROTARY_ENCODER
@@ -185,7 +184,7 @@ void lv_draw_printing() {
     labelBed = lv_label_create(scr, 250, 196, nullptr);
   #endif
 
-  labelFan  = lv_label_create(scr, 395, 196, nullptr);
+  labelFan = lv_label_create(scr, 395, 196, nullptr);
   labelTime = lv_label_create(scr, 250, 96, nullptr);
   labelZpos = lv_label_create(scr, 395, 96, nullptr);
 
@@ -210,8 +209,8 @@ void lv_draw_printing() {
   lv_bar_set_style(bar1, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
   lv_bar_set_anim_time(bar1, 1000);
   lv_bar_set_value(bar1, 0, LV_ANIM_ON);
-  bar1ValueText = lv_label_create_empty(bar1);
-  lv_label_set_text(bar1ValueText, "0%");
+  bar1ValueText  = lv_label_create_empty(bar1);
+  lv_label_set_text(bar1ValueText,"0%");
   lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
 
   disp_ext_temp();
@@ -291,7 +290,7 @@ void setProBarRate() {
   if (disp_state == PRINTING_UI) {
     lv_bar_set_value(bar1, rate, LV_ANIM_ON);
     sprintf_P(public_buf_l, "%d%%", rate);
-    lv_label_set_text(bar1ValueText, public_buf_l);
+    lv_label_set_text(bar1ValueText,public_buf_l);
     lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
 
     if (marlin_state == MF_SD_COMPLETE) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index a8d8b29..d324d8d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -43,7 +42,7 @@
 #include "mks_hardware.h"
 #include <stdio.h>
 
-#define ICON_POS_Y          260
+#define ICON_POS_Y          38
 #define TARGET_LABEL_MOD_Y -36
 #define LABEL_MOD_Y         30
 
@@ -183,16 +182,16 @@ void lv_draw_ready_print() {
     lv_label_set_text(det_info, " ");
   }
   else {
-    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 90, event_handler, ID_TOOL);
-    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 90, event_handler, ID_SET);
-    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 90, event_handler, ID_PRINT);
+    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 150, event_handler, ID_TOOL);
+    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 150, event_handler, ID_SET);
+    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 150, event_handler, ID_PRINT);
 
     // Monitoring
     #if HAS_HOTEND
-      buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 20, ICON_POS_Y, event_handler, ID_INFO_EXT);
+      buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 55, ICON_POS_Y, event_handler, ID_INFO_EXT);
     #endif
     #if HAS_MULTI_HOTEND
-      buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 180, ICON_POS_Y, event_handler, ID_INFO_EXT);
+      buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 163, ICON_POS_Y, event_handler, ID_INFO_EXT);
     #endif
     #if HAS_HEATED_BED
       buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", TERN(HAS_MULTI_HOTEND, 271, 210), ICON_POS_Y, event_handler, ID_INFO_BED);
@@ -219,22 +218,22 @@ void lv_temp_refr() {
   #if HAS_HOTEND
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0));
     lv_label_set_text(labelExt1, public_buf_l);
-    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
   #endif
   #if HAS_MULTI_HOTEND
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1));
     lv_label_set_text(labelExt2, public_buf_l);
-    lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+    lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
   #endif
   #if HAS_HEATED_BED
     sprintf(public_buf_l, printing_menu.bed_temp, thermalManager.wholeDegBed(), thermalManager.degTargetBed());
     lv_label_set_text(labelBed, public_buf_l);
-    lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+    lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
   #endif
   #if HAS_FAN
     sprintf_P(public_buf_l, PSTR("%d%%"), (int)thermalManager.fanSpeedPercent(0));
     lv_label_set_text(labelFan, public_buf_l);
-    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
   #endif
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
index 2dd3a9d..a765d0e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
index fc92072..d4ab028 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
index 60a3562..5117bd4 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_TRINAMIC_CONFIG)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
index f25f850..bf1b9c3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_STEALTHCHOP)
@@ -104,16 +103,16 @@ void lv_draw_tmc_step_mode_settings() {
   scr = lv_screen_create(TMC_MODE_UI, machine_menu.TmcStepModeConfTitle);
 
   bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false;
-  TERN_(X_HAS_STEALTHCHOP,  stealth_X  = stepperX.get_stealthChop());
-  TERN_(Y_HAS_STEALTHCHOP,  stealth_Y  = stepperY.get_stealthChop());
-  TERN_(Z_HAS_STEALTHCHOP,  stealth_Z  = stepperZ.get_stealthChop());
+  TERN_(X_HAS_STEALTHCHOP,  stealth_X = stepperX.get_stealthChop());
+  TERN_(Y_HAS_STEALTHCHOP,  stealth_Y = stepperY.get_stealthChop());
+  TERN_(Z_HAS_STEALTHCHOP,  stealth_Z = stepperZ.get_stealthChop());
   TERN_(E0_HAS_STEALTHCHOP, stealth_E0 = stepperE0.get_stealthChop());
   TERN_(E1_HAS_STEALTHCHOP, stealth_E1 = stepperE1.get_stealthChop());
 
   if (!uiCfg.para_ui_page) {
-    buttonXState  = lv_screen_menu_item_onoff(scr, machine_menu.X_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_MODE_X, 0, stealth_X);
-    buttonYState  = lv_screen_menu_item_onoff(scr, machine_menu.Y_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_TMC_MODE_Y, 1, stealth_Y);
-    buttonZState  = lv_screen_menu_item_onoff(scr, machine_menu.Z_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_TMC_MODE_Z, 2, stealth_Z);
+    buttonXState = lv_screen_menu_item_onoff(scr, machine_menu.X_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_MODE_X, 0, stealth_X);
+    buttonYState = lv_screen_menu_item_onoff(scr, machine_menu.Y_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_TMC_MODE_Y, 1, stealth_Y);
+    buttonZState = lv_screen_menu_item_onoff(scr, machine_menu.Z_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_TMC_MODE_Z, 2, stealth_Z);
     buttonE0State = lv_screen_menu_item_onoff(scr, machine_menu.E0_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_TMC_MODE_E0, 2, stealth_E0);
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_MODE_DOWN, true);
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 9a0462f..8b97479 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -60,8 +59,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_T_HOME:     lv_draw_home(); break;
     case ID_T_LEVELING:
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        get_gcode_command(AUTO_LEVELING_COMMAND_ADDR, (uint8_t *)public_buf_m);
-        public_buf_m[sizeof(public_buf_m) - 1] = 0;
+        get_gcode_command(AUTO_LEVELING_COMMAND_ADDR,(uint8_t *)public_buf_m);
+        public_buf_m[sizeof(public_buf_m)-1] = 0;
         queue.inject_P(PSTR(public_buf_m));
       #else
         uiCfg.leveling_first_time = true;
@@ -89,7 +88,7 @@ void lv_draw_tool() {
   lv_big_button_create(scr, "F:/bmp_mov.bin", tool_menu.move, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_T_MOV);
   lv_big_button_create(scr, "F:/bmp_zero.bin", tool_menu.home, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_T_HOME);
   lv_big_button_create(scr, "F:/bmp_leveling.bin", tool_menu.TERN(AUTO_BED_LEVELING_BILINEAR, autoleveling, leveling), INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_LEVELING);
-  lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_FILAMENT);
+  lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_X_PIXEL+INTERVAL_V*2,BTN_Y_PIXEL+INTERVAL_H+titleHeight, event_handler,ID_T_FILAMENT);
   lv_big_button_create(scr, "F:/bmp_more.bin", tool_menu.more, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_MORE);
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index c7e2d5b..e10a07c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, TOUCH_SCREEN_CALIBRATION)
@@ -71,9 +70,9 @@ void lv_update_touch_calibration_screen() {
   if (calibration_stage < CALIBRATION_SUCCESS) {
     // handle current state
     switch (calibration_stage) {
-      case CALIBRATION_TOP_LEFT:     str = GET_TEXT(MSG_TOP_LEFT); break;
-      case CALIBRATION_BOTTOM_LEFT:  str = GET_TEXT(MSG_BOTTOM_LEFT); break;
-      case CALIBRATION_TOP_RIGHT:    str = GET_TEXT(MSG_TOP_RIGHT); break;
+      case CALIBRATION_TOP_LEFT: str = GET_TEXT(MSG_TOP_LEFT); break;
+      case CALIBRATION_BOTTOM_LEFT: str = GET_TEXT(MSG_BOTTOM_LEFT); break;
+      case CALIBRATION_TOP_RIGHT:  str = GET_TEXT(MSG_TOP_RIGHT); break;
       case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT(MSG_BOTTOM_RIGHT); break;
       default: break;
     }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
index d6e5260..c4a2154 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index c44bdfe..7dfbea5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -159,7 +158,7 @@ void gCfgItems_init() {
     gCfgItems.spi_flash_flag = FLASH_INF_VALID_FLAG;
     W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
-    // init gcode command
+    //init gcode command
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[0], AUTO_LEVELING_COMMAND_ADDR, 100);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[1], OTHERS_COMMAND_ADDR_1, 100);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[2], OTHERS_COMMAND_ADDR_2, 100);
@@ -187,10 +186,10 @@ void ui_cfg_init() {
   uiCfg.stepHeat            = 10;
   uiCfg.leveling_first_time = false;
   uiCfg.para_ui_page        = false;
-  uiCfg.extruStep           = uiCfg.eStepMed;
-  uiCfg.extruSpeed          = uiCfg.eSpeedN;
+  uiCfg.extruStep           = 5;
+  uiCfg.extruSpeed          = 10;
   uiCfg.move_dist           = 1;
-  uiCfg.moveSpeed           = 1000;
+  uiCfg.moveSpeed           = 3000;
   uiCfg.stepPrintSpeed      = 10;
   uiCfg.command_send        = false;
   uiCfg.dialogType          = 0;
@@ -208,7 +207,7 @@ void ui_cfg_init() {
     memset(&ipPara, 0, sizeof(ipPara));
     strcpy_P(wifiPara.ap_name, PSTR(WIFI_AP_NAME));
     strcpy_P(wifiPara.keyCode, PSTR(WIFI_KEY_CODE));
-    // client
+    //client
     strcpy_P(ipPara.ip_addr, PSTR(IP_ADDR));
     strcpy_P(ipPara.mask, PSTR(IP_MASK));
     strcpy_P(ipPara.gate, PSTR(IP_GATE));
@@ -216,7 +215,7 @@ void ui_cfg_init() {
 
     ipPara.dhcp_flag = IP_DHCP_FLAG;
 
-    // AP
+    //AP
     strcpy_P(ipPara.dhcpd_ip, PSTR(AP_IP_ADDR));
     strcpy_P(ipPara.dhcpd_mask, PSTR(AP_IP_MASK));
     strcpy_P(ipPara.dhcpd_gate, PSTR(AP_IP_GATE));
@@ -238,33 +237,33 @@ void update_spi_flash() {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  // read back the gcode command before erase spi flash
+  //read back the gcode command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
 }
 
-void update_gcode_command(int addr, uint8_t *s) {
+void update_gcode_command(int addr,uint8_t *s) {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  // read back the gcode command before erase spi flash
+  //read back the gcode command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
   switch (addr) {
-    case AUTO_LEVELING_COMMAND_ADDR: memcpy(&command_buf[0 * 100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_1: memcpy(&command_buf[1 * 100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_2: memcpy(&command_buf[2 * 100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_3: memcpy(&command_buf[3 * 100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_4: memcpy(&command_buf[4 * 100], s, 100); break;
+    case AUTO_LEVELING_COMMAND_ADDR: memcpy(&command_buf[0*100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_1: memcpy(&command_buf[1*100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_2: memcpy(&command_buf[2*100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_3: memcpy(&command_buf[3*100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_4: memcpy(&command_buf[4*100], s, 100); break;
     default: break;
   }
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
 }
 
-void get_gcode_command(int addr, uint8_t *d) {
+void get_gcode_command(int addr,uint8_t *d) {
   W25QXX.init(SPI_QUARTER_SPEED);
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)d, addr, 100);
 }
@@ -348,8 +347,13 @@ void tft_style_init() {
   style_num_key_rel.body.grad_color = LV_COLOR_KEY_BACKGROUND;
   style_num_key_rel.text.color      = LV_COLOR_TEXT;
   style_num_key_rel.text.sel_color  = LV_COLOR_TEXT;
-  style_num_key_pre.text.font       = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
-  style_num_key_rel.text.font       = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
+  #if HAS_SPI_FLASH_FONT
+    style_num_key_pre.text.font = &gb2312_puhui32;
+    style_num_key_rel.text.font = &gb2312_puhui32;
+  #else
+    style_num_key_pre.text.font = LV_FONT_DEFAULT;
+    style_num_key_rel.text.font = LV_FONT_DEFAULT;
+  #endif
 
   style_num_key_pre.line.width        = 0;
   style_num_key_rel.line.width        = 0;
@@ -369,14 +373,14 @@ void tft_style_init() {
   style_num_text.text.line_space   = -5;
 
   lv_style_copy(&style_sel_text, &lv_style_scr);
-  style_sel_text.body.main_color   = LV_COLOR_BACKGROUND;
-  style_sel_text.body.grad_color   = LV_COLOR_BACKGROUND;
-  style_sel_text.text.color        = LV_COLOR_YELLOW;
-  style_sel_text.text.sel_color    = LV_COLOR_YELLOW;
-  style_sel_text.text.font         = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
-  style_sel_text.line.width        = 0;
-  style_sel_text.text.letter_space = 0;
-  style_sel_text.text.line_space   = -5;
+  style_sel_text.body.main_color  = LV_COLOR_BACKGROUND;
+  style_sel_text.body.grad_color  = LV_COLOR_BACKGROUND;
+  style_sel_text.text.color       = LV_COLOR_YELLOW;
+  style_sel_text.text.sel_color   = LV_COLOR_YELLOW;
+  style_sel_text.text.font        = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
+  style_sel_text.line.width       = 0;
+  style_sel_text.text.letter_space  = 0;
+  style_sel_text.text.line_space    = -5;
   lv_style_copy(&style_line, &lv_style_plain);
   style_line.line.color   = LV_COLOR_MAKE(0x49, 0x54, 0xFF);
   style_line.line.width   = 1;
@@ -605,9 +609,9 @@ char *creat_title_text() {
             gPicturePreviewStart += (uintptr_t)p1 - (uintptr_t)((uint32_t *)(&public_buf[0]));
             break;
           }
-          else
+          else {
             gPicturePreviewStart += br;
-
+          }
           if (br < 400) break;
         }
       }
@@ -619,12 +623,15 @@ char *creat_title_text() {
 
       while (1) {
         card.read(public_buf, 400);
-        for (i = 0; i < 400; i += 2, j++)
+        for (i = 0; i < 400;) {
           bmp_public_buf[j] = ascii2dec_test((char*)&public_buf[i]) << 4 | ascii2dec_test((char*)&public_buf[i + 1]);
+          i                += 2;
+          j++;
+        }
         if (j >= 400) break;
       }
       for (i = 0; i < 400; i += 2) {
-        p_index = (uint16_t *)(&bmp_public_buf[i]);
+        p_index  = (uint16_t *)(&bmp_public_buf[i]);
         if (*p_index == 0x0000) *p_index = LV_COLOR_BACKGROUND.full;
       }
       SPI_TFT.tftio.WriteSequence((uint16_t*)bmp_public_buf, 200);
@@ -1353,7 +1360,7 @@ extern volatile uint32_t systick_uptime_millis;
 
 void print_time_count() {
   if ((systick_uptime_millis % 1000) == 0)
-    if (print_time.start == 1) print_time.seconds++;
+  if (print_time.start == 1) print_time.seconds++;
 }
 
 void LV_TASK_HANDLER() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index edb513a..37b19eb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -208,7 +208,7 @@ typedef struct {
   uint32_t  curFilesize;
 } CFG_ITMES;
 
-typedef struct UI_Config_Struct {
+typedef struct {
   uint8_t curTempType:1,
           extruderIndex:3,
           stepHeat:4,
@@ -228,16 +228,8 @@ typedef struct UI_Config_Struct {
   uint8_t wifi_name[32];
   uint8_t wifi_key[64];
   uint8_t cloud_hostUrl[96];
-  // Extruder Steps distances (mm)
   uint8_t extruStep;
-  static constexpr uint8_t eStepMin =  1,
-                           eStepMed =  5,
-                           eStepMax = 10;
-  // Extruder speed (mm/s)
   uint8_t extruSpeed;
-  static constexpr uint8_t eSpeedH =  1,
-                           eSpeedN = 10,
-                           eSpeedL = 20;
   uint8_t print_state;
   uint8_t stepPrintSpeed;
   uint8_t waitEndMoves;
@@ -458,8 +450,8 @@ void tft_style_init();
 extern char *creat_title_text();
 void preview_gcode_prehandle(char *path);
 void update_spi_flash();
-void update_gcode_command(int addr, uint8_t *s);
-void get_gcode_command(int addr, uint8_t *d);
+void update_gcode_command(int addr,uint8_t *s);
+void get_gcode_command(int addr,uint8_t *d);
 void lv_serial_capt_hook(void *, uint8_t);
 void lv_eom_hook(void *);
 #if HAS_GCODE_PREVIEW
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
index c12449f..34b2abd 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -71,7 +70,7 @@ void lv_draw_wifi() {
   if (gCfgItems.wifi_mode_sel == STA_MODEL) {
 
     if (gCfgItems.cloud_enable)
-      buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
+      buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_X_PIXEL+INTERVAL_V*2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
 
     buttonReconnect = lv_imgbtn_create(scr, "F:/bmp_wifi.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_RECONNECT);
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
index 6283b1d..2c3957f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
index 8dbedf8..e2005d5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
@@ -28,7 +28,7 @@
 void lv_draw_wifi_list();
 void lv_clear_wifi_list();
 void disp_wifi_list();
-void cutWifiName(char *name, int len, char *outStr);
+void cutWifiName(char *name, int len,char *outStr);
 void wifi_scan_handle();
 
 #define NUMBER_OF_PAGE 5
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
index e087f74..8509cc3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
index a5207d5..c337d18 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -38,7 +37,7 @@ TIPS_DISP tips_disp;
 tips_menu_def tips_menu;
 
 void lv_draw_wifi_tips() {
-  static lv_obj_t *text_tips, *wifi_name;
+  static lv_obj_t *text_tips,*wifi_name;
 
   scr = lv_screen_create(WIFI_TIPS_UI, "");
 
diff --git a/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
index 672783f..b1f0e0e 100644
--- a/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index 3bd0456..5cd1a4c 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -714,7 +713,7 @@ void disp_assets_update_progress(const char *msg) {
   char buf[30];
   memset(buf, ' ', COUNT(buf));
   strncpy(buf, msg, strlen(msg));
-  buf[COUNT(buf) - 1] = '\0';
+  buf[COUNT(buf)-1] = '\0';
   disp_string(100, 165, buf, 0xFFFF, 0x0000);
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 8333709..0a5f5cd 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -234,7 +233,7 @@ uint32_t lv_get_pic_addr(uint8_t *Pname) {
   currentFlashPage = 0;
 
   #if ENABLED(MARLIN_DEV_MODE)
-    SERIAL_ECHOLNPGM("Getting picture SPI Flash Address: ", (const char*)Pname);
+    SERIAL_ECHOLNPAIR("Getting picture SPI Flash Address: ", (const char*)Pname);
   #endif
 
   W25QXX.init(SPI_QUARTER_SPEED);
@@ -265,12 +264,12 @@ const char *bakPath = "_assets";
 void spiFlashErase_PIC() {
   volatile uint32_t pic_sectorcnt = 0;
   W25QXX.init(SPI_QUARTER_SPEED);
-  // erase 0x001000 -64K
+  //erase 0x001000 -64K
   for (pic_sectorcnt = 0; pic_sectorcnt < (64 - 4) / 4; pic_sectorcnt++) {
     watchdog_refresh();
     W25QXX.SPI_FLASH_SectorErase(PICINFOADDR + pic_sectorcnt * 4 * 1024);
   }
-  // erase 64K -- 6M
+  //erase 64K -- 6M
   for (pic_sectorcnt = 0; pic_sectorcnt < (PIC_SIZE_xM * 1024 / 64 - 1); pic_sectorcnt++) {
     watchdog_refresh();
     W25QXX.SPI_FLASH_BlockErase((pic_sectorcnt + 1) * 64 * 1024);
@@ -281,7 +280,7 @@ void spiFlashErase_PIC() {
   void spiFlashErase_FONT() {
     volatile uint32_t Font_sectorcnt = 0;
     W25QXX.init(SPI_QUARTER_SPEED);
-    for (Font_sectorcnt = 0; Font_sectorcnt < 32 - 1; Font_sectorcnt++) {
+    for (Font_sectorcnt = 0; Font_sectorcnt < 32-1; Font_sectorcnt++) {
       watchdog_refresh();
       W25QXX.SPI_FLASH_BlockErase(FONTINFOADDR + Font_sectorcnt * 64 * 1024);
     }
@@ -409,7 +408,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     createFilename(dosFilename, entry);
     if (!file.open(&dir, dosFilename, O_READ)) {
       #if ENABLED(MARLIN_DEV_MODE)
-        SERIAL_ECHOLNPGM("Error opening Asset: ", fn);
+        SERIAL_ECHOLNPAIR("Error opening Asset: ", fn);
       #endif
       return;
     }
@@ -464,7 +463,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
         } while (pbr >= BMP_WRITE_BUF_LEN);
       #endif
       #if ENABLED(MARLIN_DEV_MODE)
-        SERIAL_ECHOLNPGM("Space used: ", fn, " - ", (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize / 1024, "KB");
+        SERIAL_ECHOLNPAIR("Space used: ", fn, " - ", (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize / 1024, "KB");
         totalCompressed += (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize;
       #endif
       SPIFlash.endWrite();
@@ -482,7 +481,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     file.close();
 
     #if ENABLED(MARLIN_DEV_MODE)
-      SERIAL_ECHOLNPGM("Asset added: ", fn);
+      SERIAL_ECHOLNPAIR("Asset added: ", fn);
     #endif
   }
 
@@ -538,8 +537,8 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     #if ENABLED(MARLIN_DEV_MODE)
       uint8_t pic_counter = 0;
       W25QXX.SPI_FLASH_BufferRead(&pic_counter, PIC_COUNTER_ADDR, 1);
-      SERIAL_ECHOLNPGM("Total assets loaded: ", pic_counter);
-      SERIAL_ECHOLNPGM("Total Uncompressed: ", totalSizes, ", Compressed: ", totalCompressed);
+      SERIAL_ECHOLNPAIR("Total assets loaded: ", pic_counter);
+      SERIAL_ECHOLNPAIR("Total Uncompressed: ", totalSizes, ", Compressed: ", totalCompressed);
     #endif
   }
 
@@ -565,7 +564,7 @@ void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff) {
       W25QXX.SPI_FLASH_BufferRead(&PIC.name[j], PIC_NAME_ADDR + tmp_cnt, 1);
       tmp_cnt++;
     } while (PIC.name[j++] != '\0');
-    // pic size
+    //pic size
     W25QXX.SPI_FLASH_BufferRead(PIC.size.bytes, PIC_SIZE_ADDR + i * 4, 4);
 
     if ((strcmp((char*)Pname, (char*)PIC.name)) == 0) {
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.h b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
index 95405af..90e2407 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.h
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
@@ -55,19 +55,19 @@
 #define PIC_MAX_CN           100    // Maximum number of pictures
 #define PIC_NAME_MAX_LEN      50    // Picture name maximum length
 
-#define LOGO_MAX_SIZE_TFT35             (300 * 1024)
-#define LOGO_MAX_SIZE_TFT32             (150 * 1024)
-#define TITLELOGO_MAX_SIZE              (150 * 1024) // Little logo maximum
-#define DEFAULT_VIEW_MAX_SIZE           (200 * 200 * 2)
-#define FLASH_VIEW_MAX_SIZE             (200 * 200 * 2)
+#define LOGO_MAX_SIZE_TFT35             (300*1024)
+#define LOGO_MAX_SIZE_TFT32             (150*1024)
+#define TITLELOGO_MAX_SIZE              (150*1024) // Little logo maximum
+#define DEFAULT_VIEW_MAX_SIZE           (200*200*2)
+#define FLASH_VIEW_MAX_SIZE             (200*200*2)
 
-#define PER_PIC_MAX_SPACE_TFT35         (9 * 1024)
-#define PER_PIC_MAX_SPACE_TFT32         (16 * 1024)
-#define PER_FONT_MAX_SPACE              (16 * 1024)
+#define PER_PIC_MAX_SPACE_TFT35         (9*1024)
+#define PER_PIC_MAX_SPACE_TFT32         (16*1024)
+#define PER_FONT_MAX_SPACE              (16*1024)
 
 #if SPI_FLASH_SIZE == 0x200000
-  // pic
-  // Robin_pro pic addr
+  //pic
+  //Robin_pro pic addr
   #define PIC_NAME_ADDR                 0x001000      // Pic information addr
   #define PIC_SIZE_ADDR                 0x001800      // Pic size information addr
   #define PIC_COUNTER_ADDR              0x002000      // Pic total number
@@ -77,8 +77,8 @@
 
   // TFT35
   #define DEFAULT_VIEW_ADDR_TFT35       0x1EA070
-  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35 + 90 * 1024)
-  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35 + 80 * 1024)
+  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35+90*1024)
+  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35+80*1024)
   #define PIC_DATA_ADDR_TFT35           0x003000 // (PIC_ICON_LOGO_ADDR_TFT35+350*1024) //0xC5800
 
   #define PIC_DATA_ADDR_TFT32           0x00F000
@@ -87,11 +87,11 @@
 
   // font
   #define FONTINFOADDR                  0x150000 // 6M -- font addr
-  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR + 4096) // 4*1024
+  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR+4096) // 4*1024
 
 #else
-  // pic
-  // Robin_pro pic addr
+  //pic
+  //Robin_pro pic addr
   #define PIC_NAME_ADDR                 0x003000      // Pic information addr
   #define PIC_SIZE_ADDR                 0x007000      // Pic size information addr
   #define PIC_COUNTER_ADDR              0x008000      // Pic total number
@@ -99,9 +99,9 @@
 
   // TFT35
   #define DEFAULT_VIEW_ADDR_TFT35       0xC5800
-  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35 + 90 * 1024)
-  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35 + 80 * 1024)
-  #define PIC_DATA_ADDR_TFT35           (PIC_ICON_LOGO_ADDR_TFT35 + 350 * 1024) // 0xC5800
+  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35+90*1024)
+  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35+80*1024)
+  #define PIC_DATA_ADDR_TFT35           (PIC_ICON_LOGO_ADDR_TFT35+350*1024) //0xC5800
 
   // TFT32
   #define PIC_DATA_ADDR_TFT32           0x02F000
@@ -110,20 +110,20 @@
 
   // font
   #define FONTINFOADDR                  0x600000 // 6M -- font addr
-  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR + 4096) // 4*1024
-  #define GBK_FLASH_ADDR               (UNIGBK_FLASH_ADDR + 180224) // 176*1024
+  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR+4096) // 4*1024
+  #define GBK_FLASH_ADDR               (UNIGBK_FLASH_ADDR+180224) // 176*1024
 
 #endif
 
 // Flash flag
-#define REFLSHE_FLGA_ADD                (0x800000 - 32)
+#define REFLSHE_FLGA_ADD                (0x800000-32)
 
 // SD card information first addr
 #define VAR_INF_ADDR                    0x000000
 #define FLASH_INF_VALID_FLAG            0x20201118
 
-// Store some gcode commands, such as auto leveling commands
-#define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3 * 1024
+//Store some gcode commands, such as auto leveling commands
+#define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3*1024
 #define AUTO_LEVELING_COMMAND_ADDR      GCODE_COMMAND_ADDR
 #define OTHERS_COMMAND_ADDR_1           AUTO_LEVELING_COMMAND_ADDR + 100
 #define OTHERS_COMMAND_ADDR_2           OTHERS_COMMAND_ADDR_1 + 100
@@ -155,7 +155,7 @@ typedef struct pic_msg PIC_MSG;
 #define FONT_SIZE_xM  2
 
 void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff);
-void Pic_Logo_Read(uint8_t *LogoName, uint8_t *Logo_Rbuff, uint32_t LogoReadsize);
+void Pic_Logo_Read(uint8_t *LogoName,uint8_t *Logo_Rbuff,uint32_t LogoReadsize);
 void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size);
 uint32_t lv_get_pic_addr(uint8_t *Pname);
 void get_spi_flash_data(const char *rec_buf, int offset, int size);
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 04d8f16..1bb17bb 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -55,7 +54,7 @@ void printer_state_polling() {
 
         gcode.process_subcommands_now_P(PSTR("M25"));
 
-        // save the position
+        //save the position
         uiCfg.current_x_position_bak = current_position.x;
         uiCfg.current_y_position_bak = current_position.y;
         uiCfg.current_z_position_bak = current_position.z;
@@ -164,7 +163,7 @@ void filament_check() {
   #endif
   #if PIN_EXISTS(MT_DET_1)
     static int fil_det_count_1 = 0;
-    if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
+    if (READ(MT_DET_1_PIN) == MT_DET_PIN_INVERTING)
       fil_det_count_1++;
     else if (fil_det_count_1 > 0)
       fil_det_count_1--;
@@ -172,7 +171,7 @@ void filament_check() {
 
   #if PIN_EXISTS(MT_DET_2)
     static int fil_det_count_2 = 0;
-    if (READ(MT_DET_2_PIN) == MT_DET_PIN_STATE)
+    if (READ(MT_DET_2_PIN) == MT_DET_PIN_INVERTING)
       fil_det_count_2++;
     else if (fil_det_count_2 > 0)
       fil_det_count_2--;
@@ -180,7 +179,7 @@ void filament_check() {
 
   #if PIN_EXISTS(MT_DET_3)
     static int fil_det_count_3 = 0;
-    if (READ(MT_DET_3_PIN) == MT_DET_PIN_STATE)
+    if (READ(MT_DET_3_PIN) == MT_DET_PIN_INVERTING)
       fil_det_count_3++;
     else if (fil_det_count_3 > 0)
       fil_det_count_3--;
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
index a41864e..e1a2a25 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
@@ -503,7 +503,7 @@
 #define TEXT_WIFI_FORGET_EN         "Forget Network"
 #define TEXT_DISCONECTED_EN         "Wi-Fi Connected"
 
-// wifi-list
+//wifi-list
 #define MAIN_BUILT_EN       "Build"
 #define MAIN_FILAMENT_EN    "Filament"
 #define MAIN_SETUP_EN       "Setup"
@@ -512,7 +512,7 @@
 #define FILE_MENU_BUILD_EN  "Build"
 #define FILE_MENU_MENU_EN   " < Menu"
 
-// about
+//about
 #define ABOUT_TITLE_EN                    "About"
 #define ABOUT_BUILT_MACHINES_EN           "Built Machines"
 #define ABOUT_SPARK_EN                    "Spark"
@@ -520,52 +520,52 @@
 #define ABOUT_SERIAL_NUMBER_EN            "Serial Number:"
 #define ABOUT_S_NUMBER_EN                 "DCPLX02KFC6P"
 
-// set
+//set
 #define SETUP_TITLE_EN                    "Setup"
 #define SETUP_WIFI_EN                     "Wi-Fi"
 #define SETUP_MANUAL_IP_EN                "Manual IP"
 #define SETUP_WIFI_NOT_CONNECTED_EN       "Not Connected"
 #define SETUP_WIFI_NETWORK_EN             "WiFi_Network"
 
-// build
+//build
 #define BUILD_TITLE_EN                    "Build"
 #define BUILD_SD_CARD_EN                  "SD Card"
 #define BUILD_USB_DRIVE_EN                "USB Drive"
 
-// SD card
+//SD card
 #define SD_CARD_TITLE_EN                  "SD Card"
 #define SD_CARD_BACK_EN                   "< Back"
-// USB Drive
+//USB Drive
 #define USB_DRIVE_TITLE_EN                "USB Drive"
 #define USB_DRIVE_BACK_EN                 "< Back"
 #define FILE_PAGES_EN                     "%d/%d"
 #define FILE_NEXT_PAGE_EN                 "Next Page"
 #define MEDIA_SELECT_TITLE_EN             "Select Media"
 
-// BUILD PLATE
+//BUILD PLATE
 #define PLATE_TITLE_EN                    "Build Plate"
 #define PLATE_BACK_EN                     "< Back"
 #define PLATE_CONFIRM_EN                  "Confirm >"
 #define PLATE_TIPS_EN                     "Confirm that there is a Clear\nBuild Plate installed in the\nmachine."
 
-// build model
+//build model
 #define MODEL_TITLE_EN                    "Build Model"
 #define MODEL_START_BUILD_EN              "Start Build"
 #define MODEL_BACK_EN                     "< Back"
 
-// building
+//building
 #define BUILDING_TITLE_EN                 "Building"
 #define BUILDING_MENU_EN                  "Build Menu"
 #define BUILDING_COMPLETED                "Build\nComplete"
 
-// building menu
+//building menu
 #define BUILDING_MENU_TITLE_EN            "Build Menu"
 #define BUILDING_MENU_SETTINGS_EN         "Build Settings"
 #define BUILDING_MENU_PAUSE_EN            "Pause Build"
 #define BUILDING_MENU_CANCEL_EN           "Cancel Build"
 #define BUILDING_MENU_BACK_EN             "< Back"
 
-// build settings
+//build settings
 #define SETTINGS_TITLE_EN                 "Build Settings"
 #define SETTINGS_NOZZLE_TEMPER_EN         "Nozzle Temp:"
 #define SETTINGS_NOZZLE_VALUE_EN          "%d"
@@ -575,13 +575,13 @@
 #define SETTINGS_SPEED_VALUE_EN           "Standard"
 #define SETTINGS_BACK_EN                  "< Back"
 
-// build paused
+//build paused
 #define PAUSED_TITLE_EN                   "Build Paused"
 #define PAUSED_RESUME_EN                  "Resume Build"
 #define PAUSED_CANCEL_EN                  "Cancel Build"
 #define PAUSED_BACK_EN                    "< Back"
 
-// build cancel
+//build cancel
 #define CANCEL_TITLE_EN                   "Cancel Build"
 #define CANCEL_BUILD_EN                   "Cancel Build"
 #define CANCEL_TIPS_EN                    "Are you sure you want to\ncancel this build? The model\nwill be deleted from this\nmachine. It will need to be\nresent from your computer\nbefore it can be built in the\nfuture."
@@ -589,31 +589,31 @@
 #define CANCEL_BUILD_DISPLAY_EN           "Build\nCanceled"
 #define CANCEL_OVER_PLATE_TIPS_EN         "Confirm that the Build Plate\nhas been removed from the\nmachine."
 
-// filament model enter
+//filament model enter
 #define FILAMENT_MODEL_ENTER_TITLE_EN     "Model-PLA"
 #define FILAMENT_MODEL_ENTER_BACK_EN      "< Back"
 #define FILAMENT_MODEL_ENTER_BEGIN_EN     "Begin >"
 #define FILAMENT_MODEL_ENTER_TIPS_EN      "The Model Filament spool\ncompartment is located on\nthe right side of the machine."
 
-// filament model PLA
+//filament model PLA
 #define FILAMENT_MODEL_PLA_TITLE_EN       "Model-PLA"
 #define FILAMENT_PLA_LOAD_TITLE_EN        "Load Filament"
 #define FILAMENT_PLA_UNLOAD_TITLE_EN      "Unload Filament"
 #define FILAMENT_MODEL_PLA_LOAD_EN        "Load Filament"
 #define FILAMENT_MODEL_PLA_UNLOAD_EN      "Unload Filament"
-// filament support enter
+//filament support enter
 #define FILAMENT_SUPPORT_ENTER_TITLE_EN   "Support-PVA"
 #define FILAMENT_SUPPORT_ENTER_BACK_EN    "< Back"
 #define FILAMENT_SUPPORT_ENTER_BEGIN_EN   "Begin >"
 #define FILAMENT_SUPPORT_ENTER_TIPS_EN    "The Support Filament spool\ncompartment is located on\nthe left side of the machine."
-// filament heating
+//filament heating
 #define FILAMENT_HEATING_LOAD_TITLE_EN    "Load Filament"
 #define FILAMENT_HEATING_UNLOAD_TITLE_EN  "Unload Filament"
 #define FILAMENT_HEATING_CANCEL_EN        "< Cancel"
 #define FILAMENT_HEATING_MATERIAL_EN      "Material:"
 #define FILAMENT_HEATING_PLA_EN           "Model-PLA"
 #define FILAMENT_HEATING_TIPS_EN          "Print head is heating..."
-// rotate left
+//rotate left
 #define ROTATE_LEFT_LOAD_TITLE_EN         "Load Filament"
 #define ROTATE_LEFT_UNLOAD_TITLE_EN       "Unload Filament"
 #define ROTATE_LEFT_CANCEL_EN             "< Cancel"
@@ -622,7 +622,7 @@
 #define ROTATE_LEFT_NEXT_EN               "Next >"
 #define ROTATE_LEFT_TIPS_EN               "Rotate extruder selection\ndial to the left."
 
-// hang spool
+//hang spool
 #define HANG_SPOOL_TITLE_EN         "Load Filament"
 #define HANG_SPOOL_PREVIOUS_EN      "< Previous"
 #define HANG_SPOOL_MATERIAL_EN      "Material:"
@@ -630,7 +630,7 @@
 #define HANG_SPOOL_NEXT_EN          "Next >"
 #define HANG_SPOOL_TIPS_EN          "Hang the spool in the spool\ncompartment as shown."
 
-// feed filament
+//feed filament
 #define FEED_FILAMENT_TITLE_EN      "Load Filament"
 #define FEED_FILAMENT_PREVIOUS_EN   "< Previous"
 #define FEED_FILAMENT_MATERIAL_EN   "Material:"
@@ -638,7 +638,7 @@
 #define FEED_FILAMENT_NEXT_EN       "Next >"
 #define FEED_FILAMENT_TIPS_EN       "Feed filament into extruder\nup beyond the gears."
 
-// feed filament
+//feed filament
 #define ROTATE_UP_TITLE_EN          "Load Filament"
 #define ROTATE_UP_PREVIOUS_EN        "< Previous"
 #define ROTATE_UP_MATERIAL_EN       "Material:"
@@ -646,20 +646,20 @@
 #define ROTATE_UP_NEXT_EN           "Next >"
 #define ROTATE_UP_TIPS_EN           "Rotate extruder selection\ndial up."
 
-// filament begin
+//filament begin
 #define FEED_BEGIN_TITLE_EN         "Load Filament"
 #define FEED_BEGIN_MATERIAL_EN      "Material:"
 #define FEED_BEGIN_PLA_EN           "Model-PLA"
 #define FEED_BEGIN_NEXT_EN          "Next >"
 #define FEED_BEGIN_TIPS_EN          "Press Next when filament\nbegins to extrude."
 
-// filament finish
+//filament finish
 #define FEED_FINISH_TITLE_EN        "Load Filament"
 #define FEED_FINISH_MATERIAL_EN     "Material:"
 #define FEED_FINISH_PLA_EN          "Model-PLA"
 #define FEED_FINISH_NEXT_EN         "Finish >"
 #define FEED_FINISH_TIPS_EN         "Remove filament from the\nnozzle and discard."
-// fiament remove
+//fiament remove
 #define REMOVE_SPOOL_TITLE_EN       "Unload Filament"
 #define REMOVE_SPOOL_PREVIOUS_EN     "< Previous"
 #define REMOVE_SPOOL_FINISH_EN      "Finish >"
@@ -671,7 +671,7 @@
 #define LOAD_FINISH_EN              "Load\nFilament\nComplete"
 #define UNLOAD_FINISH_EN            "Unload\nFilament\nComplete"
 
-// manual ip
+//manual ip
 #define MANUAL_IP_TITLE_EN          "Manual IP"
 #define MANUAL_IP_CANCEL_EN         "< Cancel"
 #define MANUAL_IP_APPLY_EN          "Join >"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
index 12c600f..f6b3231 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
@@ -194,6 +194,7 @@
 #define TITLE_HOME_RU                       "Home"
 #define TITLE_EXTRUDE_RU                    "экструзия"
 #define TITLE_LEVELING_RU                   "уровень"
+#define TITLE_MLEVELING_RU                  "углы"
 #define TITLE_SET_RU                        "настройки"
 #define TITLE_MORE_RU                       "больше"
 #define TITLE_CHOOSEFILE_RU                 "файла"
@@ -215,7 +216,7 @@
 #define AUTO_SHUTDOWN_RU                    "авто-откл"
 #define MANUAL_SHUTDOWN_RU                  "ручн-откл"
 
-#define DIALOG_CONFIRM_RU                   "да" // "подтвердить"
+#define DIALOG_CONFIRM_RU                   "да"//"подтвердить"
 #define DIALOG_CANCLE_RU                    "отмена"
 #define DIALOG_OK_RU                        "да"
 #define DIALOG_RESET_RU                     "сброс"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
index 6bba3a3..a75bc69 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
@@ -29,6 +29,7 @@
 #define PRINT_TEXT_SP           "Imprimir"
 #define EXTRUDE_TEXT_SP         "Extrusor"
 #define LEVELING_TEXT_SP        "Leveling"
+#define MLEVELING_TEXT_SP       "Leveling"
 #define AUTO_LEVELING_TEXT_SP   "Autolevel"
 #define SET_TEXT_SP             "Config"
 #define MORE_TEXT_SP            "Más"
@@ -52,6 +53,7 @@
 #define TOOL_MOVE_SP            "Mover"
 #define TOOL_HOME_SP            "Origen"
 #define TOOL_LEVELING_SP        "Leveling"
+#define TOOL_MLEVELING_SP       "Leveling"
 #define TOOL_AUTO_LEVELING_SP   "Autolevel"
 #define TOOL_FILAMENT_SP        "Filamento"
 #define TOOL_MORE_SP            "Más"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 9a742e1..cfd6db1 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
@@ -193,7 +192,9 @@ void tft_lvgl_init() {
 
   systick_attach_callback(SysTick_Callback);
 
-  TERN_(HAS_SPI_FLASH_FONT, init_gb2312_font());
+  #if HAS_SPI_FLASH_FONT
+    init_gb2312_font();
+  #endif
 
   tft_style_init();
   filament_pin_setup();
@@ -241,7 +242,8 @@ void my_disp_flush(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * co
 
   SPI_TFT.setWindow((uint16_t)area->x1, (uint16_t)area->y1, width, height);
 
-  SPI_TFT.tftio.WriteSequence((uint16_t*)color_p, width * height);
+  for (uint16_t i = 0; i < height; i++)
+    SPI_TFT.tftio.WriteSequence((uint16_t*)(color_p + width * i), width);
 
   lv_disp_flush_ready(disp); // Indicate you are ready with the flushing
 
@@ -332,7 +334,7 @@ bool my_mousewheel_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data) {
 
 extern uint8_t currentFlashPage;
 
-// spi_flash
+//spi_flash
 uint32_t pic_read_base_addr = 0, pic_read_addr_offset = 0;
 lv_fs_res_t spi_flash_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
   static char last_path_name[30];
@@ -381,7 +383,7 @@ lv_fs_res_t spi_flash_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p
   return LV_FS_RES_OK;
 }
 
-// sd
+//sd
 char *cur_namefff;
 uint32_t sd_read_base_addr = 0, sd_read_addr_offset = 0, small_image_size = 409;
 lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
index c69ccf6..0771a31 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
index 0d0285f..79faad7 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
@@ -48,7 +48,7 @@ void disp_language_init();
 #define MULTI_LANGUAGE_ENABLE   1
 #define MULTI_LANGUAGE_DISABLE  0
 
-typedef struct machine_common_disp {
+typedef struct machine_common_disp{
   const char *default_value;
 
   const char *next;
@@ -742,7 +742,7 @@ typedef struct pause_msg_disp {
 
 extern pause_msg_def pause_msg_menu;
 
-typedef struct eeprom_disp {
+typedef struct eeprom_disp{
   const char *title;
   const char *store;
   const char *read;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
index cf32bad..87de27c 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
@@ -37,7 +37,7 @@ class WifiSerial {
 
     // Set up / tear down
     void begin(uint32_t baud);
-    void begin(uint32_t baud, uint8_t config);
+    void begin(uint32_t baud,uint8_t config);
     void end();
     int available(void);
     int read(void);
@@ -51,13 +51,13 @@ class WifiSerial {
     bool isHalfDuplex(void) const;
     void enableHalfDuplexRx(void);
 
-  private:
-    void setRx(uint32_t _rx);
-    void setTx(uint32_t _tx);
-    void setRx(PinName _rx);
-    void setTx(PinName _tx);
-    void init(PinName _rx, PinName _tx);
-    bool _rx_enabled;
-    uint8_t _config;
-    unsigned long _baud;
+    private:
+      void setRx(uint32_t _rx);
+      void setTx(uint32_t _tx);
+      void setRx(PinName _rx);
+      void setTx(PinName _tx);
+      void init(PinName _rx, PinName _tx);
+      bool _rx_enabled;
+      uint8_t _config;
+      unsigned long _baud;
 };
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
index 654fca6..75830ce 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
@@ -68,8 +68,7 @@ WifiSerial::WifiSerial(usart_dev *usart_device, uint8 tx_pin, uint8 rx_pin) {
   #define disable_timer_if_necessary(dev, ch) NOOP
 
   static void usart_enable_no_irq(usart_dev *usart_device, bool with_irq) {
-    if (with_irq)
-      usart_enable(usart_device);
+    if (with_irq) usart_enable(usart_device);
     else {
       usart_reg_map *regs = usart_device->regs;
       regs->CR1 |= (USART_CR1_TE | USART_CR1_RE);   // Preserve word length, etc. Use 'or' to preserve USART_CR1_M_8N1
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
index d0fee4e..6af2f97 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
@@ -39,18 +39,18 @@ class WifiSerial {
 
     /* Set up/tear down */
     void begin(uint32 baud);
-    void begin(uint32 baud, uint8_t config);
+    void begin(uint32 baud,uint8_t config);
     void end();
     int available();
     int read();
     int write(uint8_t);
     inline void wifi_usart_irq(usart_reg_map *regs) {
       /* Handling RXNEIE and TXEIE interrupts.
-       * RXNE signifies availability of a byte in DR.
-       *
-       * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
-       * We enable RXNEIE.
-       */
+      * RXNE signifies availability of a byte in DR.
+      *
+      * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
+      * We enable RXNEIE.
+      */
       if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) {
         #ifdef USART_SAFE_INSERT
           /* If the buffer is full and the user defines USART_SAFE_INSERT,
@@ -63,15 +63,15 @@ class WifiSerial {
       }
       /* TXE signifies readiness to send a byte to DR. */
       if ((regs->CR1 & USART_CR1_TXEIE) && (regs->SR & USART_SR_TXE)) {
-        if (!rb_is_empty(this->usart_device->wb))
-          regs->DR = rb_remove(this->usart_device->wb);
-        else
-          regs->CR1 &= ~((uint32)USART_CR1_TXEIE);         // disable TXEIE
+          if (!rb_is_empty(this->usart_device->wb))
+              regs->DR=rb_remove(this->usart_device->wb);
+          else
+              regs->CR1 &= ~((uint32)USART_CR1_TXEIE); // disable TXEIE
       }
     }
     int wifi_rb_is_full();
     struct usart_dev *usart_device;
-  private:
+    private:
     uint8 tx_pin;
     uint8 rx_pin;
 };
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 0e937b2..b53586c 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
@@ -55,13 +54,13 @@
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
 
-extern uint8_t Explore_Disk(char *path, uint8_t recu_level);
+extern uint8_t Explore_Disk (char *path , uint8_t recu_level);
 
 extern uint8_t commands_in_queue;
 extern uint8_t sel_id;
-extern unsigned int getTickDiff(unsigned int curTick, unsigned int lastTick);
+extern unsigned int  getTickDiff(unsigned int curTick, unsigned int  lastTick);
 
-volatile SZ_USART_FIFO WifiRxFifo;
+volatile SZ_USART_FIFO  WifiRxFifo;
 
 #define WAIT_ESP_TRANS_TIMEOUT_TICK 10500
 
@@ -487,7 +486,7 @@ static bool longName2DosName(const char *longName, char *dosName) {
     if (len > UDISKBUFLEN) return 0;
 
     if (wifiDmaRcvFifo.state[tmpW] == udisk_buf_empty) {
-      const int timeOut = 2000; // millisecond
+      const int timeOut = 2000; //millisecond
       dmaTransmitBegin();
       if (HAL_DMA_PollForTransferCustomize(&wifiUsartDMArx, HAL_DMA_FULL_TRANSFER, timeOut) == HAL_OK) {
         memcpy((unsigned char *) wifiDmaRcvFifo.bufferAddr[tmpW], (uint8_t *)bufToCpy, len);
@@ -612,14 +611,14 @@ int package_to_wifi(WIFI_RET_TYPE type, uint8_t *buf, int len) {
       return 0;
     }
 
-    if (len > 0) {
+   if (len > 0) {
       memcpy(&buf_to_wifi[4 + index_to_wifi], buf, len);
       index_to_wifi += len;
 
       if (index_to_wifi < 1)
         return 0;
 
-      if (buf_to_wifi[index_to_wifi + 3] == '\n') {
+       if (buf_to_wifi[index_to_wifi + 3] == '\n') {
         // mask "wait" "busy" "X:"
         if ( ((buf_to_wifi[4] == 'w') && (buf_to_wifi[5] == 'a') && (buf_to_wifi[6] == 'i') && (buf_to_wifi[7] == 't'))
           || ((buf_to_wifi[4] == 'b') && (buf_to_wifi[5] == 'u') && (buf_to_wifi[6] == 's') && (buf_to_wifi[7] == 'y'))
@@ -768,7 +767,7 @@ int write_to_file(char *buf, int len) {
   if (res == -1) {
     ZERO(public_buf);
     file_writer.write_index = 0;
-    return -1;
+    return  -1;
   }
 
   return 0;
@@ -840,7 +839,7 @@ uint8_t Explore_Disk(char *path , uint8_t recu_level) {
 static void wifi_gcode_exec(uint8_t *cmd_line) {
   int8_t tempBuf[100] = { 0 };
   uint8_t *tmpStr = 0;
-  int cmd_value;
+  int  cmd_value;
   volatile int print_rate;
   if (strchr((char *)cmd_line, '\n') && (strchr((char *)cmd_line, 'G') || strchr((char *)cmd_line, 'M') || strchr((char *)cmd_line, 'T'))) {
     tmpStr = (uint8_t *)strchr((char *)cmd_line, '\n');
@@ -1446,12 +1445,16 @@ void utf8_2_unicode(uint8_t *source, uint8_t Len) {
 
   ZERO(FileName_unicode);
 
-  for (;;) {
+  while (1) {
     char_byte_num = source[i] & 0xF0;
-    if (source[i] < 0x80) { // ASCII -- 1 byte
-      FileName_unicode[char_i++] = source[i++];
+    if (source[i] < 0x80) {
+      //ASCII --1byte
+      FileName_unicode[char_i] = source[i];
+      i += 1;
+      char_i += 1;
     }
-    else if (char_byte_num == 0xC0 || char_byte_num == 0xD0) { // -- 2 byte
+    else if (char_byte_num == 0xC0 || char_byte_num == 0xD0) {
+      //--2byte
       u16_h = (((uint16_t)source[i] << 8) & 0x1F00) >> 2;
       u16_l = ((uint16_t)source[i + 1] & 0x003F);
       u16_value = (u16_h | u16_l);
@@ -1460,7 +1463,8 @@ void utf8_2_unicode(uint8_t *source, uint8_t Len) {
       i += 2;
       char_i += 2;
     }
-    else if (char_byte_num == 0xE0) { // -- 3 byte
+    else if (char_byte_num == 0xE0) {
+      //--3byte
       u16_h = (((uint16_t)source[i] << 8) & 0x0F00) << 4;
       u16_m = (((uint16_t)source[i + 1] << 8) & 0x3F00) >> 2;
       u16_l = ((uint16_t)source[i + 2] & 0x003F);
@@ -1470,7 +1474,8 @@ void utf8_2_unicode(uint8_t *source, uint8_t Len) {
       i += 3;
       char_i += 2;
     }
-    else if (char_byte_num == 0xF0) { // -- 4 byte
+    else if (char_byte_num == 0xF0) {
+      //--4byte
       i += 4;
       //char_i += 3;
     }
@@ -1492,7 +1497,7 @@ static void file_first_msg_handle(uint8_t * msg, uint16_t msgLen) {
 
   memcpy(file_writer.saveFileName, msg + 5, fileNameLen);
 
-  utf8_2_unicode(file_writer.saveFileName, fileNameLen);
+  utf8_2_unicode(file_writer.saveFileName,fileNameLen);
 
   ZERO(public_buf);
 
@@ -1505,7 +1510,7 @@ static void file_first_msg_handle(uint8_t * msg, uint16_t msgLen) {
     TERN_(SDSUPPORT, card.mount());
   }
   else if (gCfgItems.fileSysType == FILE_SYS_USB) {
-    // nothing
+
   }
   file_writer.write_index = 0;
   lastFragment = -1;
@@ -1745,7 +1750,7 @@ int32_t readWifiFifo(uint8_t *retBuf, uint32_t bufLen) {
 
 void stopEspTransfer() {
   if (wifi_link_state == WIFI_TRANS_FILE)
-    wifi_link_state = WIFI_CONNECTED;
+  wifi_link_state = WIFI_CONNECTED;
 
   TERN_(SDSUPPORT, card.closefile());
 
@@ -2015,8 +2020,8 @@ void get_wifi_commands() {
           if (gpos) {
             switch (strtol(gpos + 1, nullptr, 10)) {
               case 0 ... 1:
-                TERN_(ARC_SUPPORT, case 2 ... 3:)
-                TERN_(BEZIER_CURVE_SUPPORT, case 5:)
+              TERN_(ARC_SUPPORT, case 2 ... 3:)
+              TERN_(BEZIER_CURVE_SUPPORT, case 5:)
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
                 LCD_MESSAGEPGM(MSG_STOPPED);
                 break;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.h b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
index 15b90ab..d02716e 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
@@ -56,7 +56,7 @@
 
 #define UDISKBUFLEN           1024
 
-typedef enum {
+typedef enum{
   udisk_buf_empty = 0,
   udisk_buf_full,
 } UDISK_DATA_BUFFER_STATE;
@@ -74,41 +74,41 @@ typedef struct {
 
 typedef struct {
   uint8_t flag; // 0x0: no error;  0x01: error
-  uint32_t start_tick; // error start time
+  uint32_t start_tick; //error start time
   uint32_t now_tick;
 } WIFI_TRANS_ERROR;
 
 extern volatile WIFI_TRANS_ERROR wifiTransError;
 
 typedef struct {
-  char ap_name[32];   // wifi-name
-  char keyCode[64]; // wifi password
-  int decodeType;
-  int baud;
-  int mode;
+  char ap_name[32];   //wifi-name
+  char keyCode[64]; //wifi password
+  int  decodeType;
+  int  baud;
+  int  mode;
 } WIFI_PARA;
 
 typedef struct {
   char state;
   char hostUrl[96];
-  int port;
+  int  port;
   char id[21];
 } CLOUD_PARA;
 
 typedef struct {
-  char dhcp_flag;
-  char ip_addr[16];
-  char mask[16];
-  char gate[16];
-  char dns[16];
+  char  dhcp_flag;
+  char  ip_addr[16];
+  char  mask[16];
+  char  gate[16];
+  char  dns[16];
 
-  char dhcpd_flag;
-  char dhcpd_ip[16];
-  char dhcpd_mask[16];
-  char dhcpd_gate[16];
-  char dhcpd_dns[16];
-  char start_ip_addr[16];
-  char end_ip_addr[16];
+  char  dhcpd_flag;
+  char  dhcpd_ip[16];
+  char  dhcpd_mask[16];
+  char  dhcpd_gate[16];
+  char  dhcpd_dns[16];
+  char  start_ip_addr[16];
+  char  end_ip_addr[16];
 } IP_PARA;
 
 typedef enum {
@@ -144,8 +144,8 @@ extern volatile TRANSFER_STATE esp_state;
 
 typedef struct {
   char buf[20][80];
-  int rd_index;
-  int wt_index;
+  int  rd_index;
+  int  wt_index;
 } QUEUE;
 
 typedef enum {
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index 675e0eb..4a5f08e 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
@@ -36,7 +35,7 @@
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
 
-extern SZ_USART_FIFO WifiRxFifo;
+extern SZ_USART_FIFO  WifiRxFifo;
 
 extern int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
 extern int writeUsartFifo(SZ_USART_FIFO * fifo, int8_t * buf, int32_t len);
@@ -301,7 +300,7 @@ EspUploadResult readPacket(uint8_t op, uint32_t *valp, size_t *bodyLen, uint32_t
           return stat;
         }
         else if (state == header) {
-          // store the header byte
+          //store the header byte
           hdr[hdrIdx++] = c;
           if (hdrIdx >= headerLength) {
             // get the body length, prepare a buffer for it
@@ -423,7 +422,7 @@ EspUploadResult doCommand(uint8_t op, const uint8_t *data, size_t dataLen, uint3
 EspUploadResult Sync(uint16_t timeout) {
   uint8_t buf[36];
   EspUploadResult stat;
-  int i;
+  int i ;
 
   // compose the data for the sync attempt
   memset(buf, 0x55, sizeof(buf));
@@ -449,8 +448,8 @@ EspUploadResult Sync(uint16_t timeout) {
       if (rc != success || bodyLen != 2) break;
     }
   }
-  // DEBUG
-  //else printf("stat=%d\n", (int)stat);
+  //DEBUG
+  //else debug//printf("stat=%d\n", (int)stat);
   return stat;
 }
 
diff --git a/Marlin/src/lcd/extui/nextion/FileNavigator.cpp b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
index 07f1256..650bbd6 100644
--- a/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
@@ -79,7 +79,7 @@ void FileNavigator::getFiles(uint16_t index) {
   lastindex = index;
 
   #if NEXDEBUG(AC_FILE)
-    DEBUG_ECHOLNPGM("index=", index, " currentindex=", currentindex);
+    DEBUG_ECHOLNPAIR("index=", index, " currentindex=", currentindex);
   #endif
 
   if (currentindex == 0 && folderdepth > 0) { // Add a link to go up a folder
@@ -127,7 +127,7 @@ void FileNavigator::getFiles(uint16_t index) {
       fcnt++;
       fseek = seek;
       #if NEXDEBUG(AC_FILE)
-        DEBUG_ECHOLNPGM("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'\n");
+        DEBUG_ECHOLNPAIR("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'\n");
       #endif
     }
   }
@@ -137,7 +137,7 @@ void FileNavigator::getFiles(uint16_t index) {
 
 void FileNavigator::changeDIR(char *folder) {
   #if NEXDEBUG(AC_FILE)
-    DEBUG_ECHOLNPGM("currentfolder: ", currentfoldername, "  New: ", folder);
+    DEBUG_ECHOLNPAIR("currentfolder: ", currentfoldername, "  New: ", folder);
   #endif
   if (folderdepth >= MAX_FOLDER_DEPTH) return; // limit the folder depth
   strcat(currentfoldername, folder);
@@ -165,7 +165,7 @@ void FileNavigator::upDIR() {
     pos[1] = '\0';
   }
   #if NEXDEBUG(AC_FILE)
-    DEBUG_ECHOLNPGM("depth: ", folderdepth, " currentfoldername: ", currentfoldername);
+    DEBUG_ECHOLNPAIR("depth: ", folderdepth, " currentfoldername: ", currentfoldername);
   #endif
 }
 
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 50423db..9035442 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -72,7 +72,7 @@ void NextionTFT::Startup() {
   SEND_VALasTXT("tmppage.bedy", Y_BED_SIZE);
   SEND_VALasTXT("tmppage.bedz", Z_MAX_POS);
 
-  DEBUG_ECHOLNPGM("Nextion Debug Level ", NEXDEBUGLEVEL);
+  DEBUG_ECHOLNPAIR("Nextion Debug Level ", NEXDEBUGLEVEL);
 }
 
 void NextionTFT::IdleLoop() {
@@ -98,13 +98,13 @@ void NextionTFT::PrintFinished() {
 void NextionTFT::ConfirmationRequest(const char * const msg) {
   SEND_VALasTXT("tmppage.M117", msg);
   #if NEXDEBUG(N_MARLIN)
-    DEBUG_ECHOLNPGM("ConfirmationRequest() ", msg, " printer_state:", printer_state);
+    DEBUG_ECHOLNPAIR("ConfirmationRequest() ", msg, " printer_state:", printer_state);
   #endif
 }
 
 void NextionTFT::StatusChange(const char * const msg) {
   #if NEXDEBUG(N_MARLIN)
-    DEBUG_ECHOLNPGM("StatusChange() ", msg, "\nprinter_state:", printer_state);
+    DEBUG_ECHOLNPAIR("StatusChange() ", msg, "\nprinter_state:", printer_state);
   #endif
   SEND_VALasTXT("tmppage.M117", msg);
 }
@@ -133,12 +133,12 @@ bool NextionTFT::ReadTFTCommand() {
     if (nextion_command[0] == 'G' || nextion_command[0] == 'M' || nextion_command[0] == 'T')
       injectCommands(nextion_command);
     #if NEXDEBUG(N_ALL)
-      DEBUG_ECHOLNPGM("< ", nextion_command);
+      DEBUG_ECHOLNPAIR("< ", nextion_command);
     #endif
     #if NEXDEBUG(N_SOME)
       uint8_t req = atoi(&nextion_command[1]);
       if (req > 7 && req != 20)
-        DEBUG_ECHOLNPGM(  "> ", AS_CHAR(nextion_command[0]),
+        DEBUG_ECHOLNPAIR(  "> ", AS_CHAR(nextion_command[0]),
                          "\n> ", AS_CHAR(nextion_command[1]),
                          "\n> ", AS_CHAR(nextion_command[2]),
                          "\n> ", AS_CHAR(nextion_command[3]),
@@ -151,7 +151,7 @@ bool NextionTFT::ReadTFTCommand() {
 void NextionTFT::SendFileList(int8_t startindex) {
   // respond to panel request for 7 files starting at index
   #if NEXDEBUG(N_INFO)
-    DEBUG_ECHOLNPGM("## SendFileList ## ", startindex);
+    DEBUG_ECHOLNPAIR("## SendFileList ## ", startindex);
   #endif
   filenavigator.getFiles(startindex);
 }
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index b838299..4ef9625 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1037,8 +1037,6 @@ namespace ExtUI {
 
   #if M600_PURGE_MORE_RESUMABLE
     void setPauseMenuResponse(PauseMenuResponse response) { pause_menu_response = response; }
-    PauseMessage pauseModeStatus = PAUSE_MESSAGE_STATUS;
-    PauseMode getPauseMode() { return pause_mode;}
   #endif
 
   void printFile(const char *filename) {
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 9e1ae3a..faa6c8f 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -195,7 +195,7 @@ namespace ExtUI {
   #endif
 
   inline void simulateUserClick() {
-    #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
+    #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
       ui.lcd_clicked = true;
     #endif
   }
@@ -234,8 +234,6 @@ namespace ExtUI {
 
   #if M600_PURGE_MORE_RESUMABLE
     void setPauseMenuResponse(PauseMenuResponse);
-    extern PauseMessage pauseModeStatus;
-    PauseMode getPauseMode();
   #endif
 
   #if ENABLED(LIN_ADVANCE)
diff --git a/Marlin/src/lcd/fontutils.cpp b/Marlin/src/lcd/fontutils.cpp
index 50b671e..90fcb2a 100644
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@@ -1,25 +1,3 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
 /**
  * @file    fontutils.cpp
  * @brief   help functions for font and char
diff --git a/Marlin/src/lcd/fontutils.h b/Marlin/src/lcd/fontutils.h
index 3901d44..04ff811 100644
--- a/Marlin/src/lcd/fontutils.h
+++ b/Marlin/src/lcd/fontutils.h
@@ -1,25 +1,3 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
 /**
  * @file    fontutils.h
  * @brief   help functions for font and char
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 1bc6d75..7870969 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -44,7 +44,6 @@ namespace Language_an {
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu prencipal");
   PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Inicio automatico");
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Amortar motors");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Orichen");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Levar a l'orichen");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Orichen X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Orichen Y");
@@ -107,13 +106,10 @@ namespace Language_an {
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Aceleracion");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vel. viache min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accel");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Acel. max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Acel. max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Acel. max ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max ") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max") LCD_STR_A;
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Acel. max *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acel. retrac.");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Acel. Viaje");
@@ -121,9 +117,6 @@ namespace Language_an {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" trangos/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" trangos/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" trangos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E trangos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* trangos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 37d896f..0d4291b 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -99,12 +99,9 @@ namespace Language_bg {
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-откат");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-travel");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Стъпки/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" стъпки/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("стъпки/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("стъпки/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("стъпки/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E стъпки/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* стъпки/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Температура");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index a554faf..f97a783 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -42,7 +42,6 @@ namespace Language_ca {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Desactiva motors");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu de depuracio");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra progres");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origen");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Ves a l'origen");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("X a origen");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y a origen");
@@ -105,12 +104,9 @@ namespace Language_ca {
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Accel. retracc");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Accel. Viatge");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Passos/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passos/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("passos/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("passos/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("passos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Epassos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*passos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index b58fb05..fa6a8e2 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -114,7 +114,7 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sítě");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upravit síť bodů");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Konec úprav sítě");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Měření bodu");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Měření bodu");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Hodnota Z");
@@ -268,45 +268,33 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Vybrat *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Zrychl");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Odchylka spoje");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Rychlost");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Rychlost");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav Min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Akcelerace");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Akcel");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-přejezd");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Kroků/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E kroků/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* kroků/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("kroků/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("kroků/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("kroků/mm");
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Ekroků/mm");
+  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*kroků/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Teplota");
   PROGMEM Language_Str MSG_MOTION                          = _UxGT("Pohyb");
   PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
@@ -487,12 +475,9 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Teplota max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Nap. zdroj");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Buzení motorů");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Motor %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Motor %");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC uložit EEPROM");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CHYBA SPOJENÍ");
@@ -605,9 +590,6 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korekce");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Vyhlazení");
 }
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index ef312f1..95c2573 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -176,12 +176,9 @@ namespace Language_da {
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Strømfors.");
 
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driv Styrke");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driv %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driv %");
 
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Skriv");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 318f003..f063700 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -107,7 +107,7 @@ namespace Language_de {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Netz Editor");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Netz bearbeiten");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Netzbearb. angeh.");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Messpunkt");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Messpunkt");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z-Wert");
@@ -271,21 +271,15 @@ namespace Language_de {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Auswählen *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Beschleunigung");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V ") LCD_STR_A _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V ") LCD_STR_B _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V ") LCD_STR_C _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("V E Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Geschwindigkeit");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("V max ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("V max ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("V max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("V max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("V max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("V max ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("V max ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("V max *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("V min ");
@@ -295,9 +289,6 @@ namespace Language_de {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("A max ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("A max ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("A max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("A max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("A max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("A max ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("A max ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("A max *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A Einzug");
@@ -308,9 +299,6 @@ namespace Language_de {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = LCD_STR_E _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steps/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatur");
@@ -511,12 +499,9 @@ namespace Language_de {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Netzteil");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Motorleistung");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Treiber %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Treiber %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC Verbindungsfehler");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Werte speichern");
@@ -633,9 +618,6 @@ namespace Language_de {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrektur");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Glätten");
   PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("X Achse leveln");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 824b90a..b69b469 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -108,16 +108,10 @@ namespace Language_el {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Vαντίδραση E");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("V Μέγιστο") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("V Μέγιστο") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("V Μέγιστο") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("V Μέγιστο") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("V Μέγιστο") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("V Μέγιστο") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("V Μέγιστο") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("V Μέγιστο *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("V Ελάχιστο");
@@ -126,9 +120,6 @@ namespace Language_el {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Aμεγ ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Aμεγ ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Aμεγ ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Aμεγ ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Aμεγ ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Aμεγ ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Aμεγ ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Aμεγ *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Α-ανάσυρση");
@@ -137,9 +128,6 @@ namespace Language_el {
   PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Bήματα Ε ανά μμ");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bήματα * ανά μμ");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index e5c1694..208d7c2 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -110,16 +110,10 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Vαντίδραση E");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vμεγ ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vμεγ ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vμεγ ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vμεγ ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vμεγ ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vμεγ ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vμεγ ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vμεγ *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vελαχ");
@@ -128,9 +122,6 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Aμεγ ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Aμεγ ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Aμεγ ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Aμεγ ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Aμεγ ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Aμεγ ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Aμεγ ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Aμεγ *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Α-ανάσυρση");
@@ -139,9 +130,6 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Bήματα Ε ανά μμ");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bήματα * ανά μμ");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 11c976e..cd204ee 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -41,8 +41,6 @@
 #endif
 #undef en
 
-#define MEDIA_TYPE_EN "Media"
-
 namespace Language_en {
   constexpr uint8_t    CHARSIZE                            = 2;
   PROGMEM Language_Str LANGUAGE                            = _UxGT("English");
@@ -53,11 +51,11 @@ namespace Language_en {
   PROGMEM Language_Str MSG_NO                              = _UxGT("NO");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Back");
   PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Aborting...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = MEDIA_TYPE_EN _UxGT(" Inserted");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = MEDIA_TYPE_EN _UxGT(" Removed");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Waiting for card");
+  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Media Inserted");
+  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Media Removed");
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Waiting for media");
   PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD Init Fail");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = MEDIA_TYPE_EN _UxGT(" read error");
+  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Media read error");
   PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB device removed");
   PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB start failed");
   PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Subcall Overflow");
@@ -70,7 +68,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Disable Steppers");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Debug Menu");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Progress Bar Test");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Homing");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Home");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
@@ -78,14 +75,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Home ") LCD_STR_I;
   PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Home ") LCD_STR_J;
   PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Home ") LCD_STR_K;
-  PROGMEM Language_Str MSG_FILAMENT_SET                    = _UxGT("Filament Settings");
-  PROGMEM Language_Str MSG_FILAMENT_MAN                    = _UxGT("Filament Management");
-  PROGMEM Language_Str MSG_LEVBED_FL                       = _UxGT("Front Left");
-  PROGMEM Language_Str MSG_LEVBED_FR                       = _UxGT("Front Right");
-  PROGMEM Language_Str MSG_LEVBED_C                        = _UxGT("Center");
-  PROGMEM Language_Str MSG_LEVBED_BL                       = _UxGT("Back Left");
-  PROGMEM Language_Str MSG_LEVBED_BR                       = _UxGT("Back Right");
-  PROGMEM Language_Str MSG_MANUAL_MESH                     = _UxGT("Manual Mesh");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-Align");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Iteration: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Accuracy Decreasing!");
@@ -150,15 +139,15 @@ namespace Language_en {
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bed Leveling");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Level Bed");
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bed Tramming");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Adjust bed until the probe triggers.");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Corners within tolerance. Bed trammed.");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Raise Bed Until Probe Triggered");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("All Corners Within Tolerance. Level Bed");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Good Points: ");
   PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Last Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Next Corner");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Mesh Editor");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Edit Mesh");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Mesh Editing Stopped");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Probing Point");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Probing Point");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Value");
@@ -284,8 +273,8 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Move ") LCD_STR_I;
   PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Move ") LCD_STR_J;
   PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Move ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Move Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Move E*");
+  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend too cold");
   PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Move %smm");
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
@@ -297,11 +286,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Move 0.1in");
   PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Move 1.0in");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
-  PROGMEM Language_Str MSG_MAXSPEED                        = _UxGT("Max Speed (mm/s)");
-  PROGMEM Language_Str MSG_MAXSPEED_X                      = _UxGT("Max ") LCD_STR_A _UxGT(" Speed");
-  PROGMEM Language_Str MSG_MAXSPEED_Y                      = _UxGT("Max ") LCD_STR_B _UxGT(" Speed");
-  PROGMEM Language_Str MSG_MAXSPEED_Z                      = _UxGT("Max ") LCD_STR_C _UxGT(" Speed");
-  PROGMEM Language_Str MSG_MAXSPEED_E                      = _UxGT("Max ") LCD_STR_E _UxGT(" Speed");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozzle ~");
@@ -334,7 +318,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Off");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autotune");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("PID Cycles");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID tuning done");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Autotune failed. Bad extruder.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Autotune failed. Temperature too high.");
@@ -353,38 +336,38 @@ namespace Language_en {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Select *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocity");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Min Velocity");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Min Travel Vel");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
+  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav Min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleration");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Retract Accel");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Travel Accel");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("XY Freq Limit");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min FR Factor");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
+  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Retract");
+  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-Travel");
+  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequency max");
+  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Feed min");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steps/mm");
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steps/mm");
@@ -415,7 +398,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Error");
   PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Error");
   PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Settings Stored");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = MEDIA_TYPE_EN _UxGT(" Update");
+  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Media Update");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Printer");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Refresh");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info Screen");
@@ -440,15 +423,15 @@ namespace Language_en {
   PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Pausing...");
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pause Print");
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Resume Print");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Start Host Print");
+  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Host Start");
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Stop Print");
   PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("End Repeat Loops");
   PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Printing Object");
   PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Cancel Object");
   PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Cancel Object =");
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Power Outage");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print from ") MEDIA_TYPE_EN;
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No ") MEDIA_TYPE_EN;
+  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print from Media");
+  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No Media");
   PROGMEM Language_Str MSG_DWELL                           = _UxGT("Sleep...");
   PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Click to Resume...");
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Print Paused");
@@ -491,9 +474,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Unload Filament");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Unload *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Unload All");
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Attach ") MEDIA_TYPE_EN;
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Change ") MEDIA_TYPE_EN;
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Release ") MEDIA_TYPE_EN;
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Attach Media");
+  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Change Media");
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Release Media");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Probe Past Bed");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Skew Factor");
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
@@ -517,7 +500,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Deploy Z-Probe");
   PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Stow Z-Probe");
   PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Home %s%s%s First");
-  PROGMEM Language_Str MSG_ZPROBE_SETTINGS                 = _UxGT("Probe Settings");
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Probe Offsets");
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Probe X Offset");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Probe Y Offset");
@@ -606,12 +588,12 @@ namespace Language_en {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Drive Strength");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = AXIS4_STR _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = AXIS5_STR _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = AXIS6_STR _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CONNECTION ERROR");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Write");
@@ -625,7 +607,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Nozzle: ");
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Runout Sensor");
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Runout Dist mm");
-  PROGMEM Language_Str MSG_RUNOUT_ENABLE                   = _UxGT("Enable Runout");
   PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Homing Failed");
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Failed");
 
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 1213d9e..8fdf0bd 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -57,7 +57,6 @@ namespace Language_es {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Apagar motores");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menú depuración");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Prob. barra progreso");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origen");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Llevar al origen");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Origen X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origen Y");
@@ -106,12 +105,12 @@ namespace Language_es {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover ejes");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelando Cama");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Cama");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Recorrido Cama");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Recorrido asistido");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Siguente Esquina");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Ed. Mallado parada");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sondear Punto");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Sondear Punto");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
@@ -270,32 +269,23 @@ namespace Language_es {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seleccionar *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Aceleración");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desvi. Unión");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidad");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vel. viaje min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleración");
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Acel. max") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Acel. max") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Acel. max") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Acel. max *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acel. retrac.");
@@ -304,9 +294,6 @@ namespace Language_es {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pasos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pasos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
@@ -486,12 +473,9 @@ namespace Language_es {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp. Máxima");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("F. Aliment.");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Fuerza de empuje");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERROR CONEX. TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escribe DAC EEPROM");
@@ -591,9 +575,6 @@ namespace Language_es {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corrección");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Suavizado");
 
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 30cc493..530742d 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -167,9 +167,6 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-astindua");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-astindua");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-astindua");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-astindua");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VBidaia min");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
@@ -178,9 +175,6 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pausoak/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pausoak/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pausoak/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pausoak/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pausoak/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Tenperatura");
@@ -300,12 +294,9 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Tenp. Maximoa");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Elikadura-iturria");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driver-aren potentzia");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Idatzi DAC EEPROM");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("HARIZPIA ALDATU");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index ef15d06..6032937 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -56,7 +56,6 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Arrêter moteurs");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu debug");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barre progress.");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origine");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Origine auto");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Origine X auto");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origine Y auto");
@@ -111,14 +110,14 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Déplacer un axe");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Régler Niv. lit");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveau du lit");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Niveau des coins");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Assistant Molettes");
   PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Relever le coin jusqu'à la sonde");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Coins dans la tolérance. Niveau lit ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Coin suivant");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Modif. maille"); // 13 car. max
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifier grille");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Modification arrêtée");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Mesure point");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Mesure point");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valeur Z");
@@ -522,12 +521,12 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Alim.");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Puiss. moteur ");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Driver X %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Driver Y %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Driver Z %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver " AXIS4_STR " %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver " AXIS5_STR " %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver " AXIS6_STR " %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM sauv.");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERREUR CONNEXION TMC");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index e29a277..8defd2b 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -108,7 +108,7 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Ed. Mallado Detida");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punto de Proba");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punto de Proba");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
@@ -271,34 +271,25 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Escolla *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Acel");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desvío Unión");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidade");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("V-viaxe min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Aceleración");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax") LCD_STR_A;
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrac.");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-viaxe");
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frecuencia max");
@@ -307,9 +298,6 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pasos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pasos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
@@ -502,12 +490,9 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Máx");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Fonte Alimentación");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Forza do Motor");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERRO CONEX. TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escribe DAC EEPROM");
@@ -608,9 +593,6 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corrección");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Suavizado");
 
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 2b879a7..6fb41f9 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -26,11 +26,11 @@
  *
  * LCD Menu Messages. See also https://marlinfw.org/docs/development/lcd_language.html
  * Hungarian translation by AntoszHUN. I am constantly improving and updating the translation.
- * Translation last updated: 08/30/2021 - 22:20
+ * Translation last updated: 07/07/2021 - 11:20
  *
  * LCD Menü Üzenetek. Lásd még https://marlinfw.org/docs/development/lcd_language.html
  * A Magyar fordítást készítette: AntoszHUN. A fordítást folyamatosan javítom és frissítem.
- * A Fordítás utolsó frissítése: 2021.08.30. - 22:20
+ * A Fordítás utolsó frissítése: 2021.07.07. - 11:20
  */
 
 namespace Language_hu {
@@ -132,7 +132,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Tengelyek mozgatása");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Ágy szintezés");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Ágy szintezése");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Sarok szint");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Elektromos segéd");
   PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Ágy emelése a szonda váltásig");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Minden sarok tolerancián belül. Szint jó.");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Jó pontok: ");
@@ -141,7 +141,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Háló szerkesztö");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Háló szerkesztése");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Háló szerk. állj");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Próbapont");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Próbapont");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z érték");
@@ -312,7 +312,6 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Ki");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID hangolás");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID hangolás *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("PID ciklus");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID hangolás kész");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Hangolási hiba. Rossz adagoló.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Hangolási hiba. Magas hömérséklet.");
@@ -494,7 +493,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("TouchMI használ");
   PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Szonda telepítés");
   PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Szonda elhelyezés");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Elöször %s%s%s kell");
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Elsö %s%s%s kell");
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Szonda eltolások");
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("X szonda eltolás");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Y szonda eltolás");
@@ -583,12 +582,12 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max höfok");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Meghajtási erö");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = AXIS4_STR _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = AXIS5_STR _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = AXIS6_STR _UxGT(" Meghajtó %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E meghajtó %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CSATLAKOZÁSI HIBA");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM írása");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 388498f..32bc7ff 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -62,7 +62,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu principale");
   PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Impostaz. avanzate");
   PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configurazione");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Esegui files auto");
+  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostart");
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Disabilita Motori");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu di debug");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra avanzam.");
@@ -137,7 +137,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Livella piano");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Livella piano");
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Tramming piano");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Regola la vite finché la sonda non rileva il piano.");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Regola la vite finche' la sonda non rileva il piano.");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Tolleranza raggiunta su tutti gli angoli. Piano livellato!");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Punti buoni: ");
   PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Ultimo Z: ");
@@ -145,7 +145,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifica Mesh");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Modif. Mesh Fermata");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punto sondato");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punto sondato");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Indice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Indice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valore di Z");
@@ -244,7 +244,7 @@ namespace Language_it {
 
   PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Controllo LED");
   PROGMEM Language_Str MSG_LEDS                            = _UxGT("Luci");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Presets luce");
+  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Preset luce");
   PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Rosso");
   PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Arancione");
   PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Giallo");
@@ -256,7 +256,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Predefinito");
   PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Canale =");
   PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Luci #2");
-  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Presets luce #2");
+  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Luce #2 Presets");
   PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Luminosità");
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Luci personalizzate");
   PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensità rosso");
@@ -318,7 +318,6 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Off");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Calibrazione PID");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Calibraz. PID *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("Ciclo PID");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Calibr.PID eseguita");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Calibrazione fallita. Estrusore errato.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Calibrazione fallita. Temperatura troppo alta.");
@@ -347,14 +346,14 @@ namespace Language_it {
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accelerazione");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Ritrazione");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-Spostamento");
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequenza max");
@@ -503,8 +502,8 @@ namespace Language_it {
   PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
   PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Totali");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Interrompi se FC");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Risc.Fallito");   // Max 12 characters
+  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Finecorsa annullati");
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Risc.Fallito"); // Max 12 caratteri
   PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Err: TEMP RIDONDANTE");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TEMP FUORI CONTROLLO");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TEMP PIAT.FUORI CTRL");
@@ -515,9 +514,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: TEMP MINIMA");
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("STAMPANTE FERMATA");
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Riavviare prego");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("g");  // One character
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h");  // One character
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m");  // One character
+  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("g"); // Un solo carattere
+  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h"); // Un solo carattere
+  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m"); // Un solo carattere
   PROGMEM Language_Str MSG_HEATING                         = _UxGT("Riscaldamento...");
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("Raffreddamento..");
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Risc. piatto...");
@@ -539,7 +538,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Barra Diagonale");
   PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Altezza");
   PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Raggio");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Info su stampante");
+  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Riguardo stampante");
   PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info. stampante");
   PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Livel. a 3 punti");
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Livel. Lineare");
@@ -578,12 +577,12 @@ namespace Language_it {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Alimentatore");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Potenza Drive");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Driver X %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Driver Y %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Driver Z %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") AXIS4_STR _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") AXIS5_STR _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") AXIS6_STR _UxGT(" %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERR.CONNESSIONE TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Scrivi DAC EEPROM");
@@ -661,9 +660,8 @@ namespace Language_it {
   PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Password eliminata");
 
   //
-  // Filament Change screens show up to 3 lines on a 4-line display
-  //                        ...or up to 2 lines on a 3-line display
-  //
+  // Le schermate di Cambio Filamento possono visualizzare fino a 3 linee su un display a 4 righe
+  //                                                  ...o fino a 2 linee su un display a 3 righe.
   #if LCD_HEIGHT >= 4
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_3_LINE("Premi per", "riprendere", "la stampa"));
     PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parcheggiando..."));
@@ -703,22 +701,14 @@ namespace Language_it {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correzione");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Appianamento");
 
   PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Livello asse X");
   PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibra");
-  #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Timeout inattività, temperatura diminuita. Premere OK per riscaldare e riprendere di nuovo.");
-  #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Timeout riscaldatore");
-  #endif
+  PROGMEM Language_Str MSG_HEATER_TIMEOUT                  = _UxGT("Timeout riscaldatore");
   PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Riscalda");
   PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Riscaldando...");
-  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Riscaldato");
 
   PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Wizard Z offset");
   PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Altezza di riferimento sonda");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index c0fe245..61740e3 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -119,20 +119,14 @@ namespace Language_jp_kana {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_A;             // "Va-jerk"
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_B;             // "Vb-jerk"
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_C;             // "Vc-jerk"
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_I;             // "Va-jerk"
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_J;             // "Vb-jerk"
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_K;             // "Vc-jerk"
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("ステップ/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("ステップ/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("ステップ/mm");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("エクストルーダー ヤクド");          // "Ve-jerk"
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax A"
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("サイダイオクリソクド ") LCD_STR_B;  // "Vmax B"
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("サイダイオクリソクド ") LCD_STR_C;  // "Vmax C"
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("サイダイオクリソクド ") LCD_STR_I;  // "Vmax I"
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("サイダイオクリソクド ") LCD_STR_J;  // "Vmax J"
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("サイダイオクリソクド ") LCD_STR_K;  // "Vmax K"
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("サイダイオクリソクド ") LCD_STR_E;  // "Vmax E"
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax B"
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax C"
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax E"
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("サイダイオクリソクド *");  // "Vmax E1"
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("サイショウオクリソクド");           // "Vmin"
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("サイショウイドウソクド");           // "VTrav min"
@@ -220,12 +214,9 @@ namespace Language_jp_kana {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("セッテイサイコウオン");              // "Max Temp"
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("デンゲンシュベツ");                // "Power Supply"
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("モータークドウリョク");              // "Drive Strength"
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" DACシュツリョク %");      // "X Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" DACシュツリョク %");      // "Y Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" DACシュツリョク %");      // "Z Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" DACシュツリョク %");      // "I Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" DACシュツリョク %");      // "J Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" DACシュツリョク %");      // "K Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X DACシュツリョク %");               // "X Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y DACシュツリョク %");               // "Y Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z DACシュツリョク %");               // "Z Driver %"
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E DACシュツリョク %");               // "E Driver %"
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("EEPROMヘホゾン");               // "Store memory"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("イチジテイシ");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index c1620a8..e467178 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -139,7 +139,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Edytor siatki");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Edycja siatki");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Edycja siatki zatrzymana");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punkt pomiarowy");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punkt pomiarowy");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Indeks X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Indeks Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Wartość Z");
@@ -327,16 +327,22 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Zryw V") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Zryw V") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Zryw V") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Zryw V") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Zryw V") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Zryw V") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Zryw Ve");
   //PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Prędkość (V)");
-
+  //PROGMEM Language_Str MSG_VMAX_A                        = _UxGT("Vmax ") LCD_STR_A;
+  //PROGMEM Language_Str MSG_VMAX_B                        = _UxGT("Vmax ") LCD_STR_B;
+  //PROGMEM Language_Str MSG_VMAX_C                        = _UxGT("Vmax ") LCD_STR_C;
+  //PROGMEM Language_Str MSG_VMAX_E                        = _UxGT("Vmax ") LCD_STR_E;
+  //PROGMEM Language_Str MSG_VMAX_EN                       = _UxGT("Vmax *");
+  //PROGMEM Language_Str MSG_VMIN                          = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vskok min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Przyspieszenie (A)");
-
+  //PROGMEM Language_Str MSG_AMAX_A                        = _UxGT("Amax ") LCD_STR_A;
+  //PROGMEM Language_Str MSG_AMAX_B                        = _UxGT("Amax ") LCD_STR_B;
+  //PROGMEM Language_Str MSG_AMAX_C                        = _UxGT("Amax ") LCD_STR_C;
+  //PROGMEM Language_Str MSG_AMAX_E                        = _UxGT("Amax ") LCD_STR_E;
+  //PROGMEM Language_Str MSG_AMAX_EN                       = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-wycofanie");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-przesuń.");
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Częstotliwość max");
@@ -345,9 +351,6 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" kroki/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" kroki/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" kroki/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E kroki/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* kroki/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
@@ -558,12 +561,9 @@ namespace Language_pl {
   //PROGMEM Language_Str MSG_INFO_MAX_TEMP                 = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Zasilacz");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Siła silnika");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Siła %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Siła %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC BŁĄD POŁĄCZENIA");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Zapisz DAC EEPROM");
@@ -678,6 +678,9 @@ namespace Language_pl {
   //PROGMEM Language_Str MSG_SERVICE_RESET                 = _UxGT("Reset");
   //PROGMEM Language_Str MSG_SERVICE_IN                    = _UxGT(" in:");
   //PROGMEM Language_Str MSG_BACKLASH                      = _UxGT("Backlash");
+  //PROGMEM Language_Str MSG_BACKLASH_A                    = LCD_STR_A;
+  //PROGMEM Language_Str MSG_BACKLASH_B                    = LCD_STR_B;
+  //PROGMEM Language_Str MSG_BACKLASH_C                    = LCD_STR_C;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korekcja");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Wygładzanie");
 
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 630f38e..4bec745 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -105,9 +105,6 @@ namespace Language_pt {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passo/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passo/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passo/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E passo/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* passo/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 21be3a2..12904aa 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -99,7 +99,7 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor de Malha");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Malha");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Fim da Edição");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sondando ponto");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Sondando ponto");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
@@ -244,9 +244,6 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("arrancada V") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("arrancada V") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("arrancada V") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("arrancada V") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("arrancada V") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("arrancada V") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("arrancada VE");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desv. Junção");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidade");
@@ -258,9 +255,6 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Passo ") LCD_STR_A _UxGT("/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Passo ") LCD_STR_B _UxGT("/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Passo ") LCD_STR_C _UxGT("/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Passo ") LCD_STR_I _UxGT("/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Passo ") LCD_STR_J _UxGT("/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Passo ") LCD_STR_K _UxGT("/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index b1208ea..3d21e1a 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -107,7 +107,7 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editeaza Mesh");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Editarea Meshului Oprita");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punctul de Probare");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punctul de Probare");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valoare Z");
@@ -273,18 +273,12 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Jerk");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocity");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -293,9 +287,6 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Retract");
@@ -303,12 +294,9 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequency max");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Feed min");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steps/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" steps/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("steps/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("steps/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("steps/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Esteps/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*steps/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperature");
@@ -509,12 +497,9 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temperatura Maxima");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Drive Strength");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CONNECTION ERROR");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Write");
@@ -621,9 +606,6 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corectare");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
 
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 5f5afb0..6ccfe5f 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -178,7 +178,7 @@ namespace Language_ru {
     PROGMEM Language_Str MSG_EDITING_STOPPED               = _UxGT("Правка окончена");
   #endif
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Редактировать сетку");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Точка сетки");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Точка сетки");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Индекс X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Индекс Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Значение Z");
@@ -714,9 +714,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("БП");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Сила привода");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Привод, %");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 284fb95..717fa49 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -68,22 +68,10 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Uvolniť motory");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Ponuka ladenia");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test uk. priebehu");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Parkovanie");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Domovská pozícia");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Domov os X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Domov os Y");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Domov os Z");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Domov os ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Domov os ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Domov os ") LCD_STR_K;
-  PROGMEM Language_Str MSG_FILAMENT_SET                    = _UxGT("Nastav. filamentu");
-  PROGMEM Language_Str MSG_FILAMENT_MAN                    = _UxGT("Správa filamentu");
-  PROGMEM Language_Str MSG_LEVBED_FL                       = _UxGT("Ľavý predný");
-  PROGMEM Language_Str MSG_LEVBED_FR                       = _UxGT("Pravý predný");
-  PROGMEM Language_Str MSG_LEVBED_C                        = _UxGT("Stred");
-  PROGMEM Language_Str MSG_LEVBED_BL                       = _UxGT("Ľavý zadný");
-  PROGMEM Language_Str MSG_LEVBED_BR                       = _UxGT("Pravý zadný");
-  PROGMEM Language_Str MSG_MANUAL_MESH                     = _UxGT("Ručná mriežka");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto-zarovn. Z");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("Iterácia G34: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Klesajúca presnosť!");
@@ -97,9 +85,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = LCD_STR_I _UxGT(" Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = LCD_STR_J _UxGT(" Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = LCD_STR_K _UxGT(" Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofsety nastavené");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Nastaviť začiatok");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Spriev. vyrovn.");
@@ -147,7 +132,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Posunúť osy");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Vyrovnanie podložky");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Vyrovnať podložku");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Vyrovnať rohy");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Asist. vyrovnanie");
   PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Zdvyhnite podl., kým sa nezopne sonda");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Rohy sú vrámci odchyl. Vyrovnajte podl.");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Dobré body: ");
@@ -156,7 +141,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sieťe bodov");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upraviť sieť bodov");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Koniec úprav siete");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Skúšam bod");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Skúšam bod");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Hodnota Z");
@@ -279,9 +264,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Posunúť X");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Posunúť Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Posunúť Z");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Posunúť ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Posunúť ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Posunúť ") LCD_STR_K;
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudér");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudér *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend je studený");
@@ -293,13 +275,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Posunúť o 0,001in");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Posunúť o 0,01in");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Posunúť o 0,1in");
-  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Posunúť o 1,0in");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Rýchlosť");
-  PROGMEM Language_Str MSG_MAXSPEED                        = _UxGT("Max rýchl. (mm/s)");
-  PROGMEM Language_Str MSG_MAXSPEED_X                      = _UxGT("Max rýchl. ") LCD_STR_A;
-  PROGMEM Language_Str MSG_MAXSPEED_Y                      = _UxGT("Max rýchl. ") LCD_STR_B;
-  PROGMEM Language_Str MSG_MAXSPEED_Z                      = _UxGT("Max rýchl. ") LCD_STR_C;
-  PROGMEM Language_Str MSG_MAXSPEED_E                      = _UxGT("Max rýchl. ") LCD_STR_E;
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Výška podl.");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Tryska");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Tryska ~");
@@ -330,10 +306,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Auto-teplota");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Zap");
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Vyp");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Kalibrácia PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Kalibrácia PID *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("Cykly PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Kal. PID dokončená");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID kalibrácia");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID kalibrácia *");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID kal. dokončená");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Auto-kal. zlyhala. Zlý extrúder.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Auto-kal. zlyhala. Príliš vysoká tepl.");
   PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Auto-kal. zlyhala! Čas vypršal.");
@@ -344,18 +319,12 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-skok");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-skok");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-skok");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-skok");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-skok");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-skok");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-skok");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Rýchlosť");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -364,9 +333,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
@@ -374,12 +340,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Max. frekvencia");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min. posun");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Kroky/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" krokov/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("krokov/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("krokov/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("krokov/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Ekrokov/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*krokov/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Teplota");
@@ -505,7 +468,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Zasunúť sondu Z");
   PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Vysunúť sondu Z");
   PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Najskôr os %s%s%s domov");
-  PROGMEM Language_Str MSG_ZPROBE_SETTINGS                 = _UxGT("Nastav. sondy");
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Ofsety sondy Z");
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("X ofset");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Y ofset");
@@ -514,9 +476,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Babystep X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Babystep Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Babystep Z");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Celkom");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Zastavenie Endstop");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Chyba ohrevu");
@@ -594,12 +553,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Teplota max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Nap. zdroj");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Budenie motorov");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Motor %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Motor %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("CHYBA KOMUNIKÁ. TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Uložiť do EEPROM");
@@ -613,7 +569,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Tryska: ");
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Senzor filamentu");
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Vzd. mm fil. senz.");
-  PROGMEM Language_Str MSG_RUNOUT_ENABLE                   = _UxGT("Zapnúť senzor");
   PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Parkovanie zlyhalo");
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Kalibrácia zlyhala");
 
@@ -718,9 +673,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korekcia");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Vyhladzovanie");
 
@@ -733,7 +685,6 @@ namespace Language_sk {
   #endif
   PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Zohriať");
   PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Zohrievanie...");
-  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Zohrievanie dokonč.");
 
   PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Sprievodca sondy Z");
   PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Referencia Z");
@@ -749,7 +700,4 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrácia zlyhala");
 
   PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" spätný chod ovl.");
-
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD karta");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB disk");
 }
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index af80c41..baa0f64 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -130,7 +130,7 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Nät Redigerare");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Redigera Nät");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Nätredigering Stoppad");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sonderingspunkt");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Sonderingspunkt");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Värde");
@@ -303,18 +303,12 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Ryck");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Ryck");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Ryck");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Ryck");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Knutpunkt Avv");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Hastighet");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -323,9 +317,6 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Dra tillbaka");
@@ -336,9 +327,6 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steg/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steg/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steg/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E Steg/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steg/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatur");
@@ -545,12 +533,9 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driv Styrka");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC KOPPLNINGSFEL");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Skriv");
@@ -668,9 +653,6 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrigering");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Glättning");
 
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index f31eb5b..bf218f1 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -110,7 +110,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Mesh Editörü");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Mesh Düzenle");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Mesh Düzenleme Durdu");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Prop Noktası");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Prop Noktası");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("İndeks X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("İndeks Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Değeri");
@@ -266,18 +266,12 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Sarsım");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Sarsım");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Sarsım");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Sarsım");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Sarsım");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Sarsım");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Sarsım");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Jonksiyon Sapması");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Hız Vektörü");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("HızVektör.max ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("HızVektör.max ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("HızVektör.max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("HızVektör.max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("HızVektör.max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("HızVektör.max ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("HızVektör.max ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("HızVektör.max *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("HızVektör.min");
@@ -286,9 +280,6 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max. ivme ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max. ivme ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max. ivme ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max. ivme ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max. ivme ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max. ivme ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max. ivme ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max. ivme *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Ivme-geri çekme");
@@ -297,9 +288,6 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" adım/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" adım/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" adım/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E adım/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* adım/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Sıcaklık");
@@ -476,12 +464,9 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Sıc.");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Güç Kaynağı");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Sürücü Gücü");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Sürücü %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Sürücü %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC BAĞLANTI HATASI");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Yaz");
@@ -586,9 +571,6 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Düzeltme");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Yumuşatma");
 }
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 1e6b49d..2e4a1b0 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -179,7 +179,7 @@ namespace Language_uk {
   #endif
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Редагувати сітку");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Редагув. зупинено");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Точка сітки");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Точка сітки");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Індекс X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Індекс Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Значення Z");
@@ -719,12 +719,12 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Блок жив-ня");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Сила мотору");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Драйвер ") LCD_STR_A _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Драйвер ") LCD_STR_B _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Драйвер ") LCD_STR_C _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер ") LCD_STR_I _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер ") LCD_STR_J _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер ") LCD_STR_K _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Драйвер X, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Драйвер Y, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Драйвер Z, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер ") AXIS4_STR _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер ") AXIS5_STR _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер ") AXIS6_STR _UxGT(", %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Драйвер E, %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Запис ЦАП у EEPROM");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 9ee93a5..013a915 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -52,9 +52,9 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu gỡ lỗi");                          // Debug Menu
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Kiểm tra tiến độ");                     // Progress bar test
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Về nhà tự động");                       // Auto home
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Về nhà X");                             // home X
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Về nhà Y");                             // home Y
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Về nhà Z");                             // home Z
+  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Về nhà X");                             // home x
+  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Về nhà Y");                             // home y
+  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Về nhà Z");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Chỉnh canh Z tự động");
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Đang về nhà XYZ");                      // Homing XYZ
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Nhấn để bắt đầu");                      // Click to Begin
@@ -160,7 +160,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Khe nhớ");                              // Memory Slot
   PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Tải lưới bàn");                         // Load Bed Mesh
   PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Lưu lưới bàn");                         // Save Bed Mesh
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("%i lưới được nạp");                     // Mesh %i loaded
+  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("%i lưới được nạp");                // Mesh %i loaded
   PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("%i lưới đã lưu");
   PROGMEM Language_Str MSG_NO_STORAGE                      = _UxGT("Không lưu trữ");                        // No Storage
   PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Điều sai: Lưu UBL");                    // Err: UBL Save
@@ -200,7 +200,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Di chuyển Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Di chuyển Z");
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Máy đùn");                              // Extruder
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Máy đùn *");
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Máy đùn *");                            // Extruder
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Đầu nóng quá lạnh");                    // Hotend too cold
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Di chuyển 0.1mm");                      // Move 0.1mm
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Di chuyển 1mm");                        // Move 1mm
@@ -209,12 +209,12 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Tốc độ");                               // Speed
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Bàn");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Đầu phun");                             // Nozzle
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Đầu phun ~");
+  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Đầu phun ~");                           // Nozzle
   PROGMEM Language_Str MSG_BED                             = _UxGT("Bàn");                                  // bed
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Tốc độ quạt");                          // fan speed
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Tốc độ quạt ~");
+  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Tốc độ quạt ~");                        // fan speed
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Tốc độ quạt phụ");                      // Extra fan speed
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Tốc độ quạt phụ ~");
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Tốc độ quạt phụ ~");                    // Extra fan speed
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Lưu Lượng");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Lưu Lượng ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Điều khiển");                           // Control
@@ -231,40 +231,28 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Giật-V") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Giật-V") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Giật-V") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Giật-V") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Giật-V") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Giật-V") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Giật-Ve");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Độ Lệch Chỗ Giao");                    // Junction Dev
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Vận tốc");                              // velocity
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vđa") LCD_STR_A;                        // Vmax
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vđa") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vđa") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vđa") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vđa") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vđa") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vđa") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vđa *");
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vđa") LCD_STR_B;                        // Vmax
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vđa") LCD_STR_C;                        // Vmax
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vđa") LCD_STR_E;                        // Vmax
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vđa *");                                // Vmax
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vthiểu");                               // Vmin
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vchuyển thiểu");                        // VTrav min
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Sự tăng tốc");                          // Acceleration
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Tăng tốc ca") LCD_STR_A;                // Amax
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Tăng tốc ca") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Tăng tốc ca") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Tăng tốc ca") LCD_STR_I;                // Amax
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Tăng tốc ca") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Tăng tốc ca") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Tăng tốc ca") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Tăng tốc ca *");
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Tăng tốc ca") LCD_STR_B;                // Amax
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Tăng tốc ca") LCD_STR_C;                // Amax
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Tăng tốc ca") LCD_STR_E;                // Amax
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Tăng tốc ca *");                        // Amax
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("TT-Rút");                               // A-retract
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("TT-Chuyển");                            // A-travel
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Bước/mm");                              // Steps
-  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bước") LCD_STR_A _UxGT("/mm");          // Steps/mm
+  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bước") LCD_STR_A _UxGT("/mm");               // Asteps/mm
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bước") LCD_STR_B _UxGT("/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bước") LCD_STR_C _UxGT("/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bước") LCD_STR_I _UxGT("/mm");          // Steps/mm
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bước") LCD_STR_J _UxGT("/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bước") LCD_STR_K _UxGT("/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("BướcE/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bước */mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Nhiệt độ");                             // Temperature
@@ -400,13 +388,10 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Nhiệt độ tối đa");                      // Max temp
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Bộ nguồn");                             // PSU
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Sức mạnh ổ đĩa");                       // Drive Strength
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" % trình điều khiển");        // X Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E % trình điều khiển");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X % trình điều khiển");                 // X Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y % trình điều khiển");                 // Y Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z % trình điều khiển");                 // Z Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E % trình điều khiển");                 // E Driver %
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Ghi DAC EEPROM");                       // DAC EEPROM Write
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("In tạm dừng");                          // PRINT PAUSED
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("Nạp dây nhựa");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 3564246..31d2623 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -33,52 +33,52 @@ namespace Language_zh_CN {
   constexpr uint8_t    CHARSIZE                            = 3;
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Simplified Chinese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就绪.");     // " ready."
+  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就绪.");     //" ready."
   PROGMEM Language_Str MSG_MARLIN                          = _UxGT("马林");
   PROGMEM Language_Str MSG_YES                             = _UxGT("是");
   PROGMEM Language_Str MSG_NO                              = _UxGT("否");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // ”Back“
   PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("放弃中...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("存储卡已插入");     // "Card inserted"
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("存储卡被拔出");     // "Card removed"
+  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("存储卡已插入");     //"Card inserted"
+  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("存储卡被拔出");     //"Card removed"
   PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("等待存储器");
   PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("存储器读取错误");
   PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB设备已弹出");
   PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB启动错误");
   PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("子响应溢出");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("挡块");     // "Endstops" // Max length 8 characters
+  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("挡块");     //"Endstops" // Max length 8 characters
   PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("软挡块");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("主菜单");     // "Main"
+  PROGMEM Language_Str MSG_MAIN                            = _UxGT("主菜单");     //"Main"
   PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("高级设置");
   PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("配置");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自动开始");     // "Autostart"
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("关闭步进电机");     // "Disable steppers"
+  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自动开始");     //"Autostart"
+  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("关闭步进电机");     //"Disable steppers"
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("调试菜单");     // "Debug Menu"
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("进度条测试");     // "Progress Bar Test"
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自动回原点");     // "Auto home"
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("回X原位");     // "Home X"
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("回Y原位");     // "Home Y"
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("回Z原位");     // "Home Z"
+  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自动回原点");     //"Auto home"
+  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("回X原位");     //"Home X"
+  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("回Y原位");     //"Home Y"
+  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("回Z原位");     //"Home Z"
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("自动Z对齐");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("平台调平XYZ归原位");     // "Homing XYZ"
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("单击开始热床调平");     // "Click to Begin"
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("下个热床调平点");     // "Next Point"
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成热床调平");     // "Leveling Done!"
+  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("平台调平XYZ归原位");     //"Homing XYZ"
+  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("单击开始热床调平");     //"Click to Begin"
+  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("下个热床调平点");     //"Next Point"
+  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成热床调平");     //"Leveling Done!"
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("淡出高度");     // "Fade Height"
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("设置原点偏移");     // "Set home offsets"
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已启用");     // "Offsets applied"
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("设置原点");     // "Set origin"
+  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("设置原点偏移");     //"Set home offsets"
+  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已启用");     //"Offsets applied"
+  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("设置原点");     //"Set origin"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("预热 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("预热 ") PREHEAT_1_LABEL;     //"Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     //"Preheat PREHEAT_2_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
     PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床");     //MSG_PREHEAT_1 " Bed"
     PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置");     //MSG_PREHEAT_1 " conf"
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("预热 $");     // "Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("预热 $ ~");     // "Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("预热 $");     //"Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("预热 $ ~");     //"Preheat PREHEAT_2_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("预热 $ 喷嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("预热 $ 喷嘴 ~");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("预热 $ 全部");     //MSG_PREHEAT_1 " All"
@@ -86,26 +86,26 @@ namespace Language_zh_CN {
     PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("预热 $ 设置");     //MSG_PREHEAT_1 " conf"
   #endif
   PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("预热自定义");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降温");     // "Cooldown"
+  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降温");     //"Cooldown"
   PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("切割频率");
   PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("激光控制");
   PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("激光电源");
   PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主轴控制");
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("主轴电源");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("主轴反转");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("电源打开");     // "Switch power on"
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("电源关闭");     // "Switch power off"
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("挤出");     // "Extrude"
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回抽");     // "Retract"
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移动轴");     // "Move axis"
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("调平热床");     // "Bed leveling"
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("调平热床");     // "Level bed"
+  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("电源打开");     //"Switch power on"
+  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("电源关闭");     //"Switch power off"
+  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("挤出");     //"Extrude"
+  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回抽");     //"Retract"
+  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移动轴");     //"Move axis"
+  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("调平热床");     //"Bed leveling"
+  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("调平热床");     //"Level bed"
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("调平边角");     // "Bed Tramming"
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下个边角");     // "Next corner"
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("网格编辑器");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("编辑网格");     // "Edit Mesh"
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("网格编辑已停止");     // "Mesh Editing Stopped"
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("探测点");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("探测点");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("索引X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("索引Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z 值");
@@ -220,27 +220,27 @@ namespace Language_zh_CN {
 
   PROGMEM Language_Str MSG_MOVING                          = _UxGT("移动...");     // "Moving...")
   PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("释放 XY");     // "Free XY")
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移动X");     // "Move X"
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("移动Y");     // "Move Y"
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("移动Z");     // "Move Z"
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("挤出机");     // "Extruder"
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("挤出机 *");     // "Extruder"
+  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移动X");     //"Move X"
+  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("移动Y");     //"Move Y"
+  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("移动Z");     //"Move Z"
+  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("挤出机");     //"Extruder"
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("挤出机 *");     //"Extruder"
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("热端太冷");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("移动 %s mm");     // "Move 0.025mm"
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移动 0.1 mm");     // "Move 0.1mm"
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移动 1 mm");     // "Move 1mm"
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移动 10 mm");     // "Move 10mm"
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移动 100 mm");     // "Move 100mm"
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     // "Speed"
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("热床Z");     // "Bed Z"
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("喷嘴");     // "Nozzle" 噴嘴
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("喷嘴 ~");     // "Nozzle" 噴嘴
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("移动 %s mm");     //"Move 0.025mm"
+  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移动 0.1 mm");     //"Move 0.1mm"
+  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移动 1 mm");     //"Move 1mm"
+  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移动 10 mm");     //"Move 10mm"
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移动 100 mm");     //"Move 100mm"
+  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     //"Speed"
+  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("热床Z");     //"Bed Z"
+  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("喷嘴");     //"Nozzle" 噴嘴
+  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("喷嘴 ~");     //"Nozzle" 噴嘴
   PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("喷嘴已停靠");
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("喷嘴待命中");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("热床");     // "Bed"
+  PROGMEM Language_Str MSG_BED                             = _UxGT("热床");     //"Bed"
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("机箱壳");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("风扇速率");     // "Fan speed"
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("风扇速率 ~");     // "Fan speed"
+  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("风扇速率");     //"Fan speed"
+  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("风扇速率 ~");     //"Fan speed"
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("存储的风扇 ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("额外风扇速率");     // "Extra fan speed"
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("额外风扇速率 ~");     // "Extra fan speed"
@@ -249,82 +249,70 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("自动模式");
   PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("工作速度");
   PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("空闲周期");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("挤出速率");     // "Flow"
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("挤出速率 ~");     // "Flow"
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     // "Control"
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" 最大");     // " " LCD_STR_THERMOMETER " Max"
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 因数");     // " " LCD_STR_THERMOMETER " Fact"
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自动控温");     // "Autotemp"
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("开");     // "On"
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("关");     // "Off"
+  PROGMEM Language_Str MSG_FLOW                            = _UxGT("挤出速率");     //"Flow"
+  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("挤出速率 ~");     //"Flow"
+  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     //"Control"
+  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     //" " LCD_STR_THERMOMETER " Min"
+  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" 最大");     //" " LCD_STR_THERMOMETER " Max"
+  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 因数");     //" " LCD_STR_THERMOMETER " Fact"
+  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自动控温");     //"Autotemp"
+  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("开");     //"On"
+  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("关");     //"Off"
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("自动PID");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("自动PID *");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID调整完成");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("自动调失败. 坏的挤出机");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("自动调失败. 温度太高");
   PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("自动调失败! 超时");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("选择");     // "Select"
+  PROGMEM Language_Str MSG_SELECT                          = _UxGT("选择");     //"Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("选择 *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     // "Accel" acceleration
+  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration
   PROGMEM Language_Str MSG_JERK                            = _UxGT("抖动速率");     // "Jerk"
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("轴抖动速率") LCD_STR_A;     // "Va-jerk"
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("轴抖动速率") LCD_STR_B;     // "Vb-jerk"
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("轴抖动速率") LCD_STR_C;     // "Vc-jerk"
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("轴抖动速率") LCD_STR_I;     // "Vi-jerk"
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("轴抖动速率") LCD_STR_J;     // "Vj-jerk"
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("轴抖动速率") LCD_STR_K;     // "Vk-jerk"
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("挤出机抖动速率");     // "Ve-jerk"
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("轴抖动速率") LCD_STR_A;     //"Va-jerk"
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("轴抖动速率") LCD_STR_B;     //"Vb-jerk"
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("轴抖动速率") LCD_STR_C;     //"Vc-jerk"
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("挤出机抖动速率");     //"Ve-jerk"
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("接点差");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("速度");     // "Velocity"
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("最大进料速率") LCD_STR_A;     // "Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("最大进料速率") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大进料速率") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("最大进料速率") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("最大进料速率") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("最大进料速率") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大进料速率") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大进料速率 *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小进料速率");     // "Vmin"  min_feedrate_mm_s
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移动速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("最大进料速率") LCD_STR_A;     //"Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("最大进料速率") LCD_STR_B;     //"Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大进料速率") LCD_STR_C;     //"Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大进料速率") LCD_STR_E;     //"Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大进料速率 *");     //"Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小进料速率");     //"Vmin"  min_feedrate_mm_s
+  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移动速率");     //"VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("加速度");     // "Acceleration"
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大打印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大打印加速度") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大打印加速度") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("最大打印加速度") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("最大打印加速度") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("最大打印加速度") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大打印加速度") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大打印加速度 *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("收进加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非打印移动加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大打印加速度") LCD_STR_A;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大打印加速度") LCD_STR_B;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大打印加速度") LCD_STR_C;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大打印加速度") LCD_STR_E;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大打印加速度 *");     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("收进加速度");     //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
+  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非打印移动加速度");     //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("频率最大");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("进给速度");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("轴步数/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" 步数/mm");     // "Asteps/mm"
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E 步数/mm");     // "Esteps/mm"
+  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("轴步数/mm");     //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("步数/mm");     //"Asteps/mm"
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("步数/mm");     //"Bsteps/mm"
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("步数/mm");     //"Csteps/mm"
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E 步数/mm");     //"Esteps/mm"
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* 步数/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("温度");     // "Temperature"
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("运动");     // "Motion"
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("料丝");     // "Filament" menu_advanced_filament
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E 在 mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
+  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("温度");     //"Temperature"
+  PROGMEM Language_Str MSG_MOTION                          = _UxGT("运动");     //"Motion"
+  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("料丝");     //"Filament" menu_advanced_filament
+  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E 在 mm") SUPERSCRIPT_THREE;     //"E in mm3" volumetric_enabled
   PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E 限制 在 mm") SUPERSCRIPT_THREE;
   PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E 限制 *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("丝料直径");     // "Fil. Dia."
+  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("丝料直径");     //"Fil. Dia."
   PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("丝料直径 *");
   PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("卸载 mm");     // "Unload mm"
   PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("装载 mm");     // "Load mm"
   PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Advance K");
   PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Advance K *");
-  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD对比度");     // "LCD contrast"
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存设置");     // "Store memory"
-  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("装载设置");     // "Load memory"
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢复安全值");     // "Restore Defaults"
+  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD对比度");     //"LCD contrast"
+  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存设置");     //"Store memory"
+  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("装载设置");     //"Load memory"
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢复安全值");     //"Restore Defaults"
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化设置");     // "Initialize EEPROM"
   PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("EEPROM CRC 错误");
   PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index 错误");
@@ -333,9 +321,9 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("存储器更新");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("复位打印机");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("刷新");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("信息屏");     // "Info screen"
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("准备");     // "Prepare"
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("调整");     // "Tune"
+  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("信息屏");     //"Info screen"
+  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("准备");     //"Prepare"
+  PROGMEM Language_Str MSG_TUNE                            = _UxGT("调整");     //"Tune"
   PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("电源监控");
   PROGMEM Language_Str MSG_CURRENT                         = _UxGT("电流");
   PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("电压");
@@ -352,33 +340,33 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("返回");
   PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("继续");
   PROGMEM Language_Str MSG_PAUSING                         = _UxGT("暂停中...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("暂停打印");     // "Pause print"
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("恢复打印");     // "Resume print"
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("停止打印");     // "Stop print"
+  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("暂停打印");     //"Pause print"
+  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("恢复打印");     //"Resume print"
+  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("停止打印");     //"Stop print"
   PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("打印物体");
   PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("取消物体");
   PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("取消物体 =");
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("中断恢复");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("从存储卡上打印");     // "Print from SD"
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("无存储卡");     // "No SD card"
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("休眠中 ...");     // "Sleep..."
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("点击继续 ...");     // "Click to resume..."
+  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("从存储卡上打印");     //"Print from SD"
+  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("无存储卡");     //"No SD card"
+  PROGMEM Language_Str MSG_DWELL                           = _UxGT("休眠中 ...");     //"Sleep..."
+  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("点击继续 ...");     //"Click to resume..."
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("暫停打印");     // "Print paused"
   PROGMEM Language_Str MSG_PRINTING                        = _UxGT("打印中...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消打印");     // "Print aborted"
+  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消打印");     //"Print aborted"
   PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("打印已完成");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("无移动");     // "No move."
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("已杀掉");     // "KILLED. "
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     // "STOPPED. "
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回抽长度mm");     // "Retract mm" retract_length, retract length (positive mm)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("换手回抽长度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回抽速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回抽恢复长度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("换手回抽恢复长度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回抽恢复后进料速率mm/s");     // "Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
+  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("无移动");     //"No move."
+  PROGMEM Language_Str MSG_KILLED                          = _UxGT("已杀掉");     //"KILLED. "
+  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     //"STOPPED. "
+  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回抽长度mm");     //"Retract mm" retract_length, retract length (positive mm)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("换手回抽长度mm");     //"Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
+  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回抽速率mm/s");     //"Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     //"Hop mm" retract_zraise, retract Z-lift
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回抽恢复长度mm");     //"UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("换手回抽恢复长度mm");     //"S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回抽恢复后进料速率mm/s");     //"Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");     // "S UnRet V"
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("自动抽回");     // "Auto-Retract" autoretract_enabled,
+  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("自动抽回");     //"Auto-Retract" autoretract_enabled,
   PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("交换长度");
   PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("额外的交换");
   PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("清洗长度");
@@ -396,17 +384,17 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("自动迁移");
   PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("上一个挤出机");
   PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("迁移至 *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更换丝料");     // "Change filament"
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更换丝料 *");     // "Change filament"
+  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更换丝料");     //"Change filament"
+  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更换丝料 *");     //"Change filament"
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("装载丝料");     // "Load filament"
   PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("装载丝料 *");     // "Load filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("卸载丝料");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("卸载丝料 *");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("卸载全部");     // "Unload All"
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("初始化存储卡");     // "Init. SD card"
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更换存储卡");     // "Change SD card"
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("初始化存储卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更换存储卡");     //"Change SD card"
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("释放存储卡");
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探针在热床之外");     // "Z probe out. bed" Z probe is not within the physical limits
+  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探针在热床之外");     //"Z probe out. bed" Z probe is not within the physical limits
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("偏斜因数");     // "Skew Factor"
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");     // "BLTouch"
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("自检");
@@ -428,39 +416,39 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("部署TouchMI");
   PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("部署Z探针");
   PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("收好Z探针");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("归位 %s%s%s 先");     // "Home ... first"
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("归位 %s%s%s 先");     //"Home ... first"
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("探针偏移量");
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("探针X偏移");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("探针Y偏移");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("探针Z偏移");     // "Z Offset"
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("微量调整X轴");     // "Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("微量调整Y轴");     // "Babystep Y"
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("微量调整Z轴");     // "Babystep Z"
+  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("探针Z偏移");     //"Z Offset"
+  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("微量调整X轴");     //"Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
+  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("微量调整Y轴");     //"Babystep Y"
+  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("微量调整Z轴");     //"Babystep Z"
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("总计");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("挡块终止");     // "Endstop abort"
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("加热失败");     // "Heating failed"
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("错误：冗余温度");     // "Err: REDUNDANT TEMP"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("温控失控");     // "THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("挡块终止");     //"Endstop abort"
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("加热失败");     //"Heating failed"
+  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("错误：冗余温度");     //"Err: REDUNDANT TEMP"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("温控失控");     //"THERMAL RUNAWAY"
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("热床热量失控");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("机箱热量失控");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("错误：最高温度");     // "Err: MAXTEMP"
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("错误：最低温度");     // "Err: MINTEMP"
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("打印停机");     // "PRINTER HALTED"
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("请重置");     // "Please reset"
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     // "d" // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("时");     // "h" // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("分");     // "m" // One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("加热中 ...");     // "Heating..."
+  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("错误：最高温度");     //"Err: MAXTEMP"
+  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("错误：最低温度");     //"Err: MINTEMP"
+  PROGMEM Language_Str MSG_HALTED                          = _UxGT("打印停机");     //"PRINTER HALTED"
+  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("请重置");     //"Please reset"
+  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     //"d" // One character only
+  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("时");     //"h" // One character only
+  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("分");     //"m" // One character only
+  PROGMEM Language_Str MSG_HEATING                         = _UxGT("加热中 ...");     //"Heating..."
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("冷却中 ...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加热热床中 ...");     // "Bed Heating..."
+  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加热热床中 ...");     //"Bed Heating..."
   PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("热床冷却中 ...");
   PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("机箱加热中 ...");
   PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("机箱冷却中 ...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("⊿校准");     // "Delta Calibration"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("⊿校准X");     // "Calibrate X"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("⊿校准Y");     // "Calibrate Y"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校准Z");     // "Calibrate Z"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校准中心");     // "Calibrate Center"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("⊿校准");     //"Delta Calibration"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("⊿校准X");     //"Calibrate X"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("⊿校准Y");     //"Calibrate Y"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校准Z");     //"Calibrate Z"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校准中心");     //"Calibrate Center"
   PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("⊿设置");     // "Delta Settings"
   PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("⊿自动校准");     // "Auto Calibration"
   PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("设置⊿高度");     // "Set Delta Height"
@@ -468,19 +456,19 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("⊿斜柱");     // "Diag Rod"
   PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("⊿高度");     // "Height"
   PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("⊿半径");     // "Radius"
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("关于打印机");     // "About Printer"
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("打印机信息");     // "Printer Info"
+  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("关于打印机");     //"About Printer"
+  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("打印机信息");     //"Printer Info"
   PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("三点调平");     // "3-Point Leveling"
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("线性调平");     // "Linear Leveling"
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("双线性调平");     // "Bilinear Leveling"
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("统一热床调平(UBL)");     // "Unified Bed Leveling"
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("网格调平");     // "Mesh Leveling"
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("打印机统计");     // "Printer Stats"
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("主板信息");     // "Board Info"
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("温度计");     // "Thermistors"
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("挤出机");     // "Extruders"
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("波特率");     // "Baud"
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("协议");     // "Protocol"
+  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("打印机统计");     //"Printer Stats"
+  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("主板信息");     //"Board Info"
+  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("温度计");     //"Thermistors"
+  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("挤出机");     //"Extruders"
+  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("波特率");     //"Baud"
+  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("协议");     //"Protocol"
   PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("监控温度失控:关");
   PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("监控温度失控:开");
   PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("热端空闲超时");
@@ -491,29 +479,26 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("打印机不正确");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印计数");     // "Print Count"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成了");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总打印时间");     // "Total print time"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长工作时间");     // "Longest job time"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("总计挤出");     // "Extruded total"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印计数");     //"Print Count"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成了");     //"Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总打印时间");     //"Total print time"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长工作时间");     //"Longest job time"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("总计挤出");     //"Extruded total"
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印数");     // "Prints"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总共");     // "Total"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长");     // "Longest"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已挤出");     // "Extruded"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印数");     //"Prints"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     //"Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总共");     //"Total"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长");     //"Longest"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已挤出");     //"Extruded"
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低温度");     // "Min Temp"
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高温度");     // "Max Temp"
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("电源供应");     // "Power Supply"
+  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低温度");     //"Min Temp"
+  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高温度");     //"Max Temp"
+  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("电源供应");     //"Power Supply"
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("驱动力度");     // "Drive Strength"
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" 驱动 %");     // "X Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 驱动 %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X 驱动 %");     // "X Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y 驱动 %");     // "Y Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z 驱动 %");     // "Z Driver %"
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驱动 %");     // "E Driver %"
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC 连接错误");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("保存驱动设置");     // "DAC EEPROM Write"
@@ -523,7 +508,7 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("卸载丝料");     // "UNLOAD FILAMENT"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("恢复选项:");     // "RESUME OPTIONS:"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("清除更多");     // "Purge more"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("恢复打印");     // "Resume print"
+  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("恢复打印");     //"Resume print"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  喷嘴: ");     // "  Nozzle: "
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("断料传感器");
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("断料距离mm");
@@ -598,15 +583,15 @@ namespace Language_zh_CN {
   #else
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下继续"));
     PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停靠中..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("请等待 ..."));     // "Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入并单击"));     // "Insert and Click"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("请等待 ..."));     //"Please wait..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入并单击"));     //"Insert and Click"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("按下加热"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("加热中 ..."));     // "Heating..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     // "Ejecting..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("装载中 ..."));     // "Loading..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     //"Ejecting..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("装载中 ..."));     //"Loading..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("清除中 ..."));     // "Purging..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢复中 ..."));     // "Resuming..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢复中 ..."));     //"Resuming..."
   #endif
   PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC驱动器");
   PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("驱动电流");
@@ -620,9 +605,6 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
   PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
-  PROGMEM Language_Str MSG_BACKLASH_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("校正");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("平滑的");
 
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 467a246..f162536 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -33,84 +33,84 @@ namespace Language_zh_TW {
   constexpr uint8_t    CHARSIZE                            = 3;
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Traditional Chinese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就緒.");     // " ready."
+  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就緒.");     //" ready."
   PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("是");  // "YES"
-  PROGMEM Language_Str MSG_NO                              = _UxGT("否");  // "NO"
+  PROGMEM Language_Str MSG_YES                             = _UxGT("是");  //"YES"
+  PROGMEM Language_Str MSG_NO                              = _UxGT("否");  //"NO"
   PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // "Back"
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("正在中止...");   // "Aborting..."
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("記憶卡已插入");     // "Card inserted"
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("記憶卡被拔出");     // "Card removed"
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("等待記憶卡");    // "Waiting for media"
+  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("正在中止...");   //"Aborting..."
+  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("記憶卡已插入");     //"Card inserted"
+  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("記憶卡被拔出");     //"Card removed"
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("等待記憶卡");    //"Waiting for media"
   PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("記憶卡讀取錯誤"); //"Media read error"
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB裝置已移除");   // "USB device removed"
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB啟動失敗");  // "USB start failed"
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("擋塊");     // "Endstops" // Max length 8 characters
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("軟體擋塊");    // "Soft Endstops"
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("主選單");     // "Main"
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("進階設置");   // "Advanced Settings"
+  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB裝置已移除");   //"USB device removed"
+  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB啟動失敗");  //"USB start failed"
+  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("擋塊");     //"Endstops" // Max length 8 characters
+  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("軟體擋塊");    //"Soft Endstops"
+  PROGMEM Language_Str MSG_MAIN                            = _UxGT("主選單");     //"Main"
+  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("進階設置");   //"Advanced Settings"
   PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("設置");    //Configuration
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自動開始");     // "Autostart"
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("關閉步進馬達");     // "Disable steppers"
+  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自動開始");     //"Autostart"
+  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("關閉步進馬達");     //"Disable steppers"
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("除錯選單");     // "Debug Menu"
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("進度條測試");     // "Progress Bar Test"
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自動回原點");     // "Auto home"
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("回X原點");     // "Home X"
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("回Y原點");     // "Home Y"
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("回Z原點");     // "Home Z"
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("自動Z對齊");   // "Auto Z-Align"
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("平台調平XYZ歸原點");     // "Homing XYZ"
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("單擊開始熱床調平");     // "Click to Begin"
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("下個熱床調平點");     // "Next Point"
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成熱床調平");     // "Leveling Done!"
+  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自動回原點");     //"Auto home"
+  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("回X原點");     //"Home X"
+  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("回Y原點");     //"Home Y"
+  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("回Z原點");     //"Home Z"
+  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("自動Z對齊");   //"Auto Z-Align"
+  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("平台調平XYZ歸原點");     //"Homing XYZ"
+  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("單擊開始熱床調平");     //"Click to Begin"
+  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("下個熱床調平點");     //"Next Point"
+  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成熱床調平");     //"Leveling Done!"
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("淡出高度");     // "Fade Height"
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("設置原點偏移");     // "Set home offsets"
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已啟用");     // "Offsets applied"
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("設置原點");     // "Set origin"
+  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("設置原點偏移");     //"Set home offsets"
+  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已啟用");     //"Offsets applied"
+  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("設置原點");     //"Set origin"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("預熱 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("預熱 ") PREHEAT_1_LABEL;     //"Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     //"Preheat PREHEAT_1_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~");   //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
     PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床");     //MSG_PREHEAT_1 " Bed"
     PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置");     //MSG_PREHEAT_1 " conf"
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("預熱 $");     // "Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("預熱 $ ~");     // "Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("預熱 $");     //"Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("預熱 $ ~");     //"Preheat PREHEAT_1_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("預熱 $ 噴嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("預熱 $ 噴嘴 ~");   //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("預熱 $ 全部");     //MSG_PREHEAT_1 " All"
     PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("預熱 $ 熱床");     //MSG_PREHEAT_1 " Bed"
     PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("預熱 $ 設置");     //MSG_PREHEAT_1 " conf"
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("自定預熱");   // "Preheat Custom"
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降溫");     // "Cooldown"
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("激光控制");    // "Laser Control"
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("激光電源");    // "Laser Power"
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主軸控告制");    // "Spindle Control"
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("主軸電源");    // "Spindle Power"
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("主軸反轉");  // "Spindle Reverse"
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("電源打開");     // "Switch power on"
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("電源關閉");     // "Switch power off"
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("擠出");     // "Extrude"
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回縮");     // "Retract"
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移動軸");     // "Move axis"
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("調平熱床");     // "Bed leveling"
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("調平熱床");     // "Level bed"
+  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("自定預熱");   //"Preheat Custom"
+  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降溫");     //"Cooldown"
+  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("激光控制");    //"Laser Control"
+  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("激光電源");    //"Laser Power"
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主軸控告制");    //"Spindle Control"
+  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("主軸電源");    //"Spindle Power"
+  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("主軸反轉");  //"Spindle Reverse"
+  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("電源打開");     //"Switch power on"
+  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("電源關閉");     //"Switch power off"
+  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("擠出");     //"Extrude"
+  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回縮");     //"Retract"
+  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移動軸");     //"Move axis"
+  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("調平熱床");     //"Bed leveling"
+  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("調平熱床");     //"Level bed"
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("調平邊角");     // "Bed Tramming"
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下個邊角");     // "Next corner"
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("網格編輯器");    // "Mesh Editor"
+  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("網格編輯器");    //"Mesh Editor"
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("編輯網格");     // "Edit Mesh"
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("網格編輯已停止");     // "Mesh Editing Stopped"
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("探測點");   // "Probing Point"
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("索引 X");    // "Index X"
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("索引 Y");    // "Index Y"
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z 值");    // "Z Value"
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("探測點");   //"Probing Point"
+  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("索引 X");    //"Index X"
+  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("索引 Y");    //"Index Y"
+  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z 值");    //"Z Value"
   PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("自定命令");     // "Custom Commands"
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 探測測試");   // "M48 Probe Test"
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 探測點");    // "M48 Point"
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("偏差");    // "Deviation"
+  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 探測測試");   //"M48 Probe Test"
+  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 探測點");    //"M48 Point"
+  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("偏差");    //"Deviation"
   PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX Mode");
   PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Tool Offsets");
   PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Park");
@@ -123,7 +123,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("執行G29");     // "Doing G29"
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL工具");     // "UBL Tools"
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("傾斜點");  // "Tilting Point"
+  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("傾斜點");  //"Tilting Point"
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("手工建網");     // "Manually Build Mesh"
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("放置墊片並測量");     // "Place shim & measure"
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("測量");     // "Measure"
@@ -132,9 +132,9 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("啟動UBL");     // "Activate UBL"
   PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("關閉UBL");     // "Deactivate UBL"
   PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("置設熱床溫度");     // "Bed Temp"
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("置設熱床溫度");    // "Bed Temp")
+  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("置設熱床溫度");    //"Bed Temp")
   PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("置設噴嘴溫度");     // "Hotend Temp"
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("熱端溫度");    // "Hotend Temp"
+  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("熱端溫度");    //"Hotend Temp"
   PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("網格編輯");     // "Mesh Edit"
   PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("編輯客戶網格");     // "Edit Custom Mesh"
   PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("細調網格");     // "Fine Tuning Mesh"
@@ -150,13 +150,13 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("高度合計");     // "Height Amount"
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("批准網格");     // "Validate Mesh"
   PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("批准客戶網格");     // "Validate Custom Mesh"
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 加熱熱床");    // "G26 Heating Bed"
+  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 加熱熱床");    //"G26 Heating Bed"
   PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle"
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("手動填裝");  // "Manual priming..."
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("固定距離填裝");   // "Fixed Length Prime"
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("完成填裝");   // "Done Priming"
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26已取消");   // "G26 Canceled"
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("離開 G26");  // "Leaving G26"
+  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("手動填裝");  //"Manual priming..."
+  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("固定距離填裝");   //"Fixed Length Prime"
+  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("完成填裝");   //"Done Priming"
+  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26已取消");   //"G26 Canceled"
+  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("離開 G26");  //"Leaving G26"
   PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("繼續熱床網格");     // "Continue Bed Mesh"
   PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("網格調平");     // "Mesh Leveling"
   PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("三點調平");     // "3-Point Leveling"
@@ -186,7 +186,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("沒有存儲");     // "No storage"
   PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("錯誤: UBL保存");     // "Err: UBL Save"
   PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("錯誤: UBL還原");     // "Err: UBL Restore"
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-偏移:");   // "Z-Offset: "
+  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-偏移:");   //"Z-Offset: "
   PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z偏移已停止");     // "Z-Offset Stopped"
   PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("一步步UBL");     // "Step-By-Step UBL"
   PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. 創設冷網格");
@@ -218,160 +218,148 @@ namespace Language_zh_TW {
 
   PROGMEM Language_Str MSG_MOVING                          = _UxGT("移動 ...");     // "Moving...")
   PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("釋放 XY");     // "Free XY")
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移動X");     // "Move X"
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("移動Y");     // "Move Y"
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("移動Z");     // "Move Z"
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("擠出機");     // "Extruder"
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("擠出機 *");       // "Extruder *"
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");   // "Hotend too cold"
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("移動 %s mm");     // "Move 0.025mm"
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移動 0.1 mm");    // "Move 0.1mm"
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移動 1 mm");      // "Move 1mm"
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移動 10 mm");     // "Move 10mm"
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移動 100 mm");    // "Move 100mm"
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     // "Speed"
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("熱床Z");     // "Bed Z"
-  PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴");     // "Nozzle" 噴嘴
+  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移動X");     //"Move X"
+  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("移動Y");     //"Move Y"
+  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("移動Z");     //"Move Z"
+  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("擠出機");     //"Extruder"
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("擠出機 *");       //"Extruder *"
+  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");   //"Hotend too cold"
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("移動 %s mm");     //"Move 0.025mm"
+  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移動 0.1 mm");    //"Move 0.1mm"
+  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移動 1 mm");      //"Move 1mm"
+  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移動 10 mm");     //"Move 10mm"
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移動 100 mm");    //"Move 100mm"
+  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     //"Speed"
+  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("熱床Z");     //"Bed Z"
+  PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴");     //"Nozzle" 噴嘴
   PROGMEM Language_Str MSG_NOZZLE_N                        = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴 ~");
-  PROGMEM Language_Str MSG_BED                             = " " LCD_STR_THERMOMETER _UxGT(" 熱床");     // "Bed"
+  PROGMEM Language_Str MSG_BED                             = " " LCD_STR_THERMOMETER _UxGT(" 熱床");     //"Bed"
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Enclosure");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("風扇速率");     // "Fan speed"
+  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("風扇速率");     //"Fan speed"
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("風扇速率 =");
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Stored Fan =");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("額外風扇速率");     // "Extra fan speed"
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("額外風扇速率 =");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("擠出速率");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("擠出速率 ~");     // "Flow"
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     // "Control"
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" 最大");     // " " LCD_STR_THERMOMETER " Max"
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 系數");     // " " LCD_STR_THERMOMETER " Fact"
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自動控溫");     // "Autotemp"
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("開 ");     // "On"
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("關 ");     // "Off"
+  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("擠出速率 ~");     //"Flow"
+  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     //"Control"
+  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     //" " LCD_STR_THERMOMETER " Min"
+  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" 最大");     //" " LCD_STR_THERMOMETER " Max"
+  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 系數");     //" " LCD_STR_THERMOMETER " Fact"
+  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自動控溫");     //"Autotemp"
+  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("開 ");     //"On"
+  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("關 ");     //"Off"
 
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("選擇");     // "Select"
+  PROGMEM Language_Str MSG_SELECT                          = _UxGT("選擇");     //"Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("選擇 *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     // "Accel" acceleration
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("抖動速率");     // "Jerk"
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("軸抖動速率") LCD_STR_A;     // "Va-jerk"
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("軸抖動速率") LCD_STR_B;
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("軸抖動速率") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("軸抖動速率") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("軸抖動速率") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("軸抖動速率") LCD_STR_K;
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("擠出機抖動速率");
+  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration
+  PROGMEM Language_Str MSG_JERK                            = _UxGT("抖動速率");     //"Jerk"
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("軸抖動速率") LCD_STR_A;     //"Va-jerk"
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("軸抖動速率") LCD_STR_B;     //"Vb-jerk"
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("軸抖動速率") LCD_STR_C;     //"Vc-jerk"
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("擠出機抖動速率");     //"Ve-jerk"
 
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("速度");     // "Velocity"
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("最大進料速率") LCD_STR_A;     // "Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("最大進料速率") LCD_STR_A;     //"Vmax " max_feedrate_mm_s
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("最大進料速率") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大進料速率") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("最大進料速率") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("最大進料速率") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("最大進料速率") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大進料速率") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大進料速率 *");     // "Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小進料速率");     // "Vmin"  min_feedrate_mm_s
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移動速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大進料速率 *");     //"Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小進料速率");     //"Vmin"  min_feedrate_mm_s
+  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移動速率");     //"VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("加速度");     // "Acceleration"
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大列印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大列印加速度") LCD_STR_A;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大列印加速度") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大列印加速度") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("最大列印加速度") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("最大列印加速度") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("最大列印加速度") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大列印加速度") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大列印加速度 *");     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("回縮加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非列印移動加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("軸步數/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" 軸步數/mm");     // "Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("擠出機步數/mm");     // "Esteps/mm"
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大列印加速度 *");     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("回縮加速度");     //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
+  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非列印移動加速度");     //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
+  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("軸步數/mm");     //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("軸步數/mm");     //"Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("軸步數/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("軸步數/mm");
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("擠出機步數/mm");     //"Esteps/mm"
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("擠出機~步數/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("溫度");     // "Temperature"
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("運作");     // "Motion"
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("絲料測容");     // "Filament" menu_control_volumetric
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("測容積mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("絲料直徑");     // "Fil. Dia."
+  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("溫度");     //"Temperature"
+  PROGMEM Language_Str MSG_MOTION                          = _UxGT("運作");     //"Motion"
+  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("絲料測容");     //"Filament" menu_control_volumetric
+  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("測容積mm") SUPERSCRIPT_THREE;     //"E in mm3" volumetric_enabled
+  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("絲料直徑");     //"Fil. Dia."
   PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("絲料直徑 *");
   PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("卸載 mm");     // "Unload mm"
   PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("装載 mm");     // "Load mm"
   PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Advance K");
   PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Advance K *");
-  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD對比度");     // "LCD contrast"
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存設置");     // "Store memory"
-  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("載入設置");     // "Load memory"
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢復安全值");     // "Restore failsafe"
+  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD對比度");     //"LCD contrast"
+  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存設置");     //"Store memory"
+  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("載入設置");     //"Load memory"
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢復安全值");     //"Restore failsafe"
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化設置");     // "Initialize EEPROM"
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("錯誤: EEPROM CRC");    // "Err: EEPROM CRC"
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("錯誤: EEPROM Index");    // "Err: EEPROM Index"
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("錯誤: EEPROM Version");    // "EEPROM Version"
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("媒體更新");    // "Media Update"
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("重置打印機");    // "Reset Printer
-  PROGMEM Language_Str MSG_REFRESH                         = _UxGT("刷新");     // "Refresh"
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("資訊界面");     // "Info screen"
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("準備");     // "Prepare"
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("調整");     // "Tune"
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("開始列印");   // "Start Print"
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("下一個");   // "Next"
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("初始  ");   // "Init"
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("停止  ");   // "Stop"
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("列印  ");   // "Print"
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("復歸  ");   // "Reset"
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("放棄  ");   // "Cancel"
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("確認  ");   // "Done"
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("返回  ");   // "Back"
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("繼續  ");   // "Proceed"
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("暫停列印");     // "Pause print"
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("恢復列印");     // "Resume print"
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("停止列印");     // "Stop print"
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("列印物件");   // "Printing Object"
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("中止物件");   // "Cancel Object"
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("中止物件 =");   // "Cancel Object ="
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("中斷恢復");   // "Outage Recovery"
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("從記憶卡上列印");     // "Print from SD"
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("無記憶卡");     // "No SD card"
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("休眠 ...");     // "Sleep..."
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("點擊繼續 ...");     // "Click to resume..."
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("錯誤: EEPROM CRC");    //"Err: EEPROM CRC"
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("錯誤: EEPROM Index");    //"Err: EEPROM Index"
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("錯誤: EEPROM Version");    //"EEPROM Version"
+  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("媒體更新");    //"Media Update"
+  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("重置打印機");    //"Reset Printer
+  PROGMEM Language_Str MSG_REFRESH                         = _UxGT("刷新");     //"Refresh"
+  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("資訊界面");     //"Info screen"
+  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("準備");     //"Prepare"
+  PROGMEM Language_Str MSG_TUNE                            = _UxGT("調整");     //"Tune"
+  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("開始列印");   //"Start Print"
+  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("下一個");   //"Next"
+  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("初始  ");   //"Init"
+  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("停止  ");   //"Stop"
+  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("列印  ");   //"Print"
+  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("復歸  ");   //"Reset"
+  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("放棄  ");   //"Cancel"
+  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("確認  ");   //"Done"
+  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("返回  ");   //"Back"
+  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("繼續  ");   //"Proceed"
+  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("暫停列印");     //"Pause print"
+  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("恢復列印");     //"Resume print"
+  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("停止列印");     //"Stop print"
+  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("列印物件");   //"Printing Object"
+  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("中止物件");   //"Cancel Object"
+  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("中止物件 =");   //"Cancel Object ="
+  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("中斷恢復");   //"Outage Recovery"
+  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("從記憶卡上列印");     //"Print from SD"
+  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("無記憶卡");     //"No SD card"
+  PROGMEM Language_Str MSG_DWELL                           = _UxGT("休眠 ...");     //"Sleep..."
+  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("點擊繼續 ...");     //"Click to resume..."
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("列印已暫停");     // "Print paused"
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("列印中 ...");   // "Printing..."
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消列印");     // "Print aborted"
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("無移動");     // "No move."
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("已砍掉");     // "KILLED. "
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     // "STOPPED. "
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回縮長度mm");     // "Retract mm" retract_length, retract length (positive mm)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("換手回抽長度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回縮速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回縮恢復長度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("換手回縮恢復長度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回縮恢復後進料速率mm/s");     // "Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
+  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("列印中 ...");   //"Printing..."
+  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消列印");     //"Print aborted"
+  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("無移動");     //"No move."
+  PROGMEM Language_Str MSG_KILLED                          = _UxGT("已砍掉");     //"KILLED. "
+  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     //"STOPPED. "
+  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回縮長度mm");     //"Retract mm" retract_length, retract length (positive mm)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("換手回抽長度mm");     //"Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
+  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回縮速率mm/s");     //"Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     //"Hop mm" retract_zraise, retract Z-lift
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回縮恢復長度mm");     //"UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("換手回縮恢復長度mm");     //"S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回縮恢復後進料速率mm/s");     //"Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");     // "S UnRet V"
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("自動回縮");     // "Auto-Retract" autoretract_enabled,
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("交換長度");    // "Swap Length"
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("清除長度");   // "Purge Length"
+  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("自動回縮");     //"Auto-Retract" autoretract_enabled,
+  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("交換長度");    //"Swap Length"
+  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("清除長度");   //"Purge Length"
   PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("交換工具"); //"Tool Change"
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z軸提昇");    // "Z Raise"
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("最高速度");    // "Prime Speed"
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("收回速度");  // "Retract Speed"
+  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z軸提昇");    //"Z Raise"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("最高速度");    //"Prime Speed"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("收回速度");  //"Retract Speed"
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("噴嘴待機"); //"Nozzle Standby"
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更換絲料");     // "Change filament"
+  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更換絲料");     //"Change filament"
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更換絲料 *");
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("裝載絲料");     // "Load filament"
   PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("裝載絲料 *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("卸載絲料");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("卸載絲料 *");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("卸載全部");     // "Unload All"
-  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("初始化記憶卡");     // "Init. SD card"
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("連接記憶卡");     // "Attach Media
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更換記憶卡");     // "Change SD card"
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("釋放媒體");   // "Release Media"
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探針在熱床之外");     // "Z probe out. bed" Z probe is not within the physical limits
+  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("初始化記憶卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("連接記憶卡");     //"Attach Media
+  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更換記憶卡");     //"Change SD card"
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("釋放媒體");   //"Release Media"
+  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探針在熱床之外");     //"Z probe out. bed" Z probe is not within the physical limits
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("偏斜因數");     // "Skew Factor"
 
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch 自檢");     // "BLTouch Self-Test"
@@ -379,39 +367,39 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("裝載BLTouch");     // "Stow BLTouch"
   PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署BLTouch");     // "Deploy BLTouch"
 
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("歸位 %s%s%s 先");     // "Home ... first"
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("歸位 %s%s%s 先");     //"Home ... first"
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("探針偏移");   //Probe Offsets
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("探針X偏移量");   //Probe X Offset
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("探針Y偏移量");   //Probe Y Offset
   PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("探針Z偏移量");   //Probe Z Offset
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("微量調整X軸");     // "Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("微量調整Y軸");     // "Babystep Y"
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("微量調整Z軸");     // "Babystep Z"
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("總計");    // "Total"
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("擋塊終止");     // "Endstop abort"
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("加熱失敗");     // "Heating failed"
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("錯誤：冗餘溫度");     // "Err: REDUNDANT TEMP"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("溫度失控");    // "THERMAL RUNAWAY"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("熱床溫度失控");    // "BED THERMAL RUNAWAY"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("機箱溫度失控");   // "CHAMBER T. RUNAWAY"
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("錯誤：最高溫度");     // "Err: MAXTEMP"
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("錯誤：最低溫度");     // "Err: MINTEMP"
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("印表機停機");     // "PRINTER HALTED"
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     // "Please reset"
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     // "d" // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("時");     // "h" // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("分");     // "m" // One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("加熱中 ...");     // "Heating..."
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("冷卻中 ...");   // "Cooling..."
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加熱熱床中 ...");     // "Bed Heating..."
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("熱床冷卻中 ...");   // "Bed Cooling..."
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("機箱加熱中 ..");   // "Chamber Heating..."
+  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("微量調整X軸");     //"Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
+  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("微量調整Y軸");     //"Babystep Y"
+  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("微量調整Z軸");     //"Babystep Z"
+  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("總計");    //"Total"
+  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("擋塊終止");     //"Endstop abort"
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("加熱失敗");     //"Heating failed"
+  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("錯誤：冗餘溫度");     //"Err: REDUNDANT TEMP"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("溫度失控");    //"THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("熱床溫度失控");    //"BED THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("機箱溫度失控");   //"CHAMBER T. RUNAWAY"
+  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("錯誤：最高溫度");     //"Err: MAXTEMP"
+  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("錯誤：最低溫度");     //"Err: MINTEMP"
+  PROGMEM Language_Str MSG_HALTED                          = _UxGT("印表機停機");     //"PRINTER HALTED"
+  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     //"Please reset"
+  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     //"d" // One character only
+  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("時");     //"h" // One character only
+  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("分");     //"m" // One character only
+  PROGMEM Language_Str MSG_HEATING                         = _UxGT("加熱中 ...");     //"Heating..."
+  PROGMEM Language_Str MSG_COOLING                         = _UxGT("冷卻中 ...");   //"Cooling..."
+  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加熱熱床中 ...");     //"Bed Heating..."
+  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("熱床冷卻中 ...");   //"Bed Cooling..."
+  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("機箱加熱中 ..");   //"Chamber Heating..."
   PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("機箱冷卻中 ...");   //Chamber Cooling...
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("⊿校準");     // "Delta Calibration"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("⊿校準X");     // "Calibrate X"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("⊿校準Y");     // "Calibrate Y"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校準Z");     // "Calibrate Z"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校準中心");     // "Calibrate Center"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("⊿校準");     //"Delta Calibration"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("⊿校準X");     //"Calibrate X"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("⊿校準Y");     //"Calibrate Y"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校準Z");     //"Calibrate Z"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校準中心");     //"Calibrate Center"
   PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("⊿設置");     // "Delta Settings"
   PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("⊿自動校準");     // "Auto Calibration"
   PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("設置⊿高度");     // "Set Delta Height"
@@ -419,63 +407,61 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("⊿斜柱");     // "Diag Rod"
   PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("⊿高度");     // "Height"
   PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("⊿半徑");     // "Radius"
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("關於印表機");     // "About Printer"
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("印表機訊息");     // "Printer Info"
+  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("關於印表機");     //"About Printer"
+  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("印表機訊息");     //"Printer Info"
   PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("三點調平");     // "3-Point Leveling"
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("線性調平");     // "Linear Leveling"
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("      雙線性調平");     // "Bilinear Leveling"
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("網格調平");     // "Mesh Leveling"
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("印表機統計");     // "Printer Stats"
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("主板訊息");     // "Board Info"
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("溫度計");     // "Thermistors"
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("      擠出機");     // "Extruders"
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("傳輸率");     // "Baud"
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("協議");     // "Protocol"
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("監測溫度失控:關");   // "Runaway Watch: OFF"
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("監測溫度失控:開");    // "Runaway Watch: ON"
+  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("印表機統計");     //"Printer Stats"
+  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("主板訊息");     //"Board Info"
+  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("溫度計");     //"Thermistors"
+  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("      擠出機");     //"Extruders"
+  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("傳輸率");     //"Baud"
+  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("協議");     //"Protocol"
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("監測溫度失控:關");   //"Runaway Watch: OFF"
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("監測溫度失控:開");    //"Runaway Watch: ON"
 
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("外殼燈");     // "Case light"
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("燈亮度");     // "Light BRIGHTNESS"
   PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("打印機不正確");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印計數");     // "Print Count"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("已完成");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總列印時間");     // "Total print time"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長工作時間");     // "Longest job time"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("總計擠出");     // "Extruded total"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印計數");     //"Print Count"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("已完成");     //"Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總列印時間");     //"Total print time"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長工作時間");     //"Longest job time"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("總計擠出");     //"Extruded total"
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印數");     // "Prints"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總共");     // "Total"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長");     // "Longest"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已擠出");     // "Extruded"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印數");     //"Prints"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     //"Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總共");     //"Total"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長");     //"Longest"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已擠出");     //"Extruded"
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低溫度");     // "Min Temp"
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高溫度");     // "Max Temp"
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("電源供應");     // "Power Supply"
+  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低溫度");     //"Min Temp"
+  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高溫度");     //"Max Temp"
+  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("電源供應");     //"Power Supply"
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("驅動力度");     // "Drive Strength"
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" 驅動 %");    // X Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" 驅動 %");    // Y Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" 驅動 %");    // Z Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" 驅動 %");    // I Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" 驅動 %");    // J Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 驅動 %");    // K Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT                     = _UxGT("驅動 %");     // "Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X 驅動 %");    //X Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y 驅動 %");    //Y Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z 驅動 %");    //Z Driver %
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驅動 %");    //E Driver %
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC連接錯誤");   // "TMC CONNECTION ERROR"
+  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC連接錯誤");   //"TMC CONNECTION ERROR"
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("保存驅動設置");     // "DAC EEPROM Write"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("更換絲料");   // "FILAMENT CHANGE"
+  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("更換絲料");   //"FILAMENT CHANGE"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("列印已暫停");     // "PRINT PAUSED"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("裝載絲料");     // "LOAD FILAMENT"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("卸載絲料");     // "UNLOAD FILAMENT"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("恢複選項:");     // "RESUME OPTIONS:"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("清除更多");     // "Purge more"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("恢復列印");     // "Resume print"
+  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("恢復列印");     //"Resume print"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  噴嘴: ");     // "  Nozzle: "
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("斷絲偵測");    // "Runout Sensor"
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("絲距離mm");   // "Runout Dist mm"
+  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("斷絲偵測");    //"Runout Sensor"
+  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("絲距離mm");   //"Runout Dist mm"
   PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("歸原位失敗");     // "Homing failed"
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探針探測失敗");     // "Probing failed"
 
@@ -485,28 +471,28 @@ namespace Language_zh_TW {
   //
   #if LCD_HEIGHT >= 4
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("按下按鈕", "恢復列印")); //"Press Button to resume print"
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停車中 ..."));   // "Parking..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("等待開始", "絲料", "變更"));     // "Wait for start of the filament change"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("等待", "卸下絲料"));     // "Wait for filament unload"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("插入絲料", "並按鍵", "繼續 ..."));     // "Insert filament and press button to continue..."
+    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停車中 ..."));   //"Parking..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("等待開始", "絲料", "變更"));     //"Wait for start of the filament change"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("等待", "卸下絲料"));     //"Wait for filament unload"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("插入絲料", "並按鍵", "繼續 ..."));     //"Insert filament and press button to continue..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("按下按鈕", "加熱噴嘴."));     // "Press button to heat nozzle."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("加熱噴嘴", "請等待 ..."));     // "Heating nozzle Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("等待", "進料"));     // "Wait for filament load"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("等待", "進料"));     //"Wait for filament load"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("等待", "絲料清除"));     // "Wait for filament purge"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("按下完成","絲料清除")); //"Press button to filament purge"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("等待列印", "恢復"));     // "Wait for print to resume"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("等待列印", "恢復"));     //"Wait for print to resume"
   #else // LCD_HEIGHT < 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下繼續.."));   // "Click to continue"
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停車中 ..."));     // "Parking..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("請等待 ..."));     // "Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入並點擊"));     // "Insert and Click"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("按下加熱.."));     // "Click to heat"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("加熱中 ..."));     // "Heating..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     // "Ejecting..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("載入中 ..."));     // "Loading..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("清除中 ..."));     // "Purging..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成.."));     // "Click to finish"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢復中 ..."));     // "Resuming..."
+    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下繼續.."));   //"Click to continue"
+    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停車中 ..."));     //"Parking..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("請等待 ..."));     //"Please wait..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入並點擊"));     //"Insert and Click"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("按下加熱.."));     //"Click to heat"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("加熱中 ..."));     //"Heating..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     //"Ejecting..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("載入中 ..."));     //"Loading..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("清除中 ..."));     //"Purging..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成.."));     //"Click to finish"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢復中 ..."));     //"Resuming..."
   #endif // LCD_HEIGHT < 4
 }
 
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index b2c9395..eef27db 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -26,7 +26,7 @@
 
 #include "../inc/MarlinConfigPre.h"
 
-#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
+#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT
 
 #include "marlinui.h"
 #include "lcdprint.h"
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index f6ac818..32d958b 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -34,21 +34,7 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if IS_DWIN_MARLINUI
-
-  #include "e3v2/marlinui/marlinui_dwin.h"
-
-  #define LCD_PIXEL_WIDTH     DWIN_WIDTH
-  #define LCD_PIXEL_HEIGHT    DWIN_HEIGHT
-  #define LCD_WIDTH           ((LCD_PIXEL_WIDTH)  / (MENU_FONT_WIDTH))
-  #define LCD_HEIGHT          ((LCD_PIXEL_HEIGHT) / (MENU_LINE_HEIGHT))
-
-  // The DWIN lcd_moveto function uses row / column, not pixels
-  #define LCD_COL_X(col)    (col)
-  #define LCD_ROW_Y(row)    (row)
-  #define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))
-
-#elif HAS_MARLINUI_U8GLIB
+#if HAS_MARLINUI_U8GLIB
 
   #include "dogm/u8g_fontutf8.h"
   typedef u8g_uint_t lcd_uint_t;
@@ -119,10 +105,7 @@
   #define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
 #endif
 
-#ifndef LCD_COL_X_RJ
-  #define LCD_COL_X_RJ(len)    (LCD_PIXEL_WIDTH - LCD_COL_X(len))
-#endif
-
+#define LCD_COL_X_RJ(len)      (LCD_PIXEL_WIDTH - LCD_COL_X(len))
 #define SETCURSOR(col, row)    lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
 #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
 #define SETCURSOR_X(col)       SETCURSOR(col, _lcdLineNr)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index b1cb030..438a7ee 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -32,7 +32,7 @@
   #include "../feature/host_actions.h"
 #endif
 
-#if BOTH(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU)
+#if ENABLED(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU)
   #include "../feature/password/password.h"
 #endif
 
@@ -48,10 +48,6 @@ MarlinUI ui;
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "e3v2/enhanced/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(LCD_PROGRESS_BAR) && !IS_TFTGLCD_PANEL
@@ -103,8 +99,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     backlight = !!value;
     if (backlight) brightness = constrain(value, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS);
     // Set brightness on enabled LCD here
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_LCD_Brightness(brightness));
-    TERN_(DWIN_CREALITY_LCD_JYERSUI, DWIN_LCD_Brightness(backlight ? brightness : 0));
   }
 #endif
 
@@ -142,21 +136,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   bool MarlinUI::lcd_clicked;
 #endif
 
-#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
-
-  bool MarlinUI::get_blink() {
-    static uint8_t blink = 0;
-    static millis_t next_blink_ms = 0;
-    millis_t ms = millis();
-    if (ELAPSED(ms, next_blink_ms)) {
-      blink ^= 0xFF;
-      next_blink_ms = ms + 1000 - (LCD_UPDATE_INTERVAL) / 2;
-    }
-    return blink != 0;
-  }
-
-#endif
-
 #if HAS_WIRED_LCD
 
   #if HAS_MARLINUI_U8GLIB
@@ -191,10 +170,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #include "../feature/power_monitor.h"
   #endif
 
-  #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
-    #include "../feature/power.h"
-  #endif
-
   #if HAS_ENCODER_ACTION
     volatile uint8_t MarlinUI::buttons;
     #if HAS_SLOW_BUTTONS
@@ -223,10 +198,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     bool MarlinUI::drawing_screen, MarlinUI::first_page; // = false
   #endif
 
-  #if IS_DWIN_MARLINUI
-    bool MarlinUI::did_first_redraw;
-  #endif
-
   // Encoder Handling
   #if HAS_ENCODER_ACTION
     uint32_t MarlinUI::encoderPosition;
@@ -360,7 +331,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
           col = (LCD_WIDTH - plen - slen) / 2;
           row = LCD_HEIGHT > 3 ? 1 : 0;
         }
-        if (LCD_HEIGHT >= 8) row = LCD_HEIGHT / 2 - 2;
         wrap_string_P(col, row, pref, true);
         if (string) {
           if (col) { col = 0; row++; } // Move to the start of the next line
@@ -436,6 +406,17 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN_(HAS_ENCODER_ACTION, encoderDiff = 0);
   }
 
+  bool MarlinUI::get_blink() {
+    static uint8_t blink = 0;
+    static millis_t next_blink_ms = 0;
+    millis_t ms = millis();
+    if (ELAPSED(ms, next_blink_ms)) {
+      blink ^= 0xFF;
+      next_blink_ms = ms + 1000 - (LCD_UPDATE_INTERVAL) / 2;
+    }
+    return blink != 0;
+  }
+
   ////////////////////////////////////////////
   ///////////// Keypad Handling //////////////
   ////////////////////////////////////////////
@@ -673,20 +654,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     draw_kill_screen();
   }
 
-  #if HAS_TOUCH_SLEEP
-    #if HAS_TOUCH_BUTTONS
-      #include "touch/touch_buttons.h"
-    #else
-      #include "tft/touch.h"
-    #endif
-    // Wake up a sleeping TFT
-    void MarlinUI::wakeup_screen() {
-      TERN(HAS_TOUCH_BUTTONS, touchBt.wakeUp(), touch.wakeUp());
-    }
-  #endif
-
   void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
-    TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up the TFT with most buttons
+
     TERN_(HAS_LCD_MENU, refresh());
 
     #if HAS_ENCODER_ACTION
@@ -790,7 +759,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
             TERN_(MULTI_E_MANUAL, axis == E_AXIS ? e_index :) active_extruder
           );
 
-          //SERIAL_ECHOLNPGM("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
+          //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
 
           axis = NO_AXIS_ENUM;
 
@@ -807,7 +776,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       TERN_(MULTI_E_MANUAL, if (move_axis == E_AXIS) e_index = eindex);
       start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
       axis = move_axis;
-      //SERIAL_ECHOLNPGM("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
+      //SERIAL_ECHOLNPAIR("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
     }
 
     #if ENABLED(AUTO_BED_LEVELING_UBL)
@@ -869,8 +838,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     static uint16_t max_display_update_time = 0;
     millis_t ms = millis();
 
-    #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
-      leds.update_timeout(powerManager.psu_on);
+    #ifdef LED_BACKLIGHT_TIMEOUT
+      leds.update_timeout(powersupply_on);
     #endif
 
     #if HAS_LCD_MENU
@@ -938,7 +907,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
         if (on_status_screen()) next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
 
-        TERN_(HAS_ENCODER_ACTION, touch_buttons = touchBt.read_buttons());
+        TERN_(HAS_ENCODER_ACTION, touch_buttons = touch.read_buttons());
 
       #endif
 
@@ -967,7 +936,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
             abs_diff = epps;                                            // Treat as a full step size
             encoderDiff = (encoderDiff < 0 ? -1 : 1) * abs_diff;        // ...in the spin direction.
           }
-          TERN_(HAS_TOUCH_SLEEP, if (lastEncoderDiff != encoderDiff) wakeup_screen());
           lastEncoderDiff = encoderDiff;
         #endif
 
@@ -994,10 +962,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
                   //#define ENCODER_RATE_MULTIPLIER_DEBUG
                   #if ENABLED(ENCODER_RATE_MULTIPLIER_DEBUG)
                     SERIAL_ECHO_START();
-                    SERIAL_ECHOPGM("Enc Step Rate: ", encoderStepRate);
-                    SERIAL_ECHOPGM("  Multiplier: ", encoderMultiplier);
-                    SERIAL_ECHOPGM("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
-                    SERIAL_ECHOPGM("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
+                    SERIAL_ECHOPAIR("Enc Step Rate: ", encoderStepRate);
+                    SERIAL_ECHOPAIR("  Multiplier: ", encoderMultiplier);
+                    SERIAL_ECHOPAIR("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
+                    SERIAL_ECHOPAIR("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
                     SERIAL_EOL();
                   #endif
                 }
@@ -1020,8 +988,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
           refresh(LCDVIEW_REDRAW_NOW);
 
-          #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
-            if (!powerManager.psu_on) leds.reset_timeout(ms);
+          #ifdef LED_BACKLIGHT_TIMEOUT
+            if (!powersupply_on) leds.reset_timeout(ms);
           #endif
         }
 
@@ -1101,9 +1069,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
           run_current_screen();
 
-          // Apply all DWIN drawing after processing
-          TERN_(IS_DWIN_MARLINUI, DWIN_UpdateLCD());
-
         #endif
 
         TERN_(HAS_LCD_MENU, lcd_clicked = false);
@@ -1444,7 +1409,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   void MarlinUI::set_alert_status_P(PGM_P const message) {
     set_status_P(message, 1);
-    TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
@@ -1468,7 +1432,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
         UNUSED(persist);
       #endif
 
-      #if BASIC_PROGRESS_BAR || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+      #if ENABLED(LCD_PROGRESS_BAR) || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
         const millis_t ms = millis();
       #endif
 
@@ -1491,8 +1455,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #endif
 
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
-    TERN_(HAS_DWIN_E3V2_BASIC, DWIN_StatusChanged(status_message));
-    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
+    TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
   }
 
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
@@ -1535,13 +1498,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
-  #if BOTH(PSU_CONTROL, PS_OFF_CONFIRM)
-    void MarlinUI::poweroff() {
-      queue.inject_P(PSTR("M81"));
-      goto_previous_screen();
-    }
-  #endif
-
   void MarlinUI::flow_fault() {
     LCD_ALERTMESSAGEPGM(MSG_FLOWMETER_FAULT);
     TERN_(HAS_BUZZER, buzz(1000, 440));
@@ -1558,7 +1514,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       defer_status_screen();
     #endif
 
-    TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("UI Pause"), PSTR("Resume")));
 
     LCD_MESSAGEPGM(MSG_PRINT_PAUSED);
@@ -1718,8 +1673,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     const PauseMode mode/*=PAUSE_MODE_SAME*/,
     const uint8_t extruder/*=active_extruder*/
   ) {
+    if (mode == PAUSE_MODE_SAME)
+      return;
     pause_mode = mode;
-    ExtUI::pauseModeStatus = message;
     switch (message) {
       case PAUSE_MESSAGE_PARKING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PAUSE_PRINT_PARKING));
       case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INIT));
@@ -1728,7 +1684,11 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       case PAUSE_MESSAGE_INSERT:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INSERT));
       case PAUSE_MESSAGE_LOAD:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_LOAD));
       case PAUSE_MESSAGE_PURGE:
-        ExtUI::onUserConfirmRequired_P(GET_TEXT(TERN(ADVANCED_PAUSE_CONTINUOUS_PURGE, MSG_FILAMENT_CHANGE_CONT_PURGE, MSG_FILAMENT_CHANGE_PURGE)));
+        #if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE)
+          ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_CONT_PURGE));
+        #else
+          ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE));
+        #endif
       case PAUSE_MESSAGE_RESUME:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME));
       case PAUSE_MESSAGE_HEAT:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEAT));
       case PAUSE_MESSAGE_HEATING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING));
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 49ecd89..e01f7d7 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -21,11 +21,12 @@
  */
 #pragma once
 
-#include "../module/motion.h"
-#include "buttons.h"
-
 #include "../inc/MarlinConfig.h"
 
+#include "../module/motion.h"
+
+#include "buttons.h"
+
 #if HAS_BUZZER
   #include "../libs/buzzer.h"
 #endif
@@ -54,17 +55,11 @@
   #include "../module/printcounter.h"
 #endif
 
-#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
+#if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
   #include "../feature/pause.h"
   #include "../module/motion.h" // for active_extruder
 #endif
 
-#if ENABLED(DWIN_CREALITY_LCD)
-  #include "e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "e3v2/enhanced/dwin.h"
-#endif
-
 #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80U)
 
 #if HAS_WIRED_LCD
@@ -81,6 +76,8 @@
     uint8_t get_ADC_keyValue();
   #endif
 
+  #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
+
   #if HAS_LCD_MENU
 
     #include "lcdprint.h"
@@ -98,10 +95,6 @@
 
 #endif // HAS_WIRED_LCD
 
-#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
-  #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
-#endif
-
 #if HAS_MARLINUI_U8GLIB
   enum MarlinFont : uint8_t {
     FONT_STATUSMENU = 1,
@@ -262,7 +255,7 @@ public:
     FORCE_INLINE static void refresh_brightness() { set_brightness(brightness); }
   #endif
 
-  #if HAS_DWIN_E3V2_BASIC
+  #if ENABLED(DWIN_CREALITY_LCD)
     static void refresh();
   #else
     FORCE_INLINE static void refresh() {
@@ -320,7 +313,7 @@ public:
 
   #if HAS_STATUS_MESSAGE
 
-    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
+    #if HAS_WIRED_LCD
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
         #define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH))
       #else
@@ -356,12 +349,6 @@ public:
     static inline void reset_alert_level() {}
   #endif
 
-  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
-    static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
-  #else
-    static inline void kill_screen(PGM_P const, PGM_P const) {}
-  #endif
-
   #if HAS_DISPLAY
 
     static void init();
@@ -372,14 +359,6 @@ public:
     static void resume_print();
     static void flow_fault();
 
-    #if BOTH(PSU_CONTROL, PS_OFF_CONFIRM)
-      static void poweroff();
-    #endif
-
-    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
-      static bool get_blink();
-    #endif
-
     #if HAS_WIRED_LCD
 
       static millis_t next_button_update_ms;
@@ -404,22 +383,22 @@ public:
       #endif
 
       #if HAS_MARLINUI_U8GLIB
+
         static void set_font(const MarlinFont font_nr);
-      #elif IS_DWIN_MARLINUI
-        static void set_font(const uint8_t font_nr);
-      #endif
 
-      #if HAS_MARLINUI_HD44780
+      #else
+
         static void set_custom_characters(const HD44780CharSet screen_charset=CHARSET_INFO);
-      #endif
 
-      #if ENABLED(LCD_PROGRESS_BAR) && !HAS_MARLINUI_U8GLIB
-        static millis_t progress_bar_ms;  // Start time for the current progress bar cycle
-        static void draw_progress_bar(const uint8_t percent);
-        #if PROGRESS_MSG_EXPIRE > 0
-          static millis_t expire_status_ms; // = 0
-          FORCE_INLINE static void reset_progress_bar_timeout() { expire_status_ms = 0; }
+        #if ENABLED(LCD_PROGRESS_BAR)
+          static millis_t progress_bar_ms;  // Start time for the current progress bar cycle
+          static void draw_progress_bar(const uint8_t percent);
+          #if PROGRESS_MSG_EXPIRE > 0
+            static millis_t expire_status_ms; // = 0
+            FORCE_INLINE static void reset_progress_bar_timeout() { expire_status_ms = 0; }
+          #endif
         #endif
+
       #endif
 
       static uint8_t lcd_status_update_delay;
@@ -434,15 +413,11 @@ public:
         static millis_t next_filament_display;
       #endif
 
-      #if HAS_TOUCH_SLEEP
-        static void wakeup_screen();
-      #endif
-
       static void quick_feedback(const bool clear_buttons=true);
       #if HAS_BUZZER
         static void completion_feedback(const bool good=true);
       #else
-        static inline void completion_feedback(const bool=true) { TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); }
+        static inline void completion_feedback(const bool=true) {}
       #endif
 
       #if DISABLED(LIGHTWEIGHT_UI)
@@ -468,10 +443,8 @@ public:
       static constexpr bool drawing_screen = false, first_page = true;
     #endif
 
-    #if IS_DWIN_MARLINUI
-      static bool did_first_redraw;
-    #endif
-
+    static bool get_blink();
+    static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
     static void draw_kill_screen();
 
   #else // No LCD
@@ -599,7 +572,7 @@ public:
     static inline bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static inline void _pause_show_message() {}
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index a177f32..01c8bb8 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -179,8 +179,6 @@ bool printer_busy() {
 void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, const uint8_t top/*=0*/, const uint8_t items/*=0*/) {
   if (currentScreen != screen) {
 
-    TERN_(IS_DWIN_MARLINUI, did_first_redraw = false);
-
     TERN_(HAS_TOUCH_BUTTONS, repeat_delay = BUTTON_DELAY_MENU);
 
     TERN_(LCD_SET_PROGRESS_MANUALLY, progress_reset());
@@ -285,7 +283,6 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
 
 #if HAS_BUZZER
   void MarlinUI::completion_feedback(const bool good/*=true*/) {
-    TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
     if (good) {
       BUZZ(100, 659);
       BUZZ(100, 698);
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 7b253ad..28d377d 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -39,7 +39,7 @@ typedef void (*selectFunc_t)();
 #define SS_INVERT  0x02
 #define SS_DEFAULT SS_CENTER
 
-#if EITHER(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI) && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
+#if HAS_MARLINUI_U8GLIB && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
   void _lcd_zoffset_overlay_gfx(const_float_t zvalue);
 #endif
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 8834ee6..4ae38ed 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -68,7 +68,7 @@ void menu_backlash();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); })
-    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(A), EDIT_DAC_PERCENT(B), EDIT_DAC_PERCENT(C), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K));
+    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(X), EDIT_DAC_PERCENT(Y), EDIT_DAC_PERCENT(Z), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K));
     ACTION_ITEM(MSG_DAC_EEPROM_WRITE, stepper_dac.commit_eeprom);
     END_MENU();
   }
@@ -569,7 +569,9 @@ void menu_advanced_settings() {
       SUBMENU(MSG_JERK, menu_advanced_jerk);
     #elif HAS_JUNCTION_DEVIATION
       EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f
-        OPTARG(LIN_ADVANCE, planner.recalculate_max_e_jerk)
+        #if ENABLED(LIN_ADVANCE)
+          , planner.recalculate_max_e_jerk
+        #endif
       );
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index ea9ef75..82f25ea 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -172,7 +172,7 @@ static void _lcd_level_bed_corners_get_next_position() {
 
     TERN_(HAS_MARLINUI_U8GLIB, ui.set_font(FONT_MENU)); // Set up the font for extra info
 
-    MenuItem_static::draw(0, GET_TEXT(MSG_PROBING_POINT), SS_INVERT); // "Probing Mesh" heading
+    MenuItem_static::draw(0, GET_TEXT(MSG_PROBING_MESH), SS_INVERT); // "Probing Mesh" heading
 
     uint8_t cy = TERN(TFT_COLOR_UI, 3, LCD_HEIGHT - 1), y = LCD_ROW_Y(cy);
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 44c99dd..7ea355b 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -217,7 +217,7 @@ void menu_advanced_settings();
 
   #if ENABLED(BLTOUCH_LCD_VOLTAGE_MENU)
     void bltouch_report() {
-      SERIAL_ECHOLNPGM("EEPROM Last BLTouch Mode - ", bltouch.last_written_mode);
+      SERIAL_ECHOLNPAIR("EEPROM Last BLTouch Mode - ", bltouch.last_written_mode);
       SERIAL_ECHOLNPGM("Configuration BLTouch Mode - " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD"));
       char mess[21];
       strcpy_P(mess, PSTR("BLTouch Mode - "));
@@ -353,6 +353,11 @@ void menu_advanced_settings();
 
     #define HAS_CUSTOM_ITEM_CONF(N) (defined(CONFIG_MENU_ITEM_##N##_DESC) && defined(CONFIG_MENU_ITEM_##N##_GCODE))
 
+    #define CUSTOM_TEST_CONF(N) do{ \
+      constexpr char c = CONFIG_MENU_ITEM_##N##_GCODE[strlen(CONFIG_MENU_ITEM_##N##_GCODE) - 1]; \
+      static_assert(c != '\n' && c != '\r', "CONFIG_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
+    }while(0)
+
     #ifdef CUSTOM_MENU_CONFIG_SCRIPT_DONE
       #define _DONE_SCRIPT "\n" CUSTOM_MENU_CONFIG_SCRIPT_DONE
     #else
@@ -360,97 +365,115 @@ void menu_advanced_settings();
     #endif
     #define GCODE_LAMBDA_CONF(N) []{ _lcd_custom_menus_configuration_gcode(PSTR(CONFIG_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
     #define _CUSTOM_ITEM_CONF(N) ACTION_ITEM_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_CONF(N));
-    #define _CUSTOM_ITEM_CONF_CONFIRM(N)               \
+    #define _CUSTOM_ITEM_CONF_CONFIRM(N)             \
       SUBMENU_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), []{ \
-          MenuItem_confirm::confirm_screen(            \
-            GCODE_LAMBDA_CONF(N),                      \
-            ui.goto_previous_screen,                   \
+          MenuItem_confirm::confirm_screen(          \
+            GCODE_LAMBDA_CONF(N),                    \
+            ui.goto_previous_screen,                 \
             PSTR(CONFIG_MENU_ITEM_##N##_DESC "?")      \
-          );                                           \
+          );                                         \
         })
 
-    #define CUSTOM_ITEM_CONF(N) do{ \
-      constexpr char c = CONFIG_MENU_ITEM_##N##_GCODE[strlen(CONFIG_MENU_ITEM_##N##_GCODE) - 1]; \
-      static_assert(c != '\n' && c != '\r', "CONFIG_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
-      if (ENABLED(CONFIG_MENU_ITEM_##N##_CONFIRM)) \
-        _CUSTOM_ITEM_CONF_CONFIRM(N); \
-      else \
-        _CUSTOM_ITEM_CONF(N); \
-    }while(0)
+    #define CUSTOM_ITEM_CONF(N) do{ if (ENABLED(CONFIG_MENU_ITEM_##N##_CONFIRM)) _CUSTOM_ITEM_CONF_CONFIRM(N); else _CUSTOM_ITEM_CONF(N); }while(0)
 
     #if HAS_CUSTOM_ITEM_CONF(1)
+      CUSTOM_TEST_CONF(1);
       CUSTOM_ITEM_CONF(1);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(2)
+      CUSTOM_TEST_CONF(2);
       CUSTOM_ITEM_CONF(2);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(3)
+      CUSTOM_TEST_CONF(3);
       CUSTOM_ITEM_CONF(3);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(4)
+      CUSTOM_TEST_CONF(4);
       CUSTOM_ITEM_CONF(4);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(5)
+      CUSTOM_TEST_CONF(5);
       CUSTOM_ITEM_CONF(5);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(6)
+      CUSTOM_TEST_CONF(6);
       CUSTOM_ITEM_CONF(6);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(7)
+      CUSTOM_TEST_CONF(7);
       CUSTOM_ITEM_CONF(7);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(8)
+      CUSTOM_TEST_CONF(8);
       CUSTOM_ITEM_CONF(8);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(9)
+      CUSTOM_TEST_CONF(9);
       CUSTOM_ITEM_CONF(9);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(10)
+      CUSTOM_TEST_CONF(10);
       CUSTOM_ITEM_CONF(10);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(11)
+      CUSTOM_TEST_CONF(11);
       CUSTOM_ITEM_CONF(11);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(12)
+      CUSTOM_TEST_CONF(12);
       CUSTOM_ITEM_CONF(12);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(13)
+      CUSTOM_TEST_CONF(13);
       CUSTOM_ITEM_CONF(13);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(14)
+      CUSTOM_TEST_CONF(14);
       CUSTOM_ITEM_CONF(14);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(15)
+      CUSTOM_TEST_CONF(15);
       CUSTOM_ITEM_CONF(15);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(16)
+      CUSTOM_TEST_CONF(16);
       CUSTOM_ITEM_CONF(16);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(17)
+      CUSTOM_TEST_CONF(17);
       CUSTOM_ITEM_CONF(17);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(18)
+      CUSTOM_TEST_CONF(18);
       CUSTOM_ITEM_CONF(18);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(19)
+      CUSTOM_TEST_CONF(19);
       CUSTOM_ITEM_CONF(19);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(20)
+      CUSTOM_TEST_CONF(20);
       CUSTOM_ITEM_CONF(20);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(21)
+      CUSTOM_TEST_CONF(21);
       CUSTOM_ITEM_CONF(21);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(22)
+      CUSTOM_TEST_CONF(22);
       CUSTOM_ITEM_CONF(22);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(23)
+      CUSTOM_TEST_CONF(23);
       CUSTOM_ITEM_CONF(23);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(24)
+      CUSTOM_TEST_CONF(24);
       CUSTOM_ITEM_CONF(24);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(25)
+      CUSTOM_TEST_CONF(25);
       CUSTOM_ITEM_CONF(25);
     #endif
     END_MENU();
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index c9bcb89..810f376 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -54,9 +54,9 @@ void _man_probe_pt(const xy_pos_t &xy) {
 
 #if ENABLED(DELTA_AUTO_CALIBRATION)
 
-  #if HAS_RESUME_CONTINUE
-    #include "../../MarlinCore.h" // for wait_for_user_response()
-  #endif
+  #include "../../MarlinCore.h" // for wait_for_user_response()
+  #include "../../gcode/gcode.h"
+
   #if ENABLED(HOST_PROMPT_SUPPORT)
     #include "../../feature/host_actions.h" // for host_prompt_do
   #endif
@@ -66,7 +66,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
     ui.defer_status_screen();
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress")));
-    TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
+    wait_for_user_response();
     ui.goto_previous_screen_no_defer();
     return current_position.z;
   }
@@ -88,9 +88,8 @@ void _man_probe_pt(const xy_pos_t &xy) {
   }
 
   void _goto_tower_a(const_float_t a) {
-    constexpr float dcr = DELTA_PRINTABLE_RADIUS;
     xy_pos_t tower_vec = { cos(RADIANS(a)), sin(RADIANS(a)) };
-    _man_probe_pt(tower_vec * dcr);
+    _man_probe_pt(tower_vec * delta_calibration_radius());
   }
   void _goto_tower_x() { _goto_tower_a(210); }
   void _goto_tower_y() { _goto_tower_a(330); }
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 388aebb..cecccd1 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -106,7 +106,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), SS_LEFT);
-    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_1 != 0
@@ -116,7 +115,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E1 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), SS_LEFT);
-    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_2 != 0
@@ -126,7 +124,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E2 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), SS_LEFT);
-    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_3 != 0
@@ -136,7 +133,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E3 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), SS_LEFT);
-    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_4 != 0
@@ -146,7 +142,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E4 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), SS_LEFT);
-    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_5 != 0
@@ -156,7 +151,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E5 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), SS_LEFT);
-    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_6 != 0
@@ -166,7 +160,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E6 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_6_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_6_MAXTEMP), SS_LEFT);
-    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_7 != 0
@@ -176,6 +169,9 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E7 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_7_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_7_MAXTEMP), SS_LEFT);
+  #endif
+
+  #if HAS_EXTRUDERS
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
@@ -254,7 +250,7 @@ void menu_info_board() {
     STATIC_ITEM(MSG_MARLIN, SS_DEFAULT|SS_INVERT);              // Marlin
     STATIC_ITEM_P(PSTR(SHORT_BUILD_VERSION));                   // x.x.x-Branch
     STATIC_ITEM_P(PSTR(STRING_DISTRIBUTION_DATE));              // YYYY-MM-DD HH:MM
-    STATIC_ITEM_P(PSTR(MACHINE_NAME), SS_DEFAULT|SS_INVERT);    // My3DPrinter
+    STATIC_ITEM_P(PSTR(MACHINE_NAME));                          // My3DPrinter
     STATIC_ITEM_P(PSTR(WEBSITE_URL));                           // www.my3dprinter.com
     PSTRING_ITEM(MSG_INFO_EXTRUDERS, STRINGIFY(EXTRUDERS), SS_CENTER); // Extruders: 2
     #if HAS_LEVELING
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index 3261ecc..284e80c 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -30,10 +30,6 @@
 
 #include "menu_item.h"
 
-#if ENABLED(PSU_CONTROL)
-  #include "../../feature/power.h"
-#endif
-
 #if ENABLED(LED_CONTROL_MENU)
   #include "../../feature/leds/leds.h"
 
@@ -129,7 +125,12 @@ void menu_led() {
   BACK_ITEM(MSG_MAIN);
 
   #if ENABLED(LED_CONTROL_MENU)
-    if (TERN1(PSU_CONTROL, powerManager.psu_on)) {
+    #if ENABLED(PSU_CONTROL)
+      extern bool powersupply_on;
+    #else
+      constexpr bool powersupply_on = true;
+    #endif
+    if (powersupply_on) {
       editable.state = leds.lights_on;
       EDIT_ITEM(bool, MSG_LEDS, &editable.state, leds.toggle);
     }
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 1bf6645..57ee984 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -35,10 +35,6 @@
 #include "../../module/stepper.h"
 #include "../../sd/cardreader.h"
 
-#if ENABLED(PSU_CONTROL)
-  #include "../../feature/power.h"
-#endif
-
 #if HAS_GAMES && DISABLED(LCD_INFO_MENU)
   #include "game/game.h"
 #endif
@@ -118,8 +114,13 @@ void menu_configuration();
 
     #define HAS_CUSTOM_ITEM_MAIN(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
 
-    #ifdef CUSTOM_MENU_MAIN_SCRIPT_DONE
-      #define _DONE_SCRIPT "\n" CUSTOM_MENU_MAIN_SCRIPT_DONE
+    #define CUSTOM_TEST_MAIN(N) do{ \
+      constexpr char c = MAIN_MENU_ITEM_##N##_GCODE[strlen(MAIN_MENU_ITEM_##N##_GCODE) - 1]; \
+      static_assert(c != '\n' && c != '\r', "MAIN_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
+    }while(0)
+
+    #ifdef MAIN_MENU_ITEM_SCRIPT_DONE
+      #define _DONE_SCRIPT "\n" MAIN_MENU_ITEM_SCRIPT_DONE
     #else
       #define _DONE_SCRIPT ""
     #endif
@@ -134,88 +135,106 @@ void menu_configuration();
           );                                         \
         })
 
-    #define CUSTOM_ITEM_MAIN(N) do{ \
-      constexpr char c = MAIN_MENU_ITEM_##N##_GCODE[strlen(MAIN_MENU_ITEM_##N##_GCODE) - 1]; \
-      static_assert(c != '\n' && c != '\r', "MAIN_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
-      if (ENABLED(MAIN_MENU_ITEM_##N##_CONFIRM)) \
-        _CUSTOM_ITEM_MAIN_CONFIRM(N); \
-      else \
-        _CUSTOM_ITEM_MAIN(N); \
-    }while(0)
+    #define CUSTOM_ITEM_MAIN(N) do{ if (ENABLED(MAIN_MENU_ITEM_##N##_CONFIRM)) _CUSTOM_ITEM_MAIN_CONFIRM(N); else _CUSTOM_ITEM_MAIN(N); }while(0)
 
     #if HAS_CUSTOM_ITEM_MAIN(1)
+      CUSTOM_TEST_MAIN(1);
       CUSTOM_ITEM_MAIN(1);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(2)
+      CUSTOM_TEST_MAIN(2);
       CUSTOM_ITEM_MAIN(2);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(3)
+      CUSTOM_TEST_MAIN(3);
       CUSTOM_ITEM_MAIN(3);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(4)
+      CUSTOM_TEST_MAIN(4);
       CUSTOM_ITEM_MAIN(4);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(5)
+      CUSTOM_TEST_MAIN(5);
       CUSTOM_ITEM_MAIN(5);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(6)
+      CUSTOM_TEST_MAIN(6);
       CUSTOM_ITEM_MAIN(6);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(7)
+      CUSTOM_TEST_MAIN(7);
       CUSTOM_ITEM_MAIN(7);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(8)
+      CUSTOM_TEST_MAIN(8);
       CUSTOM_ITEM_MAIN(8);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(9)
+      CUSTOM_TEST_MAIN(9);
       CUSTOM_ITEM_MAIN(9);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(10)
+      CUSTOM_TEST_MAIN(10);
       CUSTOM_ITEM_MAIN(10);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(11)
+      CUSTOM_TEST_MAIN(11);
       CUSTOM_ITEM_MAIN(11);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(12)
+      CUSTOM_TEST_MAIN(12);
       CUSTOM_ITEM_MAIN(12);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(13)
+      CUSTOM_TEST_MAIN(13);
       CUSTOM_ITEM_MAIN(13);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(14)
+      CUSTOM_TEST_MAIN(14);
       CUSTOM_ITEM_MAIN(14);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(15)
+      CUSTOM_TEST_MAIN(15);
       CUSTOM_ITEM_MAIN(15);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(16)
+      CUSTOM_TEST_MAIN(16);
       CUSTOM_ITEM_MAIN(16);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(17)
+      CUSTOM_TEST_MAIN(17);
       CUSTOM_ITEM_MAIN(17);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(18)
+      CUSTOM_TEST_MAIN(18);
       CUSTOM_ITEM_MAIN(18);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(19)
+      CUSTOM_TEST_MAIN(19);
       CUSTOM_ITEM_MAIN(19);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(20)
+      CUSTOM_TEST_MAIN(20);
       CUSTOM_ITEM_MAIN(20);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(21)
+      CUSTOM_TEST_MAIN(21);
       CUSTOM_ITEM_MAIN(21);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(22)
+      CUSTOM_TEST_MAIN(22);
       CUSTOM_ITEM_MAIN(22);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(23)
+      CUSTOM_TEST_MAIN(23);
       CUSTOM_ITEM_MAIN(23);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(24)
+      CUSTOM_TEST_MAIN(24);
       CUSTOM_ITEM_MAIN(24);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(25)
+      CUSTOM_TEST_MAIN(25);
       CUSTOM_ITEM_MAIN(25);
     #endif
     END_MENU();
@@ -366,16 +385,8 @@ void menu_main() {
   // Switch power on/off
   //
   #if ENABLED(PSU_CONTROL)
-    if (powerManager.psu_on)
-      #if ENABLED(PS_OFF_CONFIRM)
-        CONFIRM_ITEM(MSG_SWITCH_PS_OFF,
-          MSG_YES, MSG_NO,
-          ui.poweroff, ui.goto_previous_screen,
-          GET_TEXT(MSG_SWITCH_PS_OFF), (const char *)nullptr, PSTR("?")
-        );
-      #else
-        GCODES_ITEM(MSG_SWITCH_PS_OFF, PSTR("M81"));
-      #endif
+    if (powersupply_on)
+      GCODES_ITEM(MSG_SWITCH_PS_OFF, PSTR("M81"));
     else
       GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));
   #endif
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index 213ad25..8630f48 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -48,7 +48,6 @@ void lcd_sd_updir() {
     goto_screen(menu_media, sd_encoder_position, sd_top_line, sd_items);
     sd_encoder_position = 0xFFFF;
     defer_status_screen();
-    TERN_(HAS_TOUCH_SLEEP, ui.wakeup_screen());
   }
 
 #endif
@@ -127,7 +126,7 @@ void menu_media_filelist() {
     #endif
   }
   else if (card.isMounted())
-    ACTION_ITEM_P(PSTR(LCD_STR_FOLDER " .."), lcd_sd_updir);
+    ACTION_ITEM_P(PSTR(LCD_STR_FOLDER ".."), lcd_sd_updir);
 
   if (ui.should_draw()) for (uint16_t i = 0; i < fileCnt; i++) {
     if (_menuLineNr == _thisItemNr) {
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 948c880..3e7977b 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -320,36 +320,6 @@ void menu_move() {
   END_MENU();
 }
 
-#if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
-  //
-  // "Motion" > "Homing" submenu
-  //
-  void menu_home() {
-    START_MENU();
-    BACK_ITEM(MSG_MOTION);
-
-    GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
-    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
-    #if HAS_Y_AXIS
-      GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
-    #endif
-    #if HAS_Z_AXIS
-      GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
-    #endif
-    #if LINEAR_AXES >= 4
-      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
-    #endif
-    #if LINEAR_AXES >= 5
-      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
-    #endif
-    #if LINEAR_AXES >= 6
-      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
-    #endif
-
-    END_MENU();
-  }
-#endif
-
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   void _lcd_ubl_level_bed();
 #elif ENABLED(LCD_BED_LEVELING)
@@ -377,27 +347,23 @@ void menu_motion() {
   //
   // Auto Home
   //
-  #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
-    SUBMENU(MSG_HOMING, menu_home);
-  #else
-    GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
-    #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
-      GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
-      #if HAS_Y_AXIS
-        GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
-      #endif
-      #if HAS_Z_AXIS
-        GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
-      #endif
-      #if LINEAR_AXES >= 4
-        GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
-      #endif
-      #if LINEAR_AXES >= 5
-        GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
-      #endif
-      #if LINEAR_AXES >= 6
-        GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
-      #endif
+  GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
+  #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
+    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+    #if HAS_Y_AXIS
+      GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+    #endif
+    #if HAS_Z_AXIS
+      GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
+    #endif
+    #if LINEAR_AXES >= 4
+      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
+    #endif
+    #if LINEAR_AXES >= 5
+      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
+    #endif
+    #if LINEAR_AXES >= 6
+      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index 26f555a..a28c614 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -41,7 +41,7 @@
     START_MENU();
     BACK_ITEM(MSG_MAIN);
 
-    #if ENABLED(SPINDLE_LASER_USE_PWM)
+    #if ENABLED(SPINDLE_LASER_PWM)
       // Change the cutter's "current power" value without turning the cutter on or off
       // Power is displayed and set in units and range according to CUTTER_POWER_UNIT
       EDIT_ITEM_FAST(CUTTER_MENU_POWER_TYPE, MSG_CUTTER(POWER), &cutter.menuPower,
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 9bc7991..b5868f4 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -39,10 +39,8 @@
 //#define DEBUG_OUT 1
 #include "../../core/debug_out.h"
 
-static float z_measured[G35_PROBE_COUNT];
-static bool z_isvalid[G35_PROBE_COUNT];
+float z_measured[G35_PROBE_COUNT] = { 0 };
 static uint8_t tram_index = 0;
-static int8_t reference_index; // = 0
 
 #if HAS_LEVELING
   #include "../../feature/bedlevel/bedlevel.h"
@@ -51,32 +49,33 @@ static int8_t reference_index; // = 0
 static bool probe_single_point() {
   do_blocking_move_to_z(TERN(BLTOUCH, Z_CLEARANCE_DEPLOY_PROBE, Z_CLEARANCE_BETWEEN_PROBES));
   // Stow after each point with BLTouch "HIGH SPEED" mode for push-pin safety
-  const float z_probed_height = probe.probe_at_point(tramming_points[tram_index], TERN(BLTOUCH_HS_MODE, PROBE_PT_STOW, PROBE_PT_RAISE), 0, true);
+  const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], TERN(BLTOUCH_HS_MODE, PROBE_PT_STOW, PROBE_PT_RAISE), 0, true);
+  DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm");
   z_measured[tram_index] = z_probed_height;
-  if (reference_index < 0) reference_index = tram_index;
   move_to_tramming_wait_pos();
 
-  DEBUG_ECHOLNPGM("probe_single_point(", tram_index, ") = ", z_probed_height, "mm");
-  return (z_isvalid[tram_index] = !isnan(z_probed_height));
+  return !isnan(z_probed_height);
 }
 
-static void _menu_single_probe() {
-  DEBUG_ECHOLNPGM("Screen: single probe screen Arg:", tram_index);
+static void _menu_single_probe(const uint8_t point) {
+  tram_index = point;
+  DEBUG_ECHOLNPAIR("Screen: single probe screen Arg:", point);
   START_MENU();
   STATIC_ITEM(MSG_BED_TRAMMING, SS_LEFT);
-  STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, z_isvalid[tram_index] ? ftostr42_52(z_measured[reference_index] - z_measured[tram_index]) : "---");
+  STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, ftostr42_52(z_measured[0] - z_measured[point])); // Print diff
   ACTION_ITEM(MSG_UBL_BC_INSERT2, []{ if (probe_single_point()) ui.refresh(); });
-  ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); });
+  ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); }); // Back
   END_MENU();
 }
 
 static void tramming_wizard_menu() {
+  DEBUG_ECHOLNPAIR("Screen: tramming_wizard_menu");
   START_MENU();
   STATIC_ITEM(MSG_SELECT_ORIGIN);
 
   // Draw a menu item for each tramming point
-  for (tram_index = 0; tram_index < G35_PROBE_COUNT; tram_index++)
-    SUBMENU_P((char*)pgm_read_ptr(&tramming_point_name[tram_index]), _menu_single_probe);
+  LOOP_L_N(i, G35_PROBE_COUNT)
+    SUBMENU_N_P(i, (char*)pgm_read_ptr(&tramming_point_name[i]), []{ _menu_single_probe(MenuItemBase::itemIndex); });
 
   ACTION_ITEM(MSG_BUTTON_DONE, []{
     probe.stow(); // Stow before exiting Tramming Wizard
@@ -87,13 +86,10 @@ static void tramming_wizard_menu() {
 
 // Init the wizard and enter the submenu
 void goto_tramming_wizard() {
-  DEBUG_ECHOLNPGM("Screen: goto_tramming_wizard", 1);
+  DEBUG_ECHOLNPAIR("Screen: goto_tramming_wizard", 1);
+  tram_index = 0;
   ui.defer_status_screen();
 
-  // Initialize measured point flags
-  ZERO(z_isvalid);
-  reference_index = -1;
-
   // Inject G28, wait for homing to complete,
   set_all_unhomed();
   queue.inject_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 03aec39..467bd81 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -192,7 +192,9 @@ void _lcd_ubl_edit_mesh() {
     char ubl_lcd_gcode[20];
     sprintf_P(ubl_lcd_gcode, PSTR("G28\nG26CPH%" PRIi16 TERN_(HAS_HEATED_BED, "B%" PRIi16))
       , custom_hotend_temp
-      OPTARG(HAS_HEATED_BED, custom_bed_temp)
+      #if HAS_HEATED_BED
+        , custom_bed_temp
+      #endif
     );
     queue.inject(ubl_lcd_gcode);
   }
@@ -666,10 +668,6 @@ void _lcd_ubl_level_bed() {
     GCODES_ITEM(MSG_UBL_DEACTIVATE_MESH, PSTR("G29D"));
   else
     GCODES_ITEM(MSG_UBL_ACTIVATE_MESH, PSTR("G29A"));
-  #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-    editable.decimal = planner.z_fade_height;
-    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
-  #endif
   #if ENABLED(G26_MESH_VALIDATION)
     SUBMENU(MSG_UBL_STEP_BY_STEP_MENU, _lcd_ubl_step_by_step);
   #endif
@@ -681,6 +679,10 @@ void _lcd_ubl_level_bed() {
   SUBMENU(MSG_UBL_OUTPUT_MAP, _lcd_ubl_output_map);
   SUBMENU(MSG_UBL_TOOLS, _menu_ubl_tools);
   GCODES_ITEM(MSG_UBL_INFO_UBL, PSTR("G29W"));
+  #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+    editable.decimal = planner.z_fade_height;
+    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
+  #endif
   END_MENU();
 }
 
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index 6f2d869..c2a571e 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -45,21 +45,21 @@ void TFT_String::set_font(const uint8_t *font) {
 
   for (glyph = 0; glyph < 256; glyph++) glyphs[glyph] = nullptr;
 
-  DEBUG_ECHOLNPGM("Format: ",            font_header->Format);
-  DEBUG_ECHOLNPGM("BBXWidth: ",          font_header->BBXWidth);
-  DEBUG_ECHOLNPGM("BBXHeight: ",         font_header->BBXHeight);
-  DEBUG_ECHOLNPGM("BBXOffsetX: ",        font_header->BBXOffsetX);
-  DEBUG_ECHOLNPGM("BBXOffsetY: ",        font_header->BBXOffsetY);
-  DEBUG_ECHOLNPGM("CapitalAHeight: ",    font_header->CapitalAHeight);
-  DEBUG_ECHOLNPGM("Encoding65Pos: ",     font_header->Encoding65Pos);
-  DEBUG_ECHOLNPGM("Encoding97Pos: ",     font_header->Encoding97Pos);
-  DEBUG_ECHOLNPGM("FontStartEncoding: ", font_header->FontStartEncoding);
-  DEBUG_ECHOLNPGM("FontEndEncoding: ",   font_header->FontEndEncoding);
-  DEBUG_ECHOLNPGM("LowerGDescent: ",     font_header->LowerGDescent);
-  DEBUG_ECHOLNPGM("FontAscent: ",        font_header->FontAscent);
-  DEBUG_ECHOLNPGM("FontDescent: ",       font_header->FontDescent);
-  DEBUG_ECHOLNPGM("FontXAscent: ",       font_header->FontXAscent);
-  DEBUG_ECHOLNPGM("FontXDescent: ",      font_header->FontXDescent);
+  DEBUG_ECHOLNPAIR("Format: ",            font_header->Format);
+  DEBUG_ECHOLNPAIR("BBXWidth: ",          font_header->BBXWidth);
+  DEBUG_ECHOLNPAIR("BBXHeight: ",         font_header->BBXHeight);
+  DEBUG_ECHOLNPAIR("BBXOffsetX: ",        font_header->BBXOffsetX);
+  DEBUG_ECHOLNPAIR("BBXOffsetY: ",        font_header->BBXOffsetY);
+  DEBUG_ECHOLNPAIR("CapitalAHeight: ",    font_header->CapitalAHeight);
+  DEBUG_ECHOLNPAIR("Encoding65Pos: ",     font_header->Encoding65Pos);
+  DEBUG_ECHOLNPAIR("Encoding97Pos: ",     font_header->Encoding97Pos);
+  DEBUG_ECHOLNPAIR("FontStartEncoding: ", font_header->FontStartEncoding);
+  DEBUG_ECHOLNPAIR("FontEndEncoding: ",   font_header->FontEndEncoding);
+  DEBUG_ECHOLNPAIR("LowerGDescent: ",     font_header->LowerGDescent);
+  DEBUG_ECHOLNPAIR("FontAscent: ",        font_header->FontAscent);
+  DEBUG_ECHOLNPAIR("FontDescent: ",       font_header->FontDescent);
+  DEBUG_ECHOLNPAIR("FontXAscent: ",       font_header->FontXAscent);
+  DEBUG_ECHOLNPAIR("FontXDescent: ",      font_header->FontXDescent);
 
   add_glyphs(font);
 }
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 7262536..64dfaa5 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -47,10 +47,7 @@ millis_t Touch::last_touch_ms = 0,
          Touch::time_to_hold,
          Touch::repeat_delay,
          Touch::touch_time;
-TouchControlType Touch::touch_control_type = NONE;
-#if HAS_TOUCH_SLEEP
-  millis_t Touch::next_sleep_ms; // = 0
-#endif
+TouchControlType  Touch::touch_control_type = NONE;
 #if HAS_RESUME_CONTINUE
   extern bool wait_for_user;
 #endif
@@ -59,7 +56,6 @@ void Touch::init() {
   TERN_(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration_reset());
   reset();
   io.Init();
-  TERN_(HAS_TOUCH_SLEEP, wakeUp());
   enable();
 }
 
@@ -275,34 +271,9 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
   #elif ENABLED(TFT_TOUCH_DEVICE_GT911)
     bool is_touched = (TOUCH_ORIENTATION == TOUCH_PORTRAIT ? io.getPoint(y, x) : io.getPoint(x, y));
   #endif
-  #if HAS_TOUCH_SLEEP
-    if (is_touched)
-      wakeUp();
-    else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
-      sleepTimeout();
-  #endif
+
   return is_touched;
 }
-
-#if HAS_TOUCH_SLEEP
-
-  void Touch::sleepTimeout() {
-    #if PIN_EXISTS(TFT_BACKLIGHT)
-      OUT_WRITE(TFT_BACKLIGHT_PIN, LOW);
-    #endif
-    next_sleep_ms = TSLP_SLEEPING;
-  }
-  void Touch::wakeUp() {
-    if (isSleeping()) {
-      #if PIN_EXISTS(TFT_BACKLIGHT)
-        WRITE(TFT_BACKLIGHT_PIN, HIGH);
-      #endif
-    }
-    next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);
-  }
-
-#endif // HAS_TOUCH_SLEEP
-
 Touch touch;
 
 bool MarlinUI::touch_pressed() {
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
index 238453f..54dfb42 100644
--- a/Marlin/src/lcd/tft/touch.h
+++ b/Marlin/src/lcd/tft/touch.h
@@ -90,9 +90,6 @@ typedef struct __attribute__((__packed__)) {
 #define UBL_REPEAT_DELAY    125
 #define FREE_MOVE_RANGE     32
 
-#define TSLP_PREINIT  0
-#define TSLP_SLEEPING 1
-
 class Touch {
   private:
     static TOUCH_DRIVER_CLASS io;
@@ -124,12 +121,7 @@ class Touch {
     }
     static void disable() { enabled = false; }
     static void enable() { enabled = true; }
-    #if HAS_TOUCH_SLEEP
-      static millis_t next_sleep_ms;
-      static inline bool isSleeping() { return next_sleep_ms == TSLP_SLEEPING; }
-      static void sleepTimeout();
-      static void wakeUp();
-    #endif
+
     static void add_control(TouchControlType type, uint16_t x, uint16_t y, uint16_t width, uint16_t height, intptr_t data = 0);
 };
 
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index db75c36..18c50c9 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -47,7 +47,6 @@
 
 void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
-    if (TERN0(HAS_TOUCH_SLEEP, lcd_sleep_task())) return;
     if (draw_menu_navigation) {
       add_control(164, TFT_HEIGHT - 50, PAGE_UP, imgPageUp, encoderTopLine > 0);
       add_control(796, TFT_HEIGHT - 50, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index deffbae..786dc61 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -47,7 +47,6 @@
 
 void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
-    if (TERN0(HAS_TOUCH_SLEEP, lcd_sleep_task())) return;
     if (draw_menu_navigation) {
       add_control(48, 206, PAGE_UP, imgPageUp, encoderTopLine > 0);
       add_control(240, 206, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index c8333f7..02e3354 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -47,7 +47,6 @@
 
 void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
-    if (TERN0(HAS_TOUCH_SLEEP, lcd_sleep_task())) return;
     if (draw_menu_navigation) {
       add_control(104, TFT_HEIGHT - 34, PAGE_UP, imgPageUp, encoderTopLine > 0);
       add_control(344, TFT_HEIGHT - 34, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index a5f4187..7c053e7 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -37,27 +37,6 @@ static xy_uint_t cursor;
   bool draw_menu_navigation = false;
 #endif
 
-#if HAS_TOUCH_SLEEP
-
-  bool lcd_sleep_task() {
-    static bool sleepCleared;
-    if (touch.isSleeping()) {
-      tft.queue.reset();
-      if (!sleepCleared) {
-        sleepCleared = true;
-        ui.clear_lcd();
-        tft.queue.async();
-      }
-      touch.idle();
-      return true;
-    }
-    else
-      sleepCleared = false;
-    return false;
-  }
-
-#endif
-
 void menu_line(const uint8_t row, uint16_t color) {
   cursor.set(0, row);
   tft.canvas(0, TFT_TOP_LINE_Y + cursor.y * MENU_LINE_HEIGHT, TFT_WIDTH, MENU_ITEM_HEIGHT);
diff --git a/Marlin/src/lcd/tft/ui_common.h b/Marlin/src/lcd/tft/ui_common.h
index d3ffd4b..617447a 100644
--- a/Marlin/src/lcd/tft/ui_common.h
+++ b/Marlin/src/lcd/tft/ui_common.h
@@ -23,7 +23,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(NO_LCD_MENUS)
+#if !HAS_LCD_MENU
   #error "Seriously? High resolution TFT screen without menu?"
 #endif
 
@@ -51,10 +51,6 @@ void draw_fan_status(uint16_t x, uint16_t y, const bool blink);
 void menu_line(const uint8_t row, uint16_t color=COLOR_BACKGROUND);
 void menu_item(const uint8_t row, bool sel = false);
 
-#if HAS_TOUCH_SLEEP
-  bool lcd_sleep_task();
-#endif
-
 #define ABSOLUTE_ZERO     -273.15
 
 #if HAS_TEMP_CHAMBER && HOTENDS > 1
diff --git a/Marlin/src/lcd/tft_io/st7796s.h b/Marlin/src/lcd/tft_io/st7796s.h
index 6d79dd8..e1931ed 100644
--- a/Marlin/src/lcd/tft_io/st7796s.h
+++ b/Marlin/src/lcd/tft_io/st7796s.h
@@ -144,11 +144,39 @@ static const uint16_t st7796s_init[] = {
   ESC_REG(ST7796S_PGC), 0x00F0, 0x0004, 0x0008, 0x0009, 0x0008, 0x0015, 0x002F, 0x0042, 0x0046, 0x0028, 0x0015, 0x0016, 0x0029, 0x002D,
   ESC_REG(ST7796S_NGC), 0x00F0, 0x0004, 0x0009, 0x0009, 0x0008, 0x0015, 0x002E, 0x0046, 0x0046, 0x0028, 0x0015, 0x0015, 0x0029, 0x002D,
 
-  #if ENABLED(ST7796S_INVERTED)
-    ESC_REG(ST7796S_INVON),    // Display inversion ON
-  #else
-    ESC_REG(ST7796S_NORON),
-  #endif
+  ESC_REG(ST7796S_NORON),
+  ESC_REG(ST7796S_WRCTRLD), 0x0024,
+  ESC_REG(ST7796S_CSCON), 0x003C,  // disable command 2 part I
+  ESC_REG(ST7796S_CSCON), 0x0069,  // disable command 2 part II
+  ESC_REG(ST7796S_DISPON),
+  ESC_END
+};
+
+static const uint16_t lerdge_st7796s_init[] = {
+  DATASIZE_8BIT,
+  ESC_REG(ST7796S_SWRESET), ESC_DELAY(100),
+  ESC_REG(ST7796S_SLPOUT), ESC_DELAY(20),
+
+  ESC_REG(ST7796S_CSCON), 0x00C3,  // enable command 2 part I
+  ESC_REG(ST7796S_CSCON), 0x0096,  // enable command 2 part II
+
+  ESC_REG(ST7796S_MADCTL), ST7796S_MADCTL_DATA,
+  ESC_REG(ST7796S_COLMOD), 0x0055,
+
+  ESC_REG(ST7796S_DIC), 0x0001,  // 1-dot inversion
+  ESC_REG(ST7796S_EM), 0x00C6,
+
+  ESC_REG(ST7796S_PWR2), 0x0015,
+  ESC_REG(ST7796S_PWR3), 0x00AF,
+  ESC_REG(ST7796S_VCMPCTL), 0x0022,
+  ESC_REG(ST7796S_VCMOST), 0x0000,
+  ESC_REG(ST7796S_DOCA), 0x0040, 0x008A, 0x0000, 0x0000, 0x0029, 0x0019, 0x00A5, 0x0033,
+
+  /* Gamma Correction. */
+  ESC_REG(ST7796S_PGC), 0x00F0, 0x0004, 0x0008, 0x0009, 0x0008, 0x0015, 0x002F, 0x0042, 0x0046, 0x0028, 0x0015, 0x0016, 0x0029, 0x002D,
+  ESC_REG(ST7796S_NGC), 0x00F0, 0x0004, 0x0009, 0x0009, 0x0008, 0x0015, 0x002E, 0x0046, 0x0046, 0x0028, 0x0015, 0x0015, 0x0029, 0x002D,
+
+  ESC_REG(ST7796S_INVON),      // Display inversion ON
   ESC_REG(ST7796S_WRCTRLD), 0x0024,
   ESC_REG(ST7796S_CSCON), 0x003C,  // disable command 2 part I
   ESC_REG(ST7796S_CSCON), 0x0069,  // disable command 2 part II
diff --git a/Marlin/src/lcd/tft_io/tft_ids.h b/Marlin/src/lcd/tft_io/tft_ids.h
index 2de1113..c4f6127 100644
--- a/Marlin/src/lcd/tft_io/tft_ids.h
+++ b/Marlin/src/lcd/tft_io/tft_ids.h
@@ -31,4 +31,5 @@
 #define ILI9341         0x9341
 #define ILI9488         0x9488
 #define ILI9488_ID1     0x8066 // Some ILI9488 have 0x8066 in the 0x04
+#define LERDGE_ST7796   0xFFFE
 #define AUTO            0xFFFF
diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index 707232b..ded711b 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -97,6 +97,10 @@ if (lcd_id != 0xFFFFFFFF) return;
     write_esc_sequence(ili9341_init);
   #elif TFT_DRIVER == ILI9488
     write_esc_sequence(ili9488_init);
+  #elif TFT_DRIVER == LERDGE_ST7796
+    lcd_id = ST7796;
+    write_esc_sequence(lerdge_st7796s_init);
+
   #elif TFT_DRIVER == AUTO // autodetect
 
     lcd_id = io.GetID() & 0xFFFF;
diff --git a/Marlin/src/lcd/tft_io/tft_io.h b/Marlin/src/lcd/tft_io/tft_io.h
index 6560224..0e4322f 100644
--- a/Marlin/src/lcd/tft_io/tft_io.h
+++ b/Marlin/src/lcd/tft_io/tft_io.h
@@ -59,6 +59,7 @@
   #define TFT_ROTATION TFT_NO_ROTATION
 #endif
 
+
 // TFT_ORIENTATION is the "sum" of TFT_DEFAULT_ORIENTATION plus user TFT_ROTATION
 #define TFT_ORIENTATION ((TFT_DEFAULT_ORIENTATION) ^ (TFT_ROTATION))
 
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.cpp b/Marlin/src/lcd/tft_io/touch_calibration.cpp
index 44ebc73..2a54d2a 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.cpp
+++ b/Marlin/src/lcd/tft_io/touch_calibration.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -80,10 +77,10 @@ void TouchCalibration::validate_calibration() {
 
   if (calibration_state == CALIBRATION_SUCCESS) {
     SERIAL_ECHOLNPGM("Touch screen calibration completed");
-    SERIAL_ECHOLNPGM("TOUCH_CALIBRATION_X ", calibration.x);
-    SERIAL_ECHOLNPGM("TOUCH_CALIBRATION_Y ", calibration.y);
-    SERIAL_ECHOLNPGM("TOUCH_OFFSET_X ", calibration.offset_x);
-    SERIAL_ECHOLNPGM("TOUCH_OFFSET_Y ", calibration.offset_y);
+    SERIAL_ECHOLNPAIR("TOUCH_CALIBRATION_X ", calibration.x);
+    SERIAL_ECHOLNPAIR("TOUCH_CALIBRATION_Y ", calibration.y);
+    SERIAL_ECHOLNPAIR("TOUCH_OFFSET_X ", calibration.offset_x);
+    SERIAL_ECHOLNPAIR("TOUCH_OFFSET_Y ", calibration.offset_y);
     SERIAL_ECHO_TERNARY(calibration.orientation == TOUCH_LANDSCAPE, "TOUCH_ORIENTATION ", "TOUCH_LANDSCAPE", "TOUCH_PORTRAIT", "\n");
     TERN_(TOUCH_CALIBRATION_AUTO_SAVE, settings.save());
   }
@@ -98,7 +95,7 @@ bool TouchCalibration::handleTouch(uint16_t x, uint16_t y) {
   if (calibration_state < CALIBRATION_SUCCESS) {
     calibration_points[calibration_state].raw_x = x;
     calibration_points[calibration_state].raw_y = y;
-    DEBUG_ECHOLNPGM("TouchCalibration - State: ", calibration_state, ", x: ", calibration_points[calibration_state].x, ", raw_x: ", x, ", y: ", calibration_points[calibration_state].y, ", raw_y: ", y);
+    DEBUG_ECHOLNPAIR("TouchCalibration - State: ", calibration_state, ", x: ", calibration_points[calibration_state].x, ", raw_x: ", x, ", y: ", calibration_points[calibration_state].y, ", raw_y: ", y);
   }
 
   switch (calibration_state) {
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.h b/Marlin/src/lcd/tft_io/touch_calibration.h
index abd5667..112fbdc 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.h
+++ b/Marlin/src/lcd/tft_io/touch_calibration.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 4f6dd23..f9f91ac 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -128,8 +128,6 @@
   #define THERMISTOR_NAME "Pt100 1K"
 #elif THERMISTOR_ID == 666
   #define THERMISTOR_NAME "Einstart S"
-#elif THERMISTOR_ID == 2000
-  #define THERMISTOR_NAME "TDK NTCG104LH104JT1"
 
 // High Temperature thermistors
 #elif THERMISTOR_ID == 61
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index 9d9d6ef..c9476bd 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -41,10 +38,6 @@
   #include "../tft_io/touch_calibration.h"
 #endif
 
-#if HAS_TOUCH_SLEEP
-  millis_t TouchButtons::next_sleep_ms;
-#endif
-
 #include "../buttons.h" // For EN_C bit mask
 #include "../marlinui.h" // For ui.refresh
 #include "../tft_io/tft_io.h"
@@ -57,24 +50,15 @@
 #define BUTTON_AREA_TOP BUTTON_Y_LO
 #define BUTTON_AREA_BOT BUTTON_Y_HI
 
-TouchButtons touchBt;
+TouchButtons touch;
 
-void TouchButtons::init() {
-  touchIO.Init();
-  TERN_(HAS_TOUCH_SLEEP, next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP));
-}
+void TouchButtons::init() { touchIO.Init(); }
 
 uint8_t TouchButtons::read_buttons() {
   #ifdef HAS_WIRED_LCD
     int16_t x, y;
 
     const bool is_touched = (TERN(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration.orientation, TOUCH_ORIENTATION) == TOUCH_PORTRAIT ? touchIO.getRawPoint(&y, &x) : touchIO.getRawPoint(&x, &y));
-    #if HAS_TOUCH_SLEEP
-      if (is_touched)
-        wakeUp();
-      else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
-        sleepTimeout();
-    #endif
     if (!is_touched) return 0;
 
     #if ENABLED(TOUCH_SCREEN_CALIBRATION)
@@ -112,23 +96,4 @@ uint8_t TouchButtons::read_buttons() {
   return 0;
 }
 
-#if HAS_TOUCH_SLEEP
-
-  void TouchButtons::sleepTimeout() {
-    #if PIN_EXISTS(TFT_BACKLIGHT)
-      OUT_WRITE(TFT_BACKLIGHT_PIN, LOW);
-    #endif
-    next_sleep_ms = TSLP_SLEEPING;
-  }
-  void TouchButtons::wakeUp() {
-    if (isSleeping()) {
-      #if PIN_EXISTS(TFT_BACKLIGHT)
-        WRITE(TFT_BACKLIGHT_PIN, HIGH);
-      #endif
-    }
-    next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);
-  }
-
-#endif // HAS_TOUCH_SLEEP
-
 #endif // HAS_TOUCH_BUTTONS
diff --git a/Marlin/src/lcd/touch/touch_buttons.h b/Marlin/src/lcd/touch/touch_buttons.h
index 39768f2..a79bb15 100644
--- a/Marlin/src/lcd/touch/touch_buttons.h
+++ b/Marlin/src/lcd/touch/touch_buttons.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -53,19 +50,10 @@
 #define BUTTON_Y_HI (TFT_HEIGHT) - BUTTON_SPACING
 #define BUTTON_Y_LO BUTTON_Y_HI - BUTTON_HEIGHT
 
-#define TSLP_PREINIT  0
-#define TSLP_SLEEPING 1
-
 class TouchButtons {
 public:
   static void init();
   static uint8_t read_buttons();
-  #if HAS_TOUCH_SLEEP
-    static millis_t next_sleep_ms;
-    static bool isSleeping() { return next_sleep_ms == TSLP_SLEEPING; }
-    static void sleepTimeout();
-    static void wakeUp();
-  #endif
 };
 
-extern TouchButtons touchBt;
+extern TouchButtons touch;
diff --git a/Marlin/src/libs/BL24CXX.cpp b/Marlin/src/libs/BL24CXX.cpp
index 6407fac..adcd5ed 100644
--- a/Marlin/src/libs/BL24CXX.cpp
+++ b/Marlin/src/libs/BL24CXX.cpp
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 6f80652..876405a 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -388,10 +388,10 @@ void L64XX_Marlin::set_param(const L64XX_axis_t axis, const uint8_t param, const
 
 inline void echo_min_max(const char a, const_float_t min, const_float_t max) {
   DEBUG_CHAR(' '); DEBUG_CHAR(a);
-  DEBUG_ECHOLNPGM(" min = ", min, "  max = ", max);
+  DEBUG_ECHOLNPAIR(" min = ", min, "  max = ", max);
 }
 inline void echo_oct_used(const_float_t oct, const uint8_t stall) {
-  DEBUG_ECHOPGM("over_current_threshold used     : ", oct);
+  DEBUG_ECHOPAIR("over_current_threshold used     : ", oct);
   DEBUG_ECHOPGM_P(stall ? PSTR("  (Stall") : PSTR("  (OCD"));
   DEBUG_ECHOLNPGM(" threshold)");
 }
@@ -568,7 +568,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   }
 
   DEBUG_ECHOPGM("Monitoring:");
-  for (j = 0; j < driver_count; j++) DEBUG_ECHOPGM("  ", axis_mon[j]);
+  for (j = 0; j < driver_count; j++) DEBUG_ECHOPAIR("  ", axis_mon[j]);
   DEBUG_EOL();
 
   // now have a list of driver(s) to monitor
@@ -589,19 +589,19 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
     }
     // only print the tval from one of the drivers
     kval_hold = get_param(axis_index[0], L6474_TVAL);
-    DEBUG_ECHOLNPGM("TVAL current (mA) = ", (kval_hold + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);
+    DEBUG_ECHOLNPAIR("TVAL current (mA) = ", (kval_hold + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);
   }
   else {
     kval_hold = parser.byteval('K');
     if (kval_hold) {
-      DEBUG_ECHOLNPGM("kval_hold = ", kval_hold);
+      DEBUG_ECHOLNPAIR("kval_hold = ", kval_hold);
       for (j = 0; j < driver_count; j++)
         set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
     }
     else {
       // only print the KVAL_HOLD from one of the drivers
       kval_hold = get_param(axis_index[0], L6470_KVAL_HOLD);
-      DEBUG_ECHOLNPGM("KVAL_HOLD = ", kval_hold);
+      DEBUG_ECHOLNPAIR("KVAL_HOLD = ", kval_hold);
     }
   }
 
@@ -629,7 +629,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
         OCD_TH_actual = (OCD_TH_val_local + 1) * 375;
       }
 
-      DEBUG_ECHOLNPGM("over_current_threshold specified: ", over_current_threshold);
+      DEBUG_ECHOLNPAIR("over_current_threshold specified: ", over_current_threshold);
       if (!(sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)) echo_oct_used((STALL_TH_val_local + 1) * 31.25, true);
       echo_oct_used((OCD_TH_val_local + 1) * 375, false);
 
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index df0702b..909adb3 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -44,11 +44,12 @@
 //#define MAX31865_DEBUG
 //#define MAX31865_DEBUG_SPI
 
+//TODO: switch to SPIclass/SoftSPI
+
 #include "../inc/MarlinConfig.h"
 
-#if HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
+#if HAS_MAX31865 && !LIB_USR_MAX31865
 
-//#include <SoftwareSPI.h> // TODO: switch to SPIclass/SoftSPI
 #include "MAX31865.h"
 
 // The maximum speed the MAX31865 can do is 5 MHz
@@ -152,7 +153,7 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
   OUT_WRITE(_cs, HIGH);
 
   if (_sclk != TERN(LARGE_PINMAP, -1UL, -1)) {
-    // Define pin modes for Software SPI
+    // define pin modes for Software SPI
     #ifdef MAX31865_DEBUG
       SERIAL_ECHOLN("Initializing MAX31865 Software SPI");
     #endif
@@ -160,9 +161,8 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
     OUT_WRITE(_sclk, LOW);
     SET_OUTPUT(_mosi);
     SET_INPUT(_miso);
-  }
-  else {
-    // Start and configure hardware SPI
+  } else {
+    // start and configure hardware SPI
     #ifdef MAX31865_DEBUG
       SERIAL_ECHOLN("Initializing MAX31865 Hardware SPI");
     #endif
@@ -177,14 +177,14 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
 
   #ifdef MAX31865_DEBUG_SPI
     #ifndef LARGE_PINMAP
-      SERIAL_ECHOLNPGM(
+      SERIAL_ECHOLNPAIR(
         "Regular begin call with _cs: ", _cs,
         " _miso: ", _miso,
         " _sclk: ", _sclk,
         " _mosi: ", _mosi
       );
     #else
-      SERIAL_ECHOLNPGM(
+      SERIAL_ECHOLNPAIR(
         "LARGE_PINMAP begin call with _cs: ", _cs,
         " _miso: ", _miso,
         " _sclk: ", _sclk,
@@ -192,7 +192,7 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
       );
     #endif // LARGE_PINMAP
 
-    SERIAL_ECHOLNPGM("config: ", readRegister8(MAX31856_CONFIG_REG));
+    SERIAL_ECHOLNPAIR("config: ", readRegister8(MAX31856_CONFIG_REG));
     SERIAL_EOL();
   #endif // MAX31865_DEBUG_SPI
 }
@@ -290,7 +290,7 @@ uint16_t MAX31865::readRaw() {
   uint16_t rtd = readRegister16(MAX31856_RTDMSB_REG);
 
   #ifdef MAX31865_DEBUG
-    SERIAL_ECHOLNPGM("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
+    SERIAL_ECHOLNPAIR("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
   #endif
 
   // Disable the bias to lower power dissipation between reads.
@@ -437,7 +437,7 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
   while (n--) {
     buffer[0] = spixfer(0xFF);
     #ifdef MAX31865_DEBUG_SPI
-      SERIAL_ECHOLNPGM("buffer read ", n, " data: ", buffer[0]);
+      SERIAL_ECHOLNPAIR("buffer read ", n, " data: ", buffer[0]);
     #endif
     buffer++;
   }
@@ -497,4 +497,4 @@ uint8_t MAX31865::spixfer(uint8_t x) {
   return reply;
 }
 
-#endif // HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
+#endif // HAS_MAX31865 && !LIB_USR_MAX31865
diff --git a/Marlin/src/libs/W25Qxx.cpp b/Marlin/src/libs/W25Qxx.cpp
index b458a7c..56581ed 100644
--- a/Marlin/src/libs/W25Qxx.cpp
+++ b/Marlin/src/libs/W25Qxx.cpp
@@ -28,14 +28,26 @@
 
 W25QXXFlash W25QXX;
 
+#ifndef SPI_FLASH_MISO_PIN
+  #define SPI_FLASH_MISO_PIN W25QXX_MISO_PIN
+#endif
+#ifndef SPI_FLASH_MOSI_PIN
+  #define SPI_FLASH_MOSI_PIN W25QXX_MOSI_PIN
+#endif
+#ifndef SPI_FLASH_SCK_PIN
+  #define SPI_FLASH_SCK_PIN  W25QXX_SCK_PIN
+#endif
+#ifndef SPI_FLASH_CS_PIN
+  #define SPI_FLASH_CS_PIN   W25QXX_CS_PIN
+#endif
 #ifndef NC
   #define NC -1
 #endif
 
 MarlinSPI W25QXXFlash::mySPI(SPI_FLASH_MOSI_PIN, SPI_FLASH_MISO_PIN, SPI_FLASH_SCK_PIN, NC);
 
-#define SPI_FLASH_CS_H() OUT_WRITE(SPI_FLASH_CS_PIN, HIGH)
-#define SPI_FLASH_CS_L() OUT_WRITE(SPI_FLASH_CS_PIN, LOW)
+#define W25QXX_CS_H OUT_WRITE(SPI_FLASH_CS_PIN, HIGH)
+#define W25QXX_CS_L OUT_WRITE(SPI_FLASH_CS_PIN, LOW)
 
 bool flash_dma_mode = true;
 
@@ -122,24 +134,24 @@ void W25QXXFlash::spi_flash_SendBlock(uint8_t token, const uint8_t *buf) {
 
 uint16_t W25QXXFlash::W25QXX_ReadID(void) {
   uint16_t Temp = 0;
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
   spi_flash_Send(0x90);
   spi_flash_Send(0x00);
   spi_flash_Send(0x00);
   spi_flash_Send(0x00);
   Temp |= spi_flash_Rec() << 8;
   Temp |= spi_flash_Rec();
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
   return Temp;
 }
 
 void W25QXXFlash::SPI_FLASH_WriteEnable(void) {
   // Select the FLASH: Chip Select low
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
   // Send "Write Enable" instruction
   spi_flash_Send(W25X_WriteEnable);
   // Deselect the FLASH: Chip Select high
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
 }
 
 /*******************************************************************************
@@ -155,7 +167,7 @@ void W25QXXFlash::SPI_FLASH_WaitForWriteEnd(void) {
   uint8_t FLASH_Status = 0;
 
   // Select the FLASH: Chip Select low
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
   // Send "Read Status Register" instruction
   spi_flash_Send(W25X_ReadStatusReg);
 
@@ -167,7 +179,7 @@ void W25QXXFlash::SPI_FLASH_WaitForWriteEnd(void) {
   while ((FLASH_Status & WIP_Flag) == 0x01); // Write in progress
 
   // Deselect the FLASH: Chip Select high
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
 }
 
 void W25QXXFlash::SPI_FLASH_SectorErase(uint32_t SectorAddr) {
@@ -176,7 +188,7 @@ void W25QXXFlash::SPI_FLASH_SectorErase(uint32_t SectorAddr) {
 
   // Sector Erase
   // Select the FLASH: Chip Select low
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
   // Send Sector Erase instruction
   spi_flash_Send(W25X_SectorErase);
   // Send SectorAddr high nybble address byte
@@ -187,14 +199,14 @@ void W25QXXFlash::SPI_FLASH_SectorErase(uint32_t SectorAddr) {
   spi_flash_Send(SectorAddr & 0xFF);
   // Deselect the FLASH: Chip Select high
 
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
   // Wait the end of Flash writing
   SPI_FLASH_WaitForWriteEnd();
 }
 
 void W25QXXFlash::SPI_FLASH_BlockErase(uint32_t BlockAddr) {
   SPI_FLASH_WriteEnable();
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
   // Send Sector Erase instruction
   spi_flash_Send(W25X_BlockErase);
   // Send SectorAddr high nybble address byte
@@ -204,7 +216,7 @@ void W25QXXFlash::SPI_FLASH_BlockErase(uint32_t BlockAddr) {
   // Send SectorAddr low nybble address byte
   spi_flash_Send(BlockAddr & 0xFF);
 
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
 
   SPI_FLASH_WaitForWriteEnd();
 }
@@ -222,12 +234,12 @@ void W25QXXFlash::SPI_FLASH_BulkErase(void) {
 
   // Bulk Erase
   // Select the FLASH: Chip Select low
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
 
   // Send Bulk Erase instruction
   spi_flash_Send(W25X_ChipErase);
   // Deselect the FLASH: Chip Select high
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
   // Wait the end of Flash writing
   SPI_FLASH_WaitForWriteEnd();
 }
@@ -250,7 +262,7 @@ void W25QXXFlash::SPI_FLASH_PageWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint
   SPI_FLASH_WriteEnable();
 
   // Select the FLASH: Chip Select low
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
   // Send "Write to Memory " instruction
   spi_flash_Send(W25X_PageProgram);
   // Send WriteAddr high nybble address byte to write to
@@ -271,7 +283,7 @@ void W25QXXFlash::SPI_FLASH_PageWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint
   }
 
   // Deselect the FLASH: Chip Select high
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
 
   // Wait the end of Flash writing
   SPI_FLASH_WaitForWriteEnd();
@@ -354,7 +366,7 @@ void W25QXXFlash::SPI_FLASH_BufferWrite(uint8_t *pBuffer, uint32_t WriteAddr, ui
 *******************************************************************************/
 void W25QXXFlash::SPI_FLASH_BufferRead(uint8_t *pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead) {
   // Select the FLASH: Chip Select low
-  SPI_FLASH_CS_L();
+  W25QXX_CS_L;
 
   // Send "Read from Memory " instruction
   spi_flash_Send(W25X_ReadData);
@@ -377,7 +389,7 @@ void W25QXXFlash::SPI_FLASH_BufferRead(uint8_t *pBuffer, uint32_t ReadAddr, uint
   else
     spi_flash_Read(pBuffer, NumByteToRead);
 
-  SPI_FLASH_CS_H();
+  W25QXX_CS_H;
 }
 
 #endif // HAS_SPI_FLASH
diff --git a/Marlin/src/libs/bresenham.h b/Marlin/src/libs/bresenham.h
index 865c43c..6e4162f 100644
--- a/Marlin/src/libs/bresenham.h
+++ b/Marlin/src/libs/bresenham.h
@@ -120,11 +120,11 @@ public:
 
   static void report(const uint8_t index) {
     if (index < Cfg::SIZE) {
-      SERIAL_ECHOPGM("bresenham ", index, " : (", dividend[index], "/", divisor, ") ");
+      SERIAL_ECHOPAIR("bresenham ", index, " : (", dividend[index], "/", divisor, ") ");
       if (counter[index] >= 0) SERIAL_CHAR(' ');
       if (labs(counter[index]) < 100) { SERIAL_CHAR(' '); if (labs(counter[index]) < 10) SERIAL_CHAR(' '); }
       SERIAL_ECHO(counter[index]);
-      SERIAL_ECHOLNPGM(" ... ", value[index]);
+      SERIAL_ECHOLNPAIR(" ... ", value[index]);
     }
   }
 
diff --git a/Marlin/src/libs/hex_print.cpp b/Marlin/src/libs/hex_print.cpp
index 1958084..0f746d6 100644
--- a/Marlin/src/libs/hex_print.cpp
+++ b/Marlin/src/libs/hex_print.cpp
@@ -80,7 +80,7 @@ void print_hex_address(const void * const w) { SERIAL_ECHO(hex_address(w)); }
 
 void print_hex_long(const uint32_t w, const char delimiter) {
   SERIAL_ECHOPGM("0x");
-  for (int B = 24; B >= 8; B -= 8) {
+  for (int B = 24; B >= 8; B -= 8){
     print_hex_byte(w >> B);
     SERIAL_CHAR(delimiter);
   }
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 2a4efb4..992c3a0 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -82,6 +82,28 @@ void recalc_delta_settings() {
   set_all_unhomed();
 }
 
+/**
+ * Get a safe radius for calibration
+ */
+
+#if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
+
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
+    float calibration_radius_factor = 1;
+  #endif
+
+  float delta_calibration_radius() {
+    return calibration_radius_factor * (
+      #if HAS_BED_PROBE
+        FLOOR((DELTA_PRINTABLE_RADIUS) - _MAX(HYPOT(probe.offset_xy.x, probe.offset_xy.y), PROBING_MARGIN))
+      #else
+        DELTA_PRINTABLE_RADIUS
+      #endif
+    );
+  }
+
+#endif
+
 /**
  * Delta Inverse Kinematics
  *
@@ -99,8 +121,8 @@ void recalc_delta_settings() {
  */
 
 #define DELTA_DEBUG(VAR) do { \
-    SERIAL_ECHOLNPGM_P(PSTR("Cartesian X"), VAR.x, SP_Y_STR, VAR.y, SP_Z_STR, VAR.z); \
-    SERIAL_ECHOLNPGM_P(PSTR("Delta A"), delta.a, SP_B_STR, delta.b, SP_C_STR, delta.c); \
+    SERIAL_ECHOLNPAIR_P(PSTR("Cartesian X"), VAR.x, SP_Y_STR, VAR.y, SP_Z_STR, VAR.z); \
+    SERIAL_ECHOLNPAIR_P(PSTR("Delta A"), delta.a, SP_B_STR, delta.b, SP_C_STR, delta.c); \
   }while(0)
 
 void inverse_kinematics(const xyz_pos_t &raw) {
@@ -232,7 +254,7 @@ void home_delta() {
   current_position.z = DIFF_TERN(HAS_BED_PROBE, delta_height + 10, probe.offset.z);
   line_to_current_position(homing_feedrate(Z_AXIS));
   planner.synchronize();
-  TERN_(HAS_DELTA_SENSORLESS_PROBING, endstops.report_states());
+  TERN_(SENSORLESS_PROBING,endstops.report_states());
 
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
   #if ENABLED(SENSORLESS_HOMING) && DISABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index f1e43c7..308e206 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -45,6 +45,19 @@ extern abc_float_t delta_diagonal_rod_trim;
  */
 void recalc_delta_settings();
 
+/**
+ * Get a safe radius for calibration
+ */
+#if ENABLED(DELTA_AUTO_CALIBRATION)
+  extern float calibration_radius_factor;
+#else
+  constexpr float calibration_radius_factor = 1;
+#endif
+
+#if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
+  float delta_calibration_radius();
+#endif
+
 /**
  * Delta Inverse Kinematics
  *
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index d29fd3e..0f4716e 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -429,7 +429,7 @@ void Endstops::event_handler() {
     #endif
 
     #define _ENDSTOP_HIT_ECHO(A,C) do{ \
-      SERIAL_ECHOPGM(" " STRINGIFY(A) ":", planner.triggered_position_mm(_AXIS(A))); _SET_STOP_CHAR(A,C); }while(0)
+      SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", planner.triggered_position_mm(_AXIS(A))); _SET_STOP_CHAR(A,C); }while(0)
 
     #define _ENDSTOP_HIT_TEST(A,C) \
       if (TERN0(HAS_##A##_MIN, TEST(hit_state, A##_MIN)) || TERN0(HAS_##A##_MAX, TEST(hit_state, A##_MAX))) \
@@ -578,13 +578,13 @@ void _O2 Endstops::report_states() {
         default: continue;
         REPEAT_1(NUM_RUNOUT_SENSORS, _CASE_RUNOUT)
       }
-      SERIAL_ECHOPGM(STR_FILAMENT);
+      SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR);
       if (i > 1) SERIAL_CHAR(' ', '0' + i);
       print_es_state(extDigitalRead(pin) != state);
     }
     #undef _CASE_RUNOUT
   #elif HAS_FILAMENT_SENSOR
-    print_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE, PSTR(STR_FILAMENT));
+    print_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
   #endif
 
   TERN_(BLTOUCH, bltouch._reset_SW_mode());
@@ -595,7 +595,7 @@ void _O2 Endstops::report_states() {
 // The following routines are called from an ISR context. It could be the temperature ISR, the
 // endstop ISR or the Stepper ISR.
 
-#if HAS_DELTA_SENSORLESS_PROBING
+#if BOTH(DELTA, SENSORLESS_PROBING)
   #define __ENDSTOP(AXIS, ...) AXIS ##_MAX
   #define _ENDSTOP_PIN(AXIS, ...) AXIS ##_MAX_PIN
   #define _ENDSTOP_INVERTING(AXIS, ...) AXIS ##_MAX_ENDSTOP_INVERTING
@@ -1271,7 +1271,7 @@ void Endstops::update() {
     #endif
 
     uint16_t endstop_change = live_state_local ^ old_live_state_local;
-    #define ES_REPORT_CHANGE(S) if (TEST(endstop_change, S)) SERIAL_ECHOPGM("  " STRINGIFY(S) ":", TEST(live_state_local, S))
+    #define ES_REPORT_CHANGE(S) if (TEST(endstop_change, S)) SERIAL_ECHOPAIR("  " STRINGIFY(S) ":", TEST(live_state_local, S))
 
     if (endstop_change) {
       #if HAS_X_MIN
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index a35966a..e688d3a 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -59,9 +59,7 @@ enum EndstopEnum : char {
   _ES_ITEM(HAS_Z4_MAX, Z4_MAX)
 
   // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
-  #if !HAS_DELTA_SENSORLESS_PROBING
-    _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
-  #endif
+  _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
 
   // The total number of states
   NUM_ENDSTOP_STATES
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index cdd425c..eb6dc65 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -195,7 +195,7 @@ inline void report_more_positions() {
 // Report the logical position for a given machine position
 inline void report_logical_position(const xyze_pos_t &rpos) {
   const xyze_pos_t lpos = rpos.asLogical();
-  SERIAL_ECHOPGM_P(
+  SERIAL_ECHOPAIR_P(
     LIST_N(DOUBLE(LINEAR_AXES),
          X_LBL, lpos.x,
       SP_Y_LBL, lpos.y,
@@ -257,7 +257,7 @@ void report_current_position_projected() {
   /**
    * Output the current grbl compatible state to serial while moving
    */
-  void report_current_grblstate_moving() { SERIAL_ECHOLNPGM("S_XYZ:", int(M_State_grbl)); }
+  void report_current_grblstate_moving() { SERIAL_ECHOLNPAIR("S_XYZ:", int(M_State_grbl)); }
 
   /**
    * Output the current position (processed) to serial while moving
@@ -266,7 +266,7 @@ void report_current_position_projected() {
 
     get_cartesian_from_steppers();
     const xyz_pos_t lpos = cartes.asLogical();
-    SERIAL_ECHOPGM(
+    SERIAL_ECHOPAIR(
       "X:", lpos.x
       #if HAS_Y_AXIS
         , " Y:", lpos.y
@@ -774,7 +774,7 @@ void restore_feedrate_and_scaling() {
     #endif
 
     if (DEBUGGING(LEVELING))
-      SERIAL_ECHOLNPGM("Axis ", AS_CHAR(AXIS_CHAR(axis)), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
+      SERIAL_ECHOLNPAIR("Axis ", AS_CHAR(AXIS_CHAR(axis)), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
   }
 
   /**
@@ -969,10 +969,10 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     #endif
 
     /*
-    SERIAL_ECHOPGM("mm=", cartesian_mm);
-    SERIAL_ECHOPGM(" seconds=", seconds);
-    SERIAL_ECHOPGM(" segments=", segments);
-    SERIAL_ECHOPGM(" segment_mm=", cartesian_segment_mm);
+    SERIAL_ECHOPAIR("mm=", cartesian_mm);
+    SERIAL_ECHOPAIR(" seconds=", seconds);
+    SERIAL_ECHOPAIR(" segments=", segments);
+    SERIAL_ECHOPAIR(" segment_mm=", cartesian_segment_mm);
     SERIAL_EOL();
     //*/
 
@@ -1035,9 +1035,9 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
         const float inv_duration = scaled_fr_mm_s / cartesian_segment_mm;
       #endif
 
-      //SERIAL_ECHOPGM("mm=", cartesian_mm);
-      //SERIAL_ECHOLNPGM(" segments=", segments);
-      //SERIAL_ECHOLNPGM(" segment_mm=", cartesian_segment_mm);
+      // SERIAL_ECHOPAIR("mm=", cartesian_mm);
+      // SERIAL_ECHOLNPAIR(" segments=", segments);
+      // SERIAL_ECHOLNPAIR(" segment_mm=", cartesian_segment_mm);
 
       // Get the raw current position as starting point
       xyze_pos_t raw = current_position;
@@ -1204,7 +1204,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
               new_pos.x += duplicate_extruder_x_offset;
 
             // Move duplicate extruder into the correct position
-            if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Set planner X", inactive_extruder_x, " ... Line to X", new_pos.x);
+            if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Set planner X", inactive_extruder_x, " ... Line to X", new_pos.x);
             if (!planner.buffer_line(new_pos, planner.settings.max_feedrate_mm_s[X_AXIS], 1)) break;
             planner.synchronize();
 
@@ -1515,11 +1515,11 @@ void prepare_line_to_destination() {
     const feedRate_t home_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOPGM("...(", AS_CHAR(AXIS_CHAR(axis)), ", ", distance, ", ");
+      DEBUG_ECHOPAIR("...(", AS_CHAR(AXIS_CHAR(axis)), ", ", distance, ", ");
       if (fr_mm_s)
         DEBUG_ECHO(fr_mm_s);
       else
-        DEBUG_ECHOPGM("[", home_fr_mm_s, "]");
+        DEBUG_ECHOPAIR("[", home_fr_mm_s, "]");
       DEBUG_ECHOLNPGM(")");
     }
 
@@ -1595,12 +1595,12 @@ void prepare_line_to_destination() {
    * "trusted" position).
    */
   void set_axis_never_homed(const AxisEnum axis) {
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     set_axis_untrusted(axis);
     set_axis_unhomed(axis);
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     TERN_(I2C_POSITION_ENCODERS, I2CPEM.unhomed(axis));
   }
@@ -1683,7 +1683,7 @@ void prepare_line_to_destination() {
 
       // Check if home distance within endstop assumed repeatability noise of .05mm and warn.
       if (ABS(phaseDelta) * planner.steps_to_mm[axis] / phasePerUStep < 0.05f)
-        SERIAL_ECHOLNPGM("Selected home phase ", home_phase[axis],
+        SERIAL_ECHOLNPAIR("Selected home phase ", home_phase[axis],
                          " too close to endstop trigger phase ", phaseCurrent,
                          ". Pick a different phase for ", AS_CHAR(AXIS_CHAR(axis)));
 
@@ -1695,7 +1695,7 @@ void prepare_line_to_destination() {
 
       // Optional debug messages
       if (DEBUGGING(LEVELING)) {
-        DEBUG_ECHOLNPGM(
+        DEBUG_ECHOLNPAIR(
           "Endstop ", AS_CHAR(AXIS_CHAR(axis)), " hit at Phase:", phaseCurrent,
           " Delta:", phaseDelta, " Distance:", mmDelta
         );
@@ -1741,7 +1741,7 @@ void prepare_line_to_destination() {
       ) return;
     #endif
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     const int axis_home_dir = TERN0(DUAL_X_CARRIAGE, axis == X_AXIS)
                 ? TOOL_X_HOME_DIR(active_extruder) : home_dir(axis);
@@ -1780,7 +1780,7 @@ void prepare_line_to_destination() {
       const xyz_float_t backoff = SENSORLESS_BACKOFF_MM;
       if ((TERN0(X_SENSORLESS, axis == X_AXIS) || TERN0(Y_SENSORLESS, axis == Y_AXIS) || TERN0(Z_SENSORLESS, axis == Z_AXIS) || TERN0(I_SENSORLESS, axis == I_AXIS) || TERN0(J_SENSORLESS, axis == J_AXIS) || TERN0(K_SENSORLESS, axis == K_AXIS)) && backoff[axis]) {
         const float backoff_length = -ABS(backoff[axis]) * axis_home_dir;
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Sensorless backoff: ", backoff_length, "mm");
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Sensorless backoff: ", backoff_length, "mm");
         do_homing_move(axis, backoff_length, homing_feedrate(axis));
       }
     #endif
@@ -1796,7 +1796,7 @@ void prepare_line_to_destination() {
     // Fast move towards endstop until triggered
     //
     const float move_length = 1.5f * max_length(TERN(DELTA, Z_AXIS, axis)) * axis_home_dir;
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Home Fast: ", move_length, "mm");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Home Fast: ", move_length, "mm");
     do_homing_move(axis, move_length, 0.0, !use_probe_bump);
 
     #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH_SLOW_MODE)
@@ -1806,7 +1806,7 @@ void prepare_line_to_destination() {
     // If a second homing move is configured...
     if (bump) {
       // Move away from the endstop by the axis HOMING_BUMP_MM
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Move Away: ", -bump, "mm");
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Move Away: ", -bump, "mm");
       do_homing_move(axis, -bump, TERN(HOMING_Z_WITH_PROBE, (axis == Z_AXIS ? z_probe_fast_mm_s : 0), 0), false);
 
       #if ENABLED(DETECT_BROKEN_ENDSTOP)
@@ -1839,7 +1839,7 @@ void prepare_line_to_destination() {
 
       // Slow move towards endstop until triggered
       const float rebump = bump * 2;
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Re-bump: ", rebump, "mm");
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Re-bump: ", rebump, "mm");
       do_homing_move(axis, rebump, get_homing_bump_feedrate(axis), true);
 
       #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH)
@@ -2003,7 +2003,7 @@ void prepare_line_to_destination() {
 
       // Retrace by the amount specified in delta_endstop_adj if more than min steps.
       if (adjDistance * (Z_HOME_DIR) < 0 && ABS(adjDistance) > minDistance) { // away from endstop, more than min distance
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("adjDistance:", adjDistance);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("adjDistance:", adjDistance);
         do_homing_move(axis, adjDistance, get_homing_bump_feedrate(axis));
       }
 
@@ -2050,7 +2050,7 @@ void prepare_line_to_destination() {
       if (axis == Z_AXIS) fwretract.current_hop = 0.0;
     #endif
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
   } // homeaxis()
 
@@ -2075,7 +2075,7 @@ void prepare_line_to_destination() {
  * Callers must sync the planner position after calling this!
  */
 void set_axis_is_at_home(const AxisEnum axis) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
   set_axis_trusted(axis);
   set_axis_homed(axis);
@@ -2104,7 +2104,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
 
         current_position.z -= probe.offset.z;
 
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> probe.offset.z = ", probe.offset.z);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> probe.offset.z = ", probe.offset.z);
 
       #else
 
@@ -2125,17 +2125,17 @@ void set_axis_is_at_home(const AxisEnum axis) {
 
   if (DEBUGGING(LEVELING)) {
     #if HAS_HOME_OFFSET
-      DEBUG_ECHOLNPGM("> home_offset[", AS_CHAR(AXIS_CHAR(axis)), "] = ", home_offset[axis]);
+      DEBUG_ECHOLNPAIR("> home_offset[", AS_CHAR(AXIS_CHAR(axis)), "] = ", home_offset[axis]);
     #endif
     DEBUG_POS("", current_position);
-    DEBUG_ECHOLNPGM("<<< set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    DEBUG_ECHOLNPAIR("<<< set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
   }
 }
 
 #if HAS_WORKSPACE_OFFSET
   void update_workspace_offset(const AxisEnum axis) {
     workspace_offset[axis] = home_offset[axis] + position_shift[axis];
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Axis ", AS_CHAR(AXIS_CHAR(axis)), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", AS_CHAR(AXIS_CHAR(axis)), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
   }
 #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 3e030c8..7bf672a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1388,7 +1388,9 @@ void Planner::check_axes_activity() {
   // Update Fan speeds
   // Only if synchronous M106/M107 is disabled
   //
-  TERN_(HAS_TAIL_FAN_SPEED, sync_fan_speeds(tail_fan_speed));
+  #if HAS_TAIL_FAN_SPEED
+    sync_fan_speeds(tail_fan_speed);
+  #endif
 
   TERN_(AUTOTEMP, autotemp_task());
 
@@ -1583,7 +1585,11 @@ void Planner::check_axes_activity() {
 
       raw.z += (
         #if ENABLED(MESH_BED_LEVELING)
-          mbl.get_z(raw OPTARG(ENABLE_LEVELING_FADE_HEIGHT, fade_scaling_factor))
+          mbl.get_z(raw
+            #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+              , fade_scaling_factor
+            #endif
+          )
         #elif ENABLED(AUTO_BED_LEVELING_UBL)
           fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
         #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
@@ -1616,7 +1622,11 @@ void Planner::check_axes_activity() {
 
         raw.z -= (
           #if ENABLED(MESH_BED_LEVELING)
-            mbl.get_z(raw OPTARG(ENABLE_LEVELING_FADE_HEIGHT, fade_scaling_factor))
+            mbl.get_z(raw
+              #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+                , fade_scaling_factor
+              #endif
+            )
           #elif ENABLED(AUTO_BED_LEVELING_UBL)
             fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
@@ -1801,8 +1811,12 @@ bool Planner::_buffer_steps(const xyze_long_t &target
 
   // Fill the block with the specified movement
   if (!_populate_block(block, false, target
-    OPTARG(HAS_POSITION_FLOAT, target_float)
-    OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
+    #if HAS_POSITION_FLOAT
+      , target_float
+    #endif
+    #if HAS_DIST_MM_ARG
+      , cart_dist_mm
+    #endif
     , fr_mm_s, extruder, millimeters
   )) {
     // Movement was not queued, probably because it was too short.
@@ -1858,7 +1872,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   );
 
   /* <-- add a slash to enable
-    SERIAL_ECHOLNPGM(
+    SERIAL_ECHOLNPAIR(
       "  _populate_block FR:", fr_mm_s,
       " A:", target.a, " (", da, " steps)"
       " B:", target.b, " (", db, " steps)"
@@ -1961,7 +1975,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     #endif
   #endif
 
-  TERN_(HAS_EXTRUDERS, if (de < 0) SBI(dm, E_AXIS));
+  #if HAS_EXTRUDERS
+    if (de < 0) SBI(dm, E_AXIS);
+  #endif
 
   #if HAS_EXTRUDERS
     const float esteps_float = de * e_factor[extruder];
@@ -1986,15 +2002,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Number of steps for each axis
   // See https://www.corexy.com/theory.html
   #if CORE_IS_XY
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da + db), ABS(da - db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(ABS(da + db), ABS(da - db), ABS(dc));
   #elif CORE_IS_XZ
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da + dc), ABS(db), ABS(da - dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(ABS(da + dc), ABS(db), ABS(da - dc));
   #elif CORE_IS_YZ
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db + dc), ABS(db - dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(ABS(da), ABS(db + dc), ABS(db - dc));
   #elif ENABLED(MARKFORGED_XY)
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da + db), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(ABS(da + db), ABS(db), ABS(dc));
   #elif IS_SCARA
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(ABS(da), ABS(db), ABS(dc));
   #else
     // default non-h-bot planning
     block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
@@ -2059,7 +2075,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     );
   #endif
 
-  TERN_(HAS_EXTRUDERS, steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)]);
+  #if HAS_EXTRUDERS
+    steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
+  #endif
 
   TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator += steps_dist_mm.e);
 
@@ -2131,7 +2149,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Bail if this is a zero-length block
   if (block->step_event_count < MIN_STEPS_PER_SEGMENT) return false;
 
-  TERN_(MIXING_EXTRUDER, mixer.populate_block(block->b_color));
+  TERN_(MIXING_EXTRUDER, mixer.populate_block(block->b_color))
 
   TERN_(HAS_CUTTER, block->cutter_power = cutter.power);
 
@@ -2144,7 +2162,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     block->e_to_p_pressure = baricuda_e_to_p_pressure;
   #endif
 
-  TERN_(HAS_MULTI_EXTRUDER, block->extruder = extruder);
+  #if HAS_MULTI_EXTRUDER
+    block->extruder = extruder;
+  #endif
 
   #if ENABLED(AUTO_POWER_CONTROL)
     if (LINEAR_AXIS_GANG(
@@ -2188,17 +2208,6 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       if (block->steps.k) ENABLE_AXIS_K()
     );
   #endif
-  #if EITHER(IS_CORE, MARKFORGED_XY)
-    #if LINEAR_AXES >= 4
-      if (block->steps.i) ENABLE_AXIS_I();
-    #endif
-    #if LINEAR_AXES >= 5
-      if (block->steps.j) ENABLE_AXIS_J();
-    #endif
-    #if LINEAR_AXES >= 6
-      if (block->steps.k) ENABLE_AXIS_K();
-    #endif
-  #endif
 
   // Enable extruder(s)
   #if HAS_EXTRUDERS
@@ -2331,10 +2340,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
           if (max_vfr > 0 && cs > max_vfr) {
             NOMORE(speed_factor, max_vfr / cs); // respect volumetric extruder limit (if any)
             /* <-- add a slash to enable
-            SERIAL_ECHOPGM("volumetric extruder limit enforced: ", (cs * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
-            SERIAL_ECHOPGM(" mm^3/s (", cs);
-            SERIAL_ECHOPGM(" mm/s) limited to ", (max_vfr * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
-            SERIAL_ECHOPGM(" mm^3/s (", max_vfr);
+            SERIAL_ECHOPAIR("volumetric extruder limit enforced: ", (cs * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
+            SERIAL_ECHOPAIR(" mm^3/s (", cs);
+            SERIAL_ECHOPAIR(" mm/s) limited to ", (max_vfr * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
+            SERIAL_ECHOPAIR(" mm^3/s (", max_vfr);
             SERIAL_ECHOLNPGM(" mm/s)");
             //*/
           }
@@ -2921,44 +2930,44 @@ bool Planner::buffer_segment(const abce_pos_t &abce
   #endif
 
   /* <-- add a slash to enable
-    SERIAL_ECHOPGM("  buffer_segment FR:", fr_mm_s);
+    SERIAL_ECHOPAIR("  buffer_segment FR:", fr_mm_s);
     #if IS_KINEMATIC
-      SERIAL_ECHOPGM(" A:", abce.a, " (", position.a, "->", target.a, ") B:", abce.b);
+      SERIAL_ECHOPAIR(" A:", abce.a, " (", position.a, "->", target.a, ") B:", abce.b);
     #else
-      SERIAL_ECHOPGM_P(SP_X_LBL, abce.a);
-      SERIAL_ECHOPGM(" (", position.x, "->", target.x);
+      SERIAL_ECHOPAIR_P(SP_X_LBL, abce.a);
+      SERIAL_ECHOPAIR(" (", position.x, "->", target.x);
       SERIAL_CHAR(')');
-      SERIAL_ECHOPGM_P(SP_Y_LBL, abce.b);
+      SERIAL_ECHOPAIR_P(SP_Y_LBL, abce.b);
     #endif
-    SERIAL_ECHOPGM(" (", position.y, "->", target.y);
+    SERIAL_ECHOPAIR(" (", position.y, "->", target.y);
     #if LINEAR_AXES >= ABC
       #if ENABLED(DELTA)
-        SERIAL_ECHOPGM(") C:", abce.c);
+        SERIAL_ECHOPAIR(") C:", abce.c);
       #else
         SERIAL_CHAR(')');
-        SERIAL_ECHOPGM_P(SP_Z_LBL, abce.c);
+        SERIAL_ECHOPAIR_P(SP_Z_LBL, abce.c);
       #endif
-      SERIAL_ECHOPGM(" (", position.z, "->", target.z);
+      SERIAL_ECHOPAIR(" (", position.z, "->", target.z);
       SERIAL_CHAR(')');
     #endif
     #if LINEAR_AXES >= 4
-      SERIAL_ECHOPGM_P(SP_I_LBL, abce.i);
-      SERIAL_ECHOPGM(" (", position.i, "->", target.i);
+      SERIAL_ECHOPAIR_P(SP_I_LBL, abce.i);
+      SERIAL_ECHOPAIR(" (", position.i, "->", target.i);
       SERIAL_CHAR(')');
     #endif
     #if LINEAR_AXES >= 5
-      SERIAL_ECHOPGM_P(SP_J_LBL, abce.j);
-      SERIAL_ECHOPGM(" (", position.j, "->", target.j);
+      SERIAL_ECHOPAIR_P(SP_J_LBL, abce.j);
+      SERIAL_ECHOPAIR(" (", position.j, "->", target.j);
       SERIAL_CHAR(')');
     #endif
     #if LINEAR_AXES >= 6
-      SERIAL_ECHOPGM_P(SP_K_LBL, abce.k);
-      SERIAL_ECHOPGM(" (", position.k, "->", target.k);
+      SERIAL_ECHOPAIR_P(SP_K_LBL, abce.k);
+      SERIAL_ECHOPAIR(" (", position.k, "->", target.k);
       SERIAL_CHAR(')');
     #endif
     #if HAS_EXTRUDERS
-      SERIAL_ECHOPGM_P(SP_E_LBL, abce.e);
-      SERIAL_ECHOLNPGM(" (", position.e, "->", target.e, ")");
+      SERIAL_ECHOPAIR_P(SP_E_LBL, abce.e);
+      SERIAL_ECHOLNPAIR(" (", position.e, "->", target.e, ")");
     #else
       SERIAL_EOL();
     #endif
@@ -2966,8 +2975,12 @@ bool Planner::buffer_segment(const abce_pos_t &abce
 
   // Queue the movement. Return 'false' if the move was not queued.
   if (!_buffer_steps(target
-      OPTARG(HAS_POSITION_FLOAT, target_float)
-      OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
+      #if HAS_POSITION_FLOAT
+        , target_float
+      #endif
+      #if HAS_DIST_MM_ARG
+        , cart_dist_mm
+      #endif
       , fr_mm_s, extruder, millimeters)
   ) return false;
 
@@ -3186,7 +3199,7 @@ inline void limit_and_warn(float &val, const uint8_t axis, PGM_P const setting_n
     SERIAL_CHAR(AXIS_CHAR(lim_axis));
     SERIAL_ECHOPGM(" Max ");
     SERIAL_ECHOPGM_P(setting_name);
-    SERIAL_ECHOLNPGM(" limited to ", val);
+    SERIAL_ECHOLNPAIR(" limited to ", val);
   }
 }
 
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 27dee76..4c5f1fc 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -179,7 +179,7 @@ void PrintCounter::saveStats() {
   inline void _service_when(char buffer[], const char * const msg, const uint32_t when) {
     SERIAL_ECHOPGM(STR_STATS);
     SERIAL_ECHOPGM_P(msg);
-    SERIAL_ECHOLNPGM(" in ", duration_t(when).toString(buffer));
+    SERIAL_ECHOLNPAIR(" in ", duration_t(when).toString(buffer));
   }
 #endif
 
@@ -187,7 +187,7 @@ void PrintCounter::showStats() {
   char buffer[22];
 
   SERIAL_ECHOPGM(STR_STATS);
-  SERIAL_ECHOLNPGM(
+  SERIAL_ECHOLNPAIR(
     "Prints: ", data.totalPrints,
     ", Finished: ", data.finishedPrints,
     ", Failed: ", data.totalPrints - data.finishedPrints
@@ -197,21 +197,21 @@ void PrintCounter::showStats() {
   SERIAL_ECHOPGM(STR_STATS);
   duration_t elapsed = data.printTime;
   elapsed.toString(buffer);
-  SERIAL_ECHOPGM("Total time: ", buffer);
+  SERIAL_ECHOPAIR("Total time: ", buffer);
   #if ENABLED(DEBUG_PRINTCOUNTER)
-    SERIAL_ECHOPGM(" (", data.printTime);
+    SERIAL_ECHOPAIR(" (", data.printTime);
     SERIAL_CHAR(')');
   #endif
 
   elapsed = data.longestPrint;
   elapsed.toString(buffer);
-  SERIAL_ECHOPGM(", Longest job: ", buffer);
+  SERIAL_ECHOPAIR(", Longest job: ", buffer);
   #if ENABLED(DEBUG_PRINTCOUNTER)
-    SERIAL_ECHOPGM(" (", data.longestPrint);
+    SERIAL_ECHOPAIR(" (", data.longestPrint);
     SERIAL_CHAR(')');
   #endif
 
-  SERIAL_ECHOPGM("\n" STR_STATS "Filament used: ", data.filamentUsed / 1000);
+  SERIAL_ECHOPAIR("\n" STR_STATS "Filament used: ", data.filamentUsed / 1000);
   SERIAL_CHAR('m');
   SERIAL_EOL();
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 071ff25..ded5d43 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -79,8 +79,6 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
@@ -111,7 +109,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
    *              If true, move to MAX_X and release the solenoid
    */
   static void dock_sled(const bool stow) {
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("dock_sled(", stow, ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("dock_sled(", stow, ")");
 
     // Dock sled a bit closer to ensure proper capturing
     do_blocking_move_to_x(X_MAX_POS + SLED_DOCKING_OFFSET - ((stow) ? 1 : 0));
@@ -141,7 +139,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
       ui.return_to_status();
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR));
-      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
+      wait_for_user_response();
       ui.reset_status();
       ui.goto_screen(prev_screen);
 
@@ -274,7 +272,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
  * Raise Z to a minimum height to make room for a probe to move
  */
 void Probe::do_z_raise(const float z_raise) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Probe::do_z_raise(", z_raise, ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probe::do_z_raise(", z_raise, ")");
   float z_dest = z_raise;
   if (offset.z < 0) z_dest -= offset.z;
   do_z_clearance(z_dest);
@@ -297,8 +295,8 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, PSTR("Stow Probe"), CONTINUE_STR));
-      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
+
+      wait_for_user_response();
       ui.reset_status();
 
     } while (ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED));
@@ -367,7 +365,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
     #if ENABLED(WAIT_FOR_NOZZLE_HEAT)
       const celsius_t hotendPreheat = hotend_temp > thermalManager.degTargetHotend(0) ? hotend_temp : 0;
       if (hotendPreheat) {
-        DEBUG_ECHOPGM("hotend (", hotendPreheat, ")");
+        DEBUG_ECHOPAIR("hotend (", hotendPreheat, ")");
         thermalManager.setTargetHotend(hotendPreheat, 0);
       }
     #elif ENABLED(WAIT_FOR_BED_HEAT)
@@ -378,7 +376,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       const celsius_t bedPreheat = bed_temp > thermalManager.degTargetBed() ? bed_temp : 0;
       if (bedPreheat) {
         if (hotendPreheat) DEBUG_ECHOPGM(" and ");
-        DEBUG_ECHOPGM("bed (", bedPreheat, ")");
+        DEBUG_ECHOPAIR("bed (", bedPreheat, ")");
         thermalManager.setTargetBed(bedPreheat);
       }
     #endif
@@ -400,7 +398,7 @@ bool Probe::set_deployed(const bool deploy) {
 
   if (DEBUGGING(LEVELING)) {
     DEBUG_POS("Probe::set_deployed", current_position);
-    DEBUG_ECHOLNPGM("deploy: ", deploy);
+    DEBUG_ECHOLNPAIR("deploy: ", deploy);
   }
 
   if (endstops.z_probe_enabled == deploy) return false;
@@ -493,7 +491,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   // Disable stealthChop if used. Enable diag1 pin on driver.
   #if ENABLED(SENSORLESS_PROBING)
     sensorless_t stealth_states { false };
-    #if HAS_DELTA_SENSORLESS_PROBING
+    #if ENABLED(DELTA)
       if (probe.test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
       if (probe.test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
     #endif
@@ -509,7 +507,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
 
   // Check to see if the probe was triggered
   const bool probe_triggered =
-    #if HAS_DELTA_SENSORLESS_PROBING
+    #if BOTH(DELTA, SENSORLESS_PROBING)
       endstops.trigger_state() & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX))
     #else
       TEST(endstops.trigger_state(), Z_MIN_PROBE)
@@ -521,7 +519,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
   #if ENABLED(SENSORLESS_PROBING)
     endstops.not_homing();
-    #if HAS_DELTA_SENSORLESS_PROBING
+    #if ENABLED(DELTA)
       if (probe.test_sensitivity.x) tmc_disable_stallguard(stepperX, stealth_states.x);
       if (probe.test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
     #endif
@@ -629,7 +627,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
     const float first_probe_z = current_position.z;
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("1st Probe Z:", first_probe_z);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("1st Probe Z:", first_probe_z);
 
     // Raise to give the probe clearance
     do_blocking_move_to_z(current_position.z + Z_CLEARANCE_MULTI_PROBE, z_probe_fast_mm_s);
@@ -723,7 +721,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
     const float z2 = current_position.z;
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("2nd Probe Z:", z2, " Discrepancy:", first_probe_z - z2);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("2nd Probe Z:", z2, " Discrepancy:", first_probe_z - z2);
 
     // Return a weighted average of the fast and slow probes
     const float measured_z = (z2 * 3.0 + first_probe_z * 2.0) * 0.2;
@@ -751,9 +749,9 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   DEBUG_SECTION(log_probe, "Probe::probe_at_point", DEBUGGING(LEVELING));
 
   if (DEBUGGING(LEVELING)) {
-    DEBUG_ECHOLNPGM(
+    DEBUG_ECHOLNPAIR(
       "...(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
-      ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_LAST_STOW ? "stow (last)" : raise_after == PROBE_PT_STOW ? "stow" : "none",
+      ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
       ", ", verbose_level,
       ", ", probe_relative ? "probe" : "nozzle", "_relative)"
     );
@@ -765,7 +763,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   #endif
 
   // On delta keep Z below clip height or do_blocking_move_to will abort
-  xyz_pos_t npos = { rx, ry, TERN(DELTA, _MIN(delta_clip_start_height, current_position.z), current_position.z) };
+  xyz_pos_t npos = { rx, ry, _MIN(TERN(DELTA, delta_clip_start_height, current_position.z), current_position.z) };
   if (probe_relative) {                                     // The given position is in terms of the probe
     if (!can_reach(npos)) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
@@ -784,11 +782,11 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
     if (big_raise || raise_after == PROBE_PT_RAISE)
       do_blocking_move_to_z(current_position.z + (big_raise ? 25 : Z_CLEARANCE_BETWEEN_PROBES), z_probe_fast_mm_s);
-    else if (raise_after == PROBE_PT_STOW || raise_after == PROBE_PT_LAST_STOW)
+    else if (raise_after == PROBE_PT_STOW)
       if (stow()) measured_z = NAN;   // Error on stow?
 
     if (verbose_level > 2)
-      SERIAL_ECHOLNPGM("Bed X: ", LOGICAL_X_POSITION(rx), " Y: ", LOGICAL_Y_POSITION(ry), " Z: ", measured_z);
+      SERIAL_ECHOLNPAIR("Bed X: ", LOGICAL_X_POSITION(rx), " Y: ", LOGICAL_Y_POSITION(ry), " Z: ", measured_z);
   }
 
   if (isnan(measured_z)) {
@@ -827,7 +825,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
    */
   void Probe::enable_stallguard_diag1() {
     #if ENABLED(SENSORLESS_PROBING)
-      #if HAS_DELTA_SENSORLESS_PROBING
+      #if ENABLED(DELTA)
         stealth_states.x = tmc_enable_stallguard(stepperX);
         stealth_states.y = tmc_enable_stallguard(stepperY);
       #endif
@@ -842,7 +840,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   void Probe::disable_stallguard_diag1() {
     #if ENABLED(SENSORLESS_PROBING)
       endstops.not_homing();
-      #if HAS_DELTA_SENSORLESS_PROBING
+      #if ENABLED(DELTA)
         tmc_disable_stallguard(stepperX, stealth_states.x);
         tmc_disable_stallguard(stepperY, stealth_states.y);
       #endif
@@ -864,7 +862,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
       #endif
       #if ((ENABLED(DELTA) && (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y))) || HAS_CURRENT_HOME(Z))
         auto debug_current_on = [](PGM_P const s, const int16_t a, const int16_t b) {
-          if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPGM(" current: ", a, " -> ", b); }
+          if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); }
         };
       #endif
       if (onoff) {
@@ -907,6 +905,6 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
     #endif
   }
 
-#endif // SENSORLESS_PROBING || SENSORLESS_HOMING
+#endif // SENSORLESS_PROBING
 
 #endif // HAS_BED_PROBE
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 5da5ea3..ce69059 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -33,7 +33,6 @@
   enum ProbePtRaise : uint8_t {
     PROBE_PT_NONE,      // No raise or stow after run_z_probe
     PROBE_PT_STOW,      // Do a complete stow after run_z_probe
-    PROBE_PT_LAST_STOW, // Stow for sure, even in BLTouch HS mode
     PROBE_PT_RAISE,     // Raise to "between" clearance after run_z_probe
     PROBE_PT_BIG_RAISE  // Raise to big clearance after run_z_probe
   };
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index 2527292..07f714a 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -58,7 +58,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     cartes.y = a_sin + b_sin + scara_offset.y;  // phi
 
     /*
-      DEBUG_ECHOLNPGM(
+      DEBUG_ECHOLNPAIR(
         "SCARA FK Angle a=", a,
         " b=", b,
         " a_sin=", a_sin,
@@ -66,7 +66,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
         " b_sin=", b_sin,
         " b_cos=", b_cos
       );
-      DEBUG_ECHOLNPGM(" cartes (X,Y) = "(cartes.x, ", ", cartes.y, ")");
+      DEBUG_ECHOLNPAIR(" cartes (X,Y) = "(cartes.x, ", ", cartes.y, ")");
     //*/
   }
 
@@ -80,13 +80,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     else {
       // MORGAN_SCARA uses a Cartesian XY home position
       xyz_pos_t homeposition = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
-      //DEBUG_ECHOLNPGM_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y);
+      //DEBUG_ECHOLNPAIR_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y);
 
       delta = homeposition;
       forward_kinematics(delta.a, delta.b);
       current_position[axis] = cartes[axis];
 
-      //DEBUG_ECHOLNPGM_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
+      //DEBUG_ECHOLNPAIR_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
       update_software_endstops(axis);
     }
   }
@@ -132,7 +132,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     /*
       DEBUG_POS("SCARA IK", raw);
       DEBUG_POS("SCARA IK", delta);
-      DEBUG_ECHOLNPGM("  SCARA (x,y) ", sx, ",", sy, " C2=", C2, " S2=", S2, " Theta=", THETA, " Psi=", PSI);
+      DEBUG_ECHOLNPAIR("  SCARA (x,y) ", sx, ",", sy, " C2=", C2, " S2=", S2, " Theta=", THETA, " Psi=", PSI);
     //*/
   }
 
@@ -150,13 +150,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
         #define SCARA_OFFSET_THETA2 131 // degrees
       #endif
       ab_float_t homeposition = { SCARA_OFFSET_THETA1, SCARA_OFFSET_THETA2 };
-      //DEBUG_ECHOLNPGM("homeposition A:", homeposition.a, " B:", homeposition.b);
+      //DEBUG_ECHOLNPAIR("homeposition A:", homeposition.a, " B:", homeposition.b);
 
       inverse_kinematics(homeposition);
       forward_kinematics(delta.a, delta.b);
       current_position[axis] = cartes[axis];
 
-      //DEBUG_ECHOLNPGM_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
+      //DEBUG_ECHOLNPAIR_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
       update_software_endstops(axis);
     }
   }
@@ -172,7 +172,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     /*
       DEBUG_POS("SCARA IK", raw);
       DEBUG_POS("SCARA IK", delta);
-      SERIAL_ECHOLNPGM("  SCARA (x,y) ", x, ",", y," Theta1=", THETA1, " Theta2=", THETA2);
+      SERIAL_ECHOLNPAIR("  SCARA (x,y) ", x, ",", y," Theta1=", THETA1, " Theta2=", THETA2);
     //*/
   }
 
@@ -185,13 +185,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
       current_position.z = Z_HOME_POS;
     else {
       xyz_pos_t homeposition = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
-      //DEBUG_ECHOLNPGM_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y, SP_Z_LBL, homeposition.z);
+      //DEBUG_ECHOLNPAIR_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y, SP_Z_LBL, homeposition.z);
 
       inverse_kinematics(homeposition);
       forward_kinematics(delta.a, delta.b, delta.c);
       current_position[axis] = cartes[axis];
 
-      //DEBUG_ECHOLNPGM_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
+      //DEBUG_ECHOLNPAIR_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
       update_software_endstops(axis);
     }
   }
@@ -289,13 +289,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
 
     delta.set(DEGREES(THETA), DEGREES(PHI), DEGREES(PSI));
 
-    //SERIAL_ECHOLNPGM(" SCARA (x,y,z) ", spos.x , ",", spos.y, ",", spos.z, " Rho=", RHO, " Rho2=", RHO2, " Theta=", THETA, " Phi=", PHI, " Psi=", PSI, " Gamma=", GAMMA);
+    //SERIAL_ECHOLNPAIR(" SCARA (x,y,z) ", spos.x , ",", spos.y, ",", spos.z, " Rho=", RHO, " Rho2=", RHO2, " Theta=", THETA, " Phi=", PHI, " Psi=", PSI, " Gamma=", GAMMA);
   }
 
 #endif
 
 void scara_report_positions() {
-  SERIAL_ECHOLNPGM("SCARA Theta:", planner.get_axis_position_degrees(A_AXIS)
+  SERIAL_ECHOLNPAIR("SCARA Theta:", planner.get_axis_position_degrees(A_AXIS)
     #if ENABLED(AXEL_TPARA)
       , "  Phi:", planner.get_axis_position_degrees(B_AXIS)
       , "  Psi:", planner.get_axis_position_degrees(C_AXIS)
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index 231efe8..9b71dd3 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -39,19 +39,19 @@ HAL_SERVO_LIB servo[NUM_SERVOS];
 void servo_init() {
   #if NUM_SERVOS >= 1 && HAS_SERVO_0
     servo[0].attach(SERVO0_PIN);
-    DETACH_SERVO(0); // Just set up the pin. We don't have a position yet. Don't move to a random position.
+    servo[0].detach(); // Just set up the pin. We don't have a position yet. Don't move to a random position.
   #endif
   #if NUM_SERVOS >= 2 && HAS_SERVO_1
     servo[1].attach(SERVO1_PIN);
-    DETACH_SERVO(1);
+    servo[1].detach();
   #endif
   #if NUM_SERVOS >= 3 && HAS_SERVO_2
     servo[2].attach(SERVO2_PIN);
-    DETACH_SERVO(2);
+    servo[2].detach();
   #endif
   #if NUM_SERVOS >= 4 && HAS_SERVO_3
     servo[3].attach(SERVO3_PIN);
-    DETACH_SERVO(3);
+    servo[3].detach();
   #endif
 }
 
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 73dbbdd..3b5a5e7 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -110,7 +110,6 @@
 #endif // HAS_SERVO_ANGLES
 
 #define MOVE_SERVO(I, P) servo[I].move(P)
-#define DETACH_SERVO(I) servo[I].detach()
 
 extern HAL_SERVO_LIB servo[NUM_SERVOS];
 void servo_init();
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 8e4c758..47c1314 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -71,10 +71,6 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if HAS_SERVOS
@@ -133,6 +129,9 @@
 #endif
 
 #include "../feature/controllerfan.h"
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+  void M710_report(const bool forReplay=true);
+#endif
 
 #if ENABLED(CASE_LIGHT_ENABLE)
   #include "../feature/caselight.h"
@@ -164,6 +163,13 @@
 #if HAS_ETHERNET
   void ETH0_report();
   void MAC_report();
+  void M552_report();
+  void M553_report();
+  void M554_report();
+#endif
+
+#if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
+  void M666_report(const bool forReplay=true);
 #endif
 
 #define _EN_ITEM(N) , E##N
@@ -431,18 +437,10 @@ typedef struct SettingsDataStruct {
   // EXTENSIBLE_UI
   //
   #if ENABLED(EXTENSIBLE_UI)
+    // This is a significant hardware change; don't reserve space when not present
     uint8_t extui_data[ExtUI::eeprom_data_size];
   #endif
 
-  //
-  // Ender-3 V2 DWIN
-  //
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-    uint8_t dwin_data[eeprom_data_size];
-  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    uint8_t dwin_settings[CrealityDWIN.eeprom_data_size];
-  #endif
-
   //
   // CASELIGHT_USES_BRIGHTNESS
   //
@@ -1348,25 +1346,6 @@ void MarlinSettings::postprocess() {
     }
     #endif
 
-    //
-    // Creality DWIN User Data
-    //
-    #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-    {
-      char dwin_data[eeprom_data_size] = { 0 };
-      DWIN_StoreSettings(dwin_data);
-      _FIELD_TEST(dwin_data);
-      EEPROM_WRITE(dwin_data);
-    }
-    #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    {
-      char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
-      CrealityDWIN.Save_Settings(dwin_settings);
-      _FIELD_TEST(dwin_settings);
-      EEPROM_WRITE(dwin_settings);
-    }
-    #endif
-
     //
     // Case Light Brightness
     //
@@ -1486,8 +1465,6 @@ void MarlinSettings::postprocess() {
         stored_ver[1] = '\0';
       }
       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status(GET_TEXT(MSG_ERR_EEPROM_VERSION)));
-
       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
       eeprom_error = true;
     }
@@ -2248,25 +2225,6 @@ void MarlinSettings::postprocess() {
       }
       #endif
 
-      //
-      // Creality DWIN User Data
-      //
-      #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-      {
-        const char dwin_data[eeprom_data_size] = { 0 };
-        _FIELD_TEST(dwin_data);
-        EEPROM_READ(dwin_data);
-        if (!validating) DWIN_LoadSettings(dwin_data);
-      }
-      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-      {
-        const char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
-        _FIELD_TEST(dwin_settings);
-        EEPROM_READ(dwin_settings);
-        if (!validating) CrealityDWIN.Load_Settings(dwin_settings);
-      }
-      #endif
-
       //
       // Case Light Brightness
       //
@@ -2347,13 +2305,12 @@ void MarlinSettings::postprocess() {
       else if (working_crc != stored_crc) {
         eeprom_error = true;
         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status(GET_TEXT(MSG_ERR_EEPROM_CRC)));
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
       }
       else if (!validating) {
         DEBUG_ECHO_START();
         DEBUG_ECHO(version);
-        DEBUG_ECHOLNPGM(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET), " bytes; crc ", (uint32_t)working_crc, ")");
+        DEBUG_ECHOLNPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET), " bytes; crc ", (uint32_t)working_crc, ")");
       }
 
       if (!validating && !eeprom_error) postprocess();
@@ -2380,7 +2337,7 @@ void MarlinSettings::postprocess() {
 
           if (ubl.storage_slot >= 0) {
             load_mesh(ubl.storage_slot);
-            DEBUG_ECHOLNPGM("Mesh ", ubl.storage_slot, " loaded from storage.");
+            DEBUG_ECHOLNPAIR("Mesh ", ubl.storage_slot, " loaded from storage.");
           }
           else {
             ubl.reset();
@@ -2436,19 +2393,17 @@ void MarlinSettings::postprocess() {
   #if ENABLED(AUTO_BED_LEVELING_UBL)
 
     inline void ubl_invalid_slot(const int s) {
-      DEBUG_ECHOLNPGM("?Invalid slot.\n", s, " mesh slots available.");
+      DEBUG_ECHOLNPAIR("?Invalid slot.\n", s, " mesh slots available.");
       UNUSED(s);
     }
 
-    // 128 (+1 because of the change to capacity rather than last valid address)
-    // is a placeholder for the size of the MAT; the MAT will always
-    // live at the very end of the eeprom
-    const uint16_t MarlinSettings::meshes_end = persistentStore.capacity() - 129;
+    const uint16_t MarlinSettings::meshes_end = persistentStore.capacity() - 129; // 128 (+1 because of the change to capacity rather than last valid address)
+                                                                                  // is a placeholder for the size of the MAT; the MAT will always
+                                                                                  // live at the very end of the eeprom
 
     uint16_t MarlinSettings::meshes_start_index() {
-      // Pad the end of configuration data so it can float up
-      // or down a little bit without disrupting the mesh data
-      return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8;
+      return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8;  // Pad the end of configuration data so it can float up
+                                                          // or down a little bit without disrupting the mesh data
     }
 
     #define MESH_STORE_SIZE sizeof(TERN(OPTIMIZED_MESH_STORAGE, mesh_store_t, ubl.z_values))
@@ -2467,7 +2422,7 @@ void MarlinSettings::postprocess() {
         const int16_t a = calc_num_meshes();
         if (!WITHIN(slot, 0, a - 1)) {
           ubl_invalid_slot(a);
-          DEBUG_ECHOLNPGM("E2END=", persistentStore.capacity() - 1, " meshes_end=", meshes_end, " slot=", slot);
+          DEBUG_ECHOLNPAIR("E2END=", persistentStore.capacity() - 1, " meshes_end=", meshes_end, " slot=", slot);
           DEBUG_EOL();
           return;
         }
@@ -2489,7 +2444,7 @@ void MarlinSettings::postprocess() {
         persistentStore.access_finish();
 
         if (status) SERIAL_ECHOLNPGM("?Unable to save mesh data.");
-        else        DEBUG_ECHOLNPGM("Mesh saved in slot ", slot);
+        else        DEBUG_ECHOLNPAIR("Mesh saved in slot ", slot);
 
       #else
 
@@ -2533,7 +2488,7 @@ void MarlinSettings::postprocess() {
         #endif
 
         if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
-        else        DEBUG_ECHOLNPGM("Mesh loaded from slot ", slot);
+        else        DEBUG_ECHOLNPAIR("Mesh loaded from slot ", slot);
 
         EEPROM_FINISH();
 
@@ -2600,7 +2555,9 @@ void MarlinSettings::reset() {
     TERN_(HAS_CLASSIC_E_JERK, planner.max_jerk.e = DEFAULT_EJERK);
   #endif
 
-  TERN_(HAS_JUNCTION_DEVIATION, planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM));
+  #if HAS_JUNCTION_DEVIATION
+    planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM);
+  #endif
 
   #if HAS_SCARA_OFFSET
     scara_home_offset.reset();
@@ -2664,8 +2621,6 @@ void MarlinSettings::reset() {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_SetDataDefaults());
-  TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
 
   //
   // Case Light Brightness
@@ -3002,19 +2957,63 @@ void MarlinSettings::reset() {
 
   postprocess();
 
-  DEBUG_ECHO_MSG("Hardcoded Default Settings Loaded");
+  DEBUG_ECHO_START();
+  DEBUG_ECHOLNPGM("Hardcoded Default Settings Loaded");
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
 }
 
 #if DISABLED(DISABLE_M503)
 
-  #define CONFIG_ECHO_START()       gcode.report_echo_start(forReplay)
-  #define CONFIG_ECHO_MSG(V...)     do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(V); }while(0)
-  #define CONFIG_ECHO_MSG_P(V...)   do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM_P(V); }while(0)
-  #define CONFIG_ECHO_HEADING(STR)  gcode.report_heading(forReplay, PSTR(STR))
+  static void config_heading(const bool repl, PGM_P const pstr, const bool eol=true) {
+    if (!repl) {
+      SERIAL_ECHO_START();
+      SERIAL_ECHOPGM("; ");
+      SERIAL_ECHOPGM_P(pstr);
+      if (eol) SERIAL_EOL();
+    }
+  }
 
-  void M92_report(const bool echo=true, const int8_t e=-1);
+  #define CONFIG_ECHO_START()       do{ if (!forReplay) SERIAL_ECHO_START(); }while(0)
+  #define CONFIG_ECHO_MSG(V...)     do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
+  #define CONFIG_ECHO_HEADING(STR)  config_heading(forReplay, PSTR(STR))
+
+  #if HAS_TRINAMIC_CONFIG
+    inline void say_M906(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M906"); }
+    #if HAS_STEALTHCHOP
+      void say_M569(const bool forReplay, const char * const etc=nullptr, const bool newLine = false) {
+        CONFIG_ECHO_START();
+        SERIAL_ECHOPGM("  M569 S1");
+        if (etc) {
+          SERIAL_CHAR(' ');
+          SERIAL_ECHOPGM_P(etc);
+        }
+        if (newLine) SERIAL_EOL();
+      }
+    #endif
+    #if ENABLED(HYBRID_THRESHOLD)
+      inline void say_M913(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M913"); }
+    #endif
+    #if USE_SENSORLESS
+      inline void say_M914() { SERIAL_ECHOPGM("  M914"); }
+    #endif
+  #endif
+
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+    inline void say_M603(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M603 "); }
+  #endif
+
+  inline void say_units(const bool colon) {
+    SERIAL_ECHOPGM_P(
+      #if ENABLED(INCH_MODE_SUPPORT)
+        parser.linear_unit_factor != 1.0 ? PSTR(" (in)") :
+      #endif
+      PSTR(" (mm)")
+    );
+    if (colon) SERIAL_ECHOLNPGM(":");
+  }
+
+  void report_M92(const bool echo=true, const int8_t e=-1);
 
   /**
    * M503 - Report current settings in RAM
@@ -3022,73 +3021,230 @@ void MarlinSettings::reset() {
    * Unless specifically disabled, M503 is available even without EEPROM
    */
   void MarlinSettings::report(const bool forReplay) {
-    //
-    // Announce current units, in case inches are being displayed
-    //
-    CONFIG_ECHO_HEADING("Linear Units");
+    /**
+     * Announce current units, in case inches are being displayed
+     */
+    CONFIG_ECHO_START();
     #if ENABLED(INCH_MODE_SUPPORT)
-      SERIAL_ECHOPGM("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
+      SERIAL_ECHOPGM("  G2");
+      SERIAL_CHAR(parser.linear_unit_factor == 1.0 ? '1' : '0');
+      SERIAL_ECHOPGM(" ;");
+      say_units(false);
     #else
-      SERIAL_ECHOPGM("  G21 ;");
+      SERIAL_ECHOPGM("  G21    ; Units in mm");
+      say_units(false);
     #endif
-    gcode.say_units();
+    SERIAL_EOL();
+
+    #if HAS_LCD_MENU
+
+      // Temperature units - for Ultipanel temperature options
+
+      CONFIG_ECHO_START();
+      #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
+        SERIAL_ECHOPGM("  M149 ");
+        SERIAL_CHAR(parser.temp_units_code());
+        SERIAL_ECHOPGM(" ; Units in ");
+        SERIAL_ECHOPGM_P(parser.temp_units_name());
+      #else
+        SERIAL_ECHOLNPGM("  M149 C ; Units in Celsius");
+      #endif
 
-    //
-    // M149 Temperature units
-    //
-    #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
-      gcode.M149_report(forReplay);
-    #else
-      CONFIG_ECHO_HEADING(STR_TEMPERATURE_UNITS);
-      CONFIG_ECHO_MSG("  M149 C ; Units in Celsius");
     #endif
 
-    //
-    // M200 Volumetric Extrusion
-    //
-    IF_DISABLED(NO_VOLUMETRICS, gcode.M200_report(forReplay));
+    SERIAL_EOL();
 
-    //
-    // M92 Steps per Unit
-    //
-    gcode.M92_report(forReplay);
+    #if EXTRUDERS && DISABLED(NO_VOLUMETRICS)
 
-    //
-    // M203 Maximum feedrates (units/s)
-    //
-    gcode.M203_report(forReplay);
+      /**
+       * Volumetric extrusion M200
+       */
+      if (!forReplay) {
+        config_heading(forReplay, PSTR("Filament settings:"), false);
+        if (parser.volumetric_enabled)
+          SERIAL_EOL();
+        else
+          SERIAL_ECHOLNPGM(" Disabled");
+      }
 
-    //
-    // M201 Maximum Acceleration (units/s2)
-    //
-    gcode.M201_report(forReplay);
+      #if EXTRUDERS == 1
+        CONFIG_ECHO_MSG("  M200 S", parser.volumetric_enabled
+                            , " D", LINEAR_UNIT(planner.filament_size[0])
+                            #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
+                              , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0])
+                            #endif
+                       );
+      #else
+        LOOP_L_N(i, EXTRUDERS) {
+          CONFIG_ECHO_MSG("  M200 T", i
+                              , " D", LINEAR_UNIT(planner.filament_size[i])
+                              #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
+                                , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
+                              #endif
+                         );
+        }
+        CONFIG_ECHO_MSG("  M200 S", parser.volumetric_enabled);
+      #endif
 
-    //
-    // M204 Acceleration (units/s2)
-    //
-    gcode.M204_report(forReplay);
+    #endif // EXTRUDERS && !NO_VOLUMETRICS
 
-    //
-    // M205 "Advanced" Settings
-    //
-    gcode.M205_report(forReplay);
+    CONFIG_ECHO_HEADING("Steps per unit:");
+    report_M92(!forReplay);
 
-    //
-    // M206 Home Offset
-    //
-    TERN_(HAS_M206_COMMAND, gcode.M206_report(forReplay));
+    CONFIG_ECHO_HEADING("Maximum feedrates (units/s):");
+    CONFIG_ECHO_START();
+    SERIAL_ECHOLNPAIR_P(
+      LIST_N(DOUBLE(LINEAR_AXES),
+        PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
+        SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
+        SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS]),
+        SP_I_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[I_AXIS]),
+        SP_J_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[J_AXIS]),
+        SP_K_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[K_AXIS])
+      )
+      #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
+        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
+      #endif
+    );
+    #if ENABLED(DISTINCT_E_FACTORS)
+      LOOP_L_N(i, E_STEPPERS) {
+        CONFIG_ECHO_START();
+        SERIAL_ECHOLNPAIR_P(
+            PSTR("  M203 T"), i
+          , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
+        );
+      }
+    #endif
 
-    //
-    // M218 Hotend offsets
-    //
-    TERN_(HAS_HOTEND_OFFSET, gcode.M218_report(forReplay));
+    CONFIG_ECHO_HEADING("Maximum Acceleration (units/s2):");
+    CONFIG_ECHO_START();
+    SERIAL_ECHOLNPAIR_P(
+      LIST_N(DOUBLE(LINEAR_AXES),
+        PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
+        SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
+        SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS]),
+        SP_I_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS]),
+        SP_J_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS]),
+        SP_K_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS])
+      )
+      #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
+        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
+      #endif
+    );
+    #if ENABLED(DISTINCT_E_FACTORS)
+      LOOP_L_N(i, E_STEPPERS) {
+        CONFIG_ECHO_START();
+        SERIAL_ECHOLNPAIR_P(
+            PSTR("  M201 T"), i
+          , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
+        );
+      }
+    #endif
 
-    //
-    // Bed Leveling
-    //
+    CONFIG_ECHO_HEADING("Acceleration (units/s2): P<print_accel> R<retract_accel> T<travel_accel>");
+    CONFIG_ECHO_START();
+    SERIAL_ECHOLNPAIR_P(
+        PSTR("  M204 P"), LINEAR_UNIT(planner.settings.acceleration)
+      , PSTR(" R"), LINEAR_UNIT(planner.settings.retract_acceleration)
+      , SP_T_STR, LINEAR_UNIT(planner.settings.travel_acceleration)
+    );
+
+    CONFIG_ECHO_HEADING(
+      "Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
+      #if HAS_JUNCTION_DEVIATION
+        " J<junc_dev>"
+      #endif
+      #if HAS_CLASSIC_JERK
+        " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>"
+        TERN_(HAS_CLASSIC_E_JERK, " E<max_e_jerk>")
+      #endif
+    );
+    CONFIG_ECHO_START();
+    SERIAL_ECHOLNPAIR_P(
+        PSTR("  M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
+      , PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
+      , SP_T_STR, LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
+      #if HAS_JUNCTION_DEVIATION
+        , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
+      #endif
+      #if HAS_CLASSIC_JERK
+        , LIST_N(DOUBLE(LINEAR_AXES),
+          SP_X_STR, LINEAR_UNIT(planner.max_jerk.x),
+          SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y),
+          SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z),
+          SP_I_STR, LINEAR_UNIT(planner.max_jerk.i),
+          SP_J_STR, LINEAR_UNIT(planner.max_jerk.j),
+          SP_K_STR, LINEAR_UNIT(planner.max_jerk.k)
+        )
+        #if HAS_CLASSIC_E_JERK
+          , SP_E_STR, LINEAR_UNIT(planner.max_jerk.e)
+        #endif
+      #endif
+    );
+
+    #if HAS_M206_COMMAND
+      CONFIG_ECHO_HEADING("Home offset:");
+      CONFIG_ECHO_START();
+      SERIAL_ECHOLNPAIR_P(
+        #if IS_CARTESIAN
+          LIST_N(DOUBLE(LINEAR_AXES),
+            PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
+            SP_Y_STR, LINEAR_UNIT(home_offset.y),
+            SP_Z_STR, LINEAR_UNIT(home_offset.z),
+            SP_I_STR, LINEAR_UNIT(home_offset.i),
+            SP_J_STR, LINEAR_UNIT(home_offset.j),
+            SP_K_STR, LINEAR_UNIT(home_offset.k)
+          )
+        #else
+          PSTR("  M206 Z"), LINEAR_UNIT(home_offset.z)
+        #endif
+      );
+    #endif
+
+    #if HAS_HOTEND_OFFSET
+      CONFIG_ECHO_HEADING("Hotend offsets:");
+      CONFIG_ECHO_START();
+      LOOP_S_L_N(e, 1, HOTENDS) {
+        SERIAL_ECHOPAIR_P(
+          PSTR("  M218 T"), e,
+          SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
+          SP_Y_STR, LINEAR_UNIT(hotend_offset[e].y)
+        );
+        SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(hotend_offset[e].z), 3);
+      }
+    #endif
+
+    /**
+     * Bed Leveling
+     */
     #if HAS_LEVELING
 
-      gcode.M420_report(forReplay);
+      #if ENABLED(MESH_BED_LEVELING)
+
+        CONFIG_ECHO_HEADING("Mesh Bed Leveling:");
+
+      #elif ENABLED(AUTO_BED_LEVELING_UBL)
+
+        config_heading(forReplay, NUL_STR, false);
+        if (!forReplay) {
+          ubl.echo_name();
+          SERIAL_CHAR(':');
+          SERIAL_EOL();
+        }
+
+      #elif HAS_ABL_OR_UBL
+
+        CONFIG_ECHO_HEADING("Auto Bed Leveling:");
+
+      #endif
+
+      CONFIG_ECHO_START();
+      SERIAL_ECHOLNPAIR_P(
+        PSTR("  M420 S"), planner.leveling_active
+        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+          , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
+        #endif
+      );
 
       #if ENABLED(MESH_BED_LEVELING)
 
@@ -3096,7 +3252,7 @@ void MarlinSettings::reset() {
           LOOP_L_N(py, GRID_MAX_POINTS_Y) {
             LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
-              SERIAL_ECHOPGM("  G29 S3 I", px, " J", py);
+              SERIAL_ECHOPAIR("  G29 S3 I", px, " J", py);
               SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
             }
           }
@@ -3109,8 +3265,11 @@ void MarlinSettings::reset() {
         if (!forReplay) {
           SERIAL_EOL();
           ubl.report_state();
-          SERIAL_ECHO_MSG("Active Mesh Slot ", ubl.storage_slot);
-          SERIAL_ECHO_MSG("EEPROM can hold ", calc_num_meshes(), " meshes.\n");
+          config_heading(false, PSTR("Active Mesh Slot: "), false);
+          SERIAL_ECHOLN(ubl.storage_slot);
+          config_heading(false, PSTR("EEPROM can hold "), false);
+          SERIAL_ECHO(calc_num_meshes());
+          SERIAL_ECHOLNPGM(" meshes.\n");
         }
 
        //ubl.report_current_mesh();   // This is too verbose for large meshes. A better (more terse)
@@ -3121,7 +3280,7 @@ void MarlinSettings::reset() {
           LOOP_L_N(py, GRID_MAX_POINTS_Y) {
             LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
-              SERIAL_ECHOPGM("  G29 W I", px, " J", py);
+              SERIAL_ECHOPAIR("  G29 W I", px, " J", py);
               SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(z_values[px][py]), 5);
             }
           }
@@ -3131,150 +3290,602 @@ void MarlinSettings::reset() {
 
     #endif // HAS_LEVELING
 
-    //
-    // Editable Servo Angles
-    //
-    TERN_(EDITABLE_SERVO_ANGLES, gcode.M281_report(forReplay));
+    #if ENABLED(EDITABLE_SERVO_ANGLES)
 
-    //
-    // Delta / SCARA Kinematics
-    //
-    TERN_(IS_KINEMATIC, gcode.M665_report(forReplay));
+      CONFIG_ECHO_HEADING("Servo Angles:");
+      LOOP_L_N(i, NUM_SERVOS) {
+        switch (i) {
+          #if ENABLED(SWITCHING_EXTRUDER)
+            case SWITCHING_EXTRUDER_SERVO_NR:
+            #if EXTRUDERS > 3
+              case SWITCHING_EXTRUDER_E23_SERVO_NR:
+            #endif
+          #elif ENABLED(SWITCHING_NOZZLE)
+            case SWITCHING_NOZZLE_SERVO_NR:
+          #elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES))
+            case Z_PROBE_SERVO_NR:
+          #endif
+            CONFIG_ECHO_MSG("  M281 P", i, " L", servo_angles[i][0], " U", servo_angles[i][1]);
+          default: break;
+        }
+      }
+
+    #endif // EDITABLE_SERVO_ANGLES
+
+    #if HAS_SCARA_OFFSET
+
+      CONFIG_ECHO_HEADING("SCARA settings: S<seg-per-sec> P<theta-psi-offset> T<theta-offset>");
+      CONFIG_ECHO_START();
+      SERIAL_ECHOLNPAIR_P(
+          PSTR("  M665 S"), segments_per_second
+        , SP_P_STR, scara_home_offset.a
+        , SP_T_STR, scara_home_offset.b
+        , SP_Z_STR, LINEAR_UNIT(scara_home_offset.z)
+      );
+
+    #elif ENABLED(DELTA)
+
+      CONFIG_ECHO_HEADING("Delta settings: L<diagonal rod> R<radius> H<height> S<segments per sec> XYZ<tower angle trim> ABC<rod trim>");
+      CONFIG_ECHO_START();
+      SERIAL_ECHOLNPAIR_P(
+          PSTR("  M665 L"), LINEAR_UNIT(delta_diagonal_rod)
+        , PSTR(" R"), LINEAR_UNIT(delta_radius)
+        , PSTR(" H"), LINEAR_UNIT(delta_height)
+        , PSTR(" S"), segments_per_second
+        , SP_X_STR, LINEAR_UNIT(delta_tower_angle_trim.a)
+        , SP_Y_STR, LINEAR_UNIT(delta_tower_angle_trim.b)
+        , SP_Z_STR, LINEAR_UNIT(delta_tower_angle_trim.c)
+        , PSTR(" A"), LINEAR_UNIT(delta_diagonal_rod_trim.a)
+        , PSTR(" B"), LINEAR_UNIT(delta_diagonal_rod_trim.b)
+        , PSTR(" C"), LINEAR_UNIT(delta_diagonal_rod_trim.c)
+      );
+
+    #endif
 
-    //
-    // M666 Endstops Adjustment
-    //
     #if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
-      gcode.M666_report(forReplay);
+      M666_report(forReplay);
     #endif
 
-    //
-    // Z Auto-Align
-    //
-    TERN_(Z_STEPPER_AUTO_ALIGN, gcode.M422_report(forReplay));
-
-    //
-    // LCD Preheat Settings
-    //
     #if PREHEAT_COUNT
-      gcode.M145_report(forReplay);
+
+      CONFIG_ECHO_HEADING("Material heatup parameters:");
+      LOOP_L_N(i, PREHEAT_COUNT) {
+        CONFIG_ECHO_START();
+        SERIAL_ECHOLNPAIR_P(
+          PSTR("  M145 S"), i
+          #if HAS_HOTEND
+            , PSTR(" H"), parser.to_temp_units(ui.material_preset[i].hotend_temp)
+          #endif
+          #if HAS_HEATED_BED
+            , SP_B_STR, parser.to_temp_units(ui.material_preset[i].bed_temp)
+          #endif
+          #if HAS_FAN
+            , PSTR(" F"), ui.material_preset[i].fan_speed
+          #endif
+        );
+      }
+
     #endif
 
-    //
-    // PID
-    //
-    TERN_(PIDTEMP,        gcode.M301_report(forReplay));
-    TERN_(PIDTEMPBED,     gcode.M304_report(forReplay));
-    TERN_(PIDTEMPCHAMBER, gcode.M309_report(forReplay));
+    #if HAS_PID_HEATING
+
+      CONFIG_ECHO_HEADING("PID settings:");
+
+      #if ENABLED(PIDTEMP)
+        HOTEND_LOOP() {
+          CONFIG_ECHO_START();
+          SERIAL_ECHOPAIR_P(
+            #if ENABLED(PID_PARAMS_PER_HOTEND)
+              PSTR("  M301 E"), e,
+              SP_P_STR
+            #else
+              PSTR("  M301 P")
+            #endif
+                        , PID_PARAM(Kp, e)
+            , PSTR(" I"), unscalePID_i(PID_PARAM(Ki, e))
+            , PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
+          );
+          #if ENABLED(PID_EXTRUSION_SCALING)
+            SERIAL_ECHOPAIR_P(SP_C_STR, PID_PARAM(Kc, e));
+            if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
+          #endif
+          #if ENABLED(PID_FAN_SCALING)
+            SERIAL_ECHOPAIR(" F", PID_PARAM(Kf, e));
+          #endif
+          SERIAL_EOL();
+        }
+      #endif // PIDTEMP
+
+      #if ENABLED(PIDTEMPBED)
+        CONFIG_ECHO_MSG(
+            "  M304 P", thermalManager.temp_bed.pid.Kp
+          , " I", unscalePID_i(thermalManager.temp_bed.pid.Ki)
+          , " D", unscalePID_d(thermalManager.temp_bed.pid.Kd)
+        );
+      #endif
+
+      #if ENABLED(PIDTEMPCHAMBER)
+        CONFIG_ECHO_START();
+        SERIAL_ECHOLNPAIR(
+            "  M309 P", thermalManager.temp_chamber.pid.Kp
+          , " I", unscalePID_i(thermalManager.temp_chamber.pid.Ki)
+          , " D", unscalePID_d(thermalManager.temp_chamber.pid.Kd)
+        );
+      #endif
+
+    #endif // PIDTEMP || PIDTEMPBED || PIDTEMPCHAMBER
 
     #if HAS_USER_THERMISTORS
+      CONFIG_ECHO_HEADING("User thermistors:");
       LOOP_L_N(i, USER_THERMISTORS)
-        thermalManager.M305_report(i, forReplay);
+        thermalManager.log_user_thermistor(i, true);
     #endif
 
-    //
-    // LCD Contrast
-    //
-    TERN_(HAS_LCD_CONTRAST, gcode.M250_report(forReplay));
+    #if HAS_LCD_CONTRAST
+      CONFIG_ECHO_HEADING("LCD Contrast:");
+      CONFIG_ECHO_MSG("  M250 C", ui.contrast);
+    #endif
 
-    //
-    // LCD Brightness
-    //
-    TERN_(HAS_LCD_BRIGHTNESS, gcode.M256_report(forReplay));
+    #if HAS_LCD_BRIGHTNESS
+      CONFIG_ECHO_HEADING("LCD Brightness:");
+      CONFIG_ECHO_MSG("  M256 B", ui.brightness);
+    #endif
 
-    //
-    // Controller Fan
-    //
-    TERN_(CONTROLLER_FAN_EDITABLE, gcode.M710_report(forReplay));
+    TERN_(CONTROLLER_FAN_EDITABLE, M710_report(forReplay));
 
-    //
-    // Power-Loss Recovery
-    //
-    TERN_(POWER_LOSS_RECOVERY, gcode.M413_report(forReplay));
+    #if ENABLED(POWER_LOSS_RECOVERY)
+      CONFIG_ECHO_HEADING("Power-Loss Recovery:");
+      CONFIG_ECHO_MSG("  M413 S", recovery.enabled);
+    #endif
 
-    //
-    // Firmware Retraction
-    //
     #if ENABLED(FWRETRACT)
-      gcode.M207_report(forReplay);
-      gcode.M208_report(forReplay);
-      TERN_(FWRETRACT_AUTORETRACT, gcode.M209_report(forReplay));
+      fwretract.M207_report(forReplay);
+      fwretract.M208_report(forReplay);
+      TERN_(FWRETRACT_AUTORETRACT, fwretract.M209_report(forReplay));
     #endif
 
-    //
-    // Probe Offset
-    //
-    TERN_(HAS_BED_PROBE, gcode.M851_report(forReplay));
+    /**
+     * Probe Offset
+     */
+    #if HAS_BED_PROBE
+      config_heading(forReplay, PSTR("Z-Probe Offset"), false);
+      if (!forReplay) say_units(true);
+      CONFIG_ECHO_START();
+      SERIAL_ECHOLNPAIR_P(
+        #if HAS_PROBE_XY_OFFSET
+          PSTR("  M851 X"), LINEAR_UNIT(probe.offset_xy.x),
+                  SP_Y_STR, LINEAR_UNIT(probe.offset_xy.y),
+                  SP_Z_STR
+        #else
+          PSTR("  M851 X0 Y0 Z")
+        #endif
+        , LINEAR_UNIT(probe.offset.z)
+      );
+    #endif
 
-    //
-    // Bed Skew Correction
-    //
-    TERN_(SKEW_CORRECTION_GCODE, gcode.M852_report(forReplay));
+    /**
+     * Bed Skew Correction
+     */
+    #if ENABLED(SKEW_CORRECTION_GCODE)
+      CONFIG_ECHO_HEADING("Skew Factor: ");
+      CONFIG_ECHO_START();
+      #if ENABLED(SKEW_CORRECTION_FOR_Z)
+        SERIAL_ECHOPAIR_F("  M852 I", LINEAR_UNIT(planner.skew_factor.xy), 6);
+        SERIAL_ECHOPAIR_F(" J", LINEAR_UNIT(planner.skew_factor.xz), 6);
+        SERIAL_ECHOLNPAIR_F(" K", LINEAR_UNIT(planner.skew_factor.yz), 6);
+      #else
+        SERIAL_ECHOLNPAIR_F("  M852 S", LINEAR_UNIT(planner.skew_factor.xy), 6);
+      #endif
+    #endif
 
     #if HAS_TRINAMIC_CONFIG
-      //
-      // TMC Stepper driver current
-      //
-      gcode.M906_report(forReplay);
 
-      //
-      // TMC Hybrid Threshold
-      //
-      TERN_(HYBRID_THRESHOLD, gcode.M913_report(forReplay));
+      /**
+       * TMC stepper driver current
+       */
+      CONFIG_ECHO_HEADING("Stepper driver current:");
 
-      //
-      // TMC Sensorless homing thresholds
-      //
-      TERN_(USE_SENSORLESS, gcode.M914_report(forReplay));
+      #if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
+        say_M906(forReplay);
+        #if AXIS_IS_TMC(X)
+          SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.getMilliamps());
+        #endif
+        #if AXIS_IS_TMC(Y)
+          SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.getMilliamps());
+        #endif
+        #if AXIS_IS_TMC(Z)
+          SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.getMilliamps());
+        #endif
+        SERIAL_EOL();
+      #endif
+
+      #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2)
+        say_M906(forReplay);
+        SERIAL_ECHOPGM(" I1");
+        #if AXIS_IS_TMC(X2)
+          SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.getMilliamps());
+        #endif
+        #if AXIS_IS_TMC(Y2)
+          SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.getMilliamps());
+        #endif
+        #if AXIS_IS_TMC(Z2)
+          SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.getMilliamps());
+        #endif
+        SERIAL_EOL();
+      #endif
+
+      #if AXIS_IS_TMC(Z3)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.getMilliamps());
+      #endif
+
+      #if AXIS_IS_TMC(Z4)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.getMilliamps());
+      #endif
+
+      #if AXIS_IS_TMC(I)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(J)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(K)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.getMilliamps());
+      #endif
+
+      #if AXIS_IS_TMC(E0)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T0 E", stepperE0.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E1)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T1 E", stepperE1.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E2)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T2 E", stepperE2.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E3)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T3 E", stepperE3.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E4)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T4 E", stepperE4.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E5)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T5 E", stepperE5.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E6)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T6 E", stepperE6.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(E7)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR(" T7 E", stepperE7.getMilliamps());
+      #endif
+      SERIAL_EOL();
+
+      /**
+       * TMC Hybrid Threshold
+       */
+      #if ENABLED(HYBRID_THRESHOLD)
+        CONFIG_ECHO_HEADING("Hybrid Threshold:");
+        #if X_HAS_STEALTHCHOP || Y_HAS_STEALTHCHOP || Z_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          #if X_HAS_STEALTHCHOP
+            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs());
+          #endif
+          #if Y_HAS_STEALTHCHOP
+            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs());
+          #endif
+          #if Z_HAS_STEALTHCHOP
+            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs());
+          #endif
+          SERIAL_EOL();
+        #endif
+
+        #if X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOPGM(" I1");
+          #if X2_HAS_STEALTHCHOP
+            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs());
+          #endif
+          #if Y2_HAS_STEALTHCHOP
+            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs());
+          #endif
+          #if Z2_HAS_STEALTHCHOP
+            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
+          #endif
+          SERIAL_EOL();
+        #endif
+
+        #if Z3_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.get_pwm_thrs());
+        #endif
+
+        #if Z4_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.get_pwm_thrs());
+        #endif
+
+        #if I_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.get_pwm_thrs());
+        #endif
+        #if J_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.get_pwm_thrs());
+        #endif
+        #if K_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.get_pwm_thrs());
+        #endif
+
+        #if E0_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T0 E", stepperE0.get_pwm_thrs());
+        #endif
+        #if E1_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T1 E", stepperE1.get_pwm_thrs());
+        #endif
+        #if E2_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T2 E", stepperE2.get_pwm_thrs());
+        #endif
+        #if E3_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T3 E", stepperE3.get_pwm_thrs());
+        #endif
+        #if E4_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T4 E", stepperE4.get_pwm_thrs());
+        #endif
+        #if E5_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T5 E", stepperE5.get_pwm_thrs());
+        #endif
+        #if E6_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T6 E", stepperE6.get_pwm_thrs());
+        #endif
+        #if E7_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR(" T7 E", stepperE7.get_pwm_thrs());
+        #endif
+        SERIAL_EOL();
+      #endif // HYBRID_THRESHOLD
+
+      /**
+       * TMC Sensorless homing thresholds
+       */
+      #if USE_SENSORLESS
+        CONFIG_ECHO_HEADING("StallGuard threshold:");
+        #if X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          #if X_SENSORLESS
+            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.homing_threshold());
+          #endif
+          #if Y_SENSORLESS
+            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.homing_threshold());
+          #endif
+          #if Z_SENSORLESS
+            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.homing_threshold());
+          #endif
+          SERIAL_EOL();
+        #endif
+
+        #if X2_SENSORLESS || Y2_SENSORLESS || Z2_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOPGM(" I1");
+          #if X2_SENSORLESS
+            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.homing_threshold());
+          #endif
+          #if Y2_SENSORLESS
+            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.homing_threshold());
+          #endif
+          #if Z2_SENSORLESS
+            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.homing_threshold());
+          #endif
+          SERIAL_EOL();
+        #endif
+
+        #if Z3_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.homing_threshold());
+        #endif
+
+        #if Z4_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.homing_threshold());
+        #endif
+
+        #if I_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.homing_threshold());
+        #endif
+        #if J_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.homing_threshold());
+        #endif
+        #if K_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.homing_threshold());
+        #endif
+
+      #endif // USE_SENSORLESS
+
+      /**
+       * TMC stepping mode
+       */
+      #if HAS_STEALTHCHOP
+        CONFIG_ECHO_HEADING("Driver stepping mode:");
+        const bool chop_x = TERN0(X_HAS_STEALTHCHOP, stepperX.get_stored_stealthChop()),
+                   chop_y = TERN0(Y_HAS_STEALTHCHOP, stepperY.get_stored_stealthChop()),
+                   chop_z = TERN0(Z_HAS_STEALTHCHOP, stepperZ.get_stored_stealthChop()),
+                   chop_i = TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()),
+                   chop_j = TERN0(J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()),
+                   chop_k = TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop());
+
+        if (chop_x || chop_y || chop_z || chop_i || chop_j || chop_k) {
+          say_M569(forReplay);
+          LINEAR_AXIS_CODE(
+            if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR),
+            if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR),
+            if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR),
+            if (chop_i) SERIAL_ECHOPGM_P(SP_I_STR),
+            if (chop_j) SERIAL_ECHOPGM_P(SP_J_STR),
+            if (chop_k) SERIAL_ECHOPGM_P(SP_K_STR)
+          );
+          SERIAL_EOL();
+        }
+
+        const bool chop_x2 = TERN0(X2_HAS_STEALTHCHOP, stepperX2.get_stored_stealthChop()),
+                   chop_y2 = TERN0(Y2_HAS_STEALTHCHOP, stepperY2.get_stored_stealthChop()),
+                   chop_z2 = TERN0(Z2_HAS_STEALTHCHOP, stepperZ2.get_stored_stealthChop());
+
+        if (chop_x2 || chop_y2 || chop_z2) {
+          say_M569(forReplay, PSTR("I1"));
+          if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
+          if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
+          if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
+          SERIAL_EOL();
+        }
+
+        if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I2 Z"), true); }
+        if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I3 Z"), true); }
+
+        if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, SP_I_STR, true); }
+        if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, SP_J_STR, true); }
+        if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, SP_K_STR, true); }
+
+        if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T0 E"), true); }
+        if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T1 E"), true); }
+        if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T2 E"), true); }
+        if (TERN0(E3_HAS_STEALTHCHOP, stepperE3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T3 E"), true); }
+        if (TERN0(E4_HAS_STEALTHCHOP, stepperE4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T4 E"), true); }
+        if (TERN0(E5_HAS_STEALTHCHOP, stepperE5.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T5 E"), true); }
+        if (TERN0(E6_HAS_STEALTHCHOP, stepperE6.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T6 E"), true); }
+        if (TERN0(E7_HAS_STEALTHCHOP, stepperE7.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T7 E"), true); }
+
+      #endif // HAS_STEALTHCHOP
+
+    #endif // HAS_TRINAMIC_CONFIG
+
+    /**
+     * Linear Advance
+     */
+    #if ENABLED(LIN_ADVANCE)
+      CONFIG_ECHO_HEADING("Linear Advance:");
+      #if EXTRUDERS < 2
+        CONFIG_ECHO_MSG("  M900 K", planner.extruder_advance_K[0]);
+      #else
+        LOOP_L_N(i, EXTRUDERS)
+          CONFIG_ECHO_MSG("  M900 T", i, " K", planner.extruder_advance_K[i]);
+      #endif
     #endif
 
-    //
-    // TMC stepping mode
-    //
-    TERN_(HAS_STEALTHCHOP, gcode.M569_report(forReplay));
-
-    //
-    // Linear Advance
-    //
-    TERN_(LIN_ADVANCE, gcode.M900_report(forReplay));
-
-    //
-    // Motor Current (SPI or PWM)
-    //
-    #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
-      gcode.M907_report(forReplay);
+    #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM)
+      CONFIG_ECHO_HEADING("Stepper motor currents:");
+      CONFIG_ECHO_START();
+      #if HAS_MOTOR_CURRENT_PWM
+        SERIAL_ECHOLNPAIR_P(                                   // PWM-based has 3 values:
+            PSTR("  M907 X"), stepper.motor_current_setting[0] // X and Y
+                  , SP_Z_STR, stepper.motor_current_setting[1] // Z
+                  , SP_E_STR, stepper.motor_current_setting[2] // E
+        );
+      #elif HAS_MOTOR_CURRENT_SPI
+        SERIAL_ECHOPGM("  M907");                              // SPI-based has 5 values:
+        LOOP_LOGICAL_AXES(q) {                                 // X Y Z (I J K) E (map to X Y Z (I J K) E0 by default)
+          SERIAL_CHAR(' ', axis_codes[q]);
+          SERIAL_ECHO(stepper.motor_current_setting[q]);
+        }
+        SERIAL_CHAR(' ', 'B');                                 // B (maps to E1 by default)
+        SERIAL_ECHOLN(stepper.motor_current_setting[4]);
+      #endif
+    #elif HAS_MOTOR_CURRENT_I2C                                // i2c-based has any number of values
+      // Values sent over i2c are not stored.
+      // Indexes map directly to drivers, not axes.
+    #elif HAS_MOTOR_CURRENT_DAC                                // DAC-based has 4 values, for X Y Z (I J K) E
+      // Values sent over i2c are not stored. Uses indirect mapping.
     #endif
 
-    //
-    // Advanced Pause filament load & unload lengths
-    //
-    TERN_(ADVANCED_PAUSE_FEATURE, gcode.M603_report(forReplay));
+    /**
+     * Advanced Pause filament load & unload lengths
+     */
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      CONFIG_ECHO_HEADING("Filament load/unload lengths:");
+      #if EXTRUDERS == 1
+        say_M603(forReplay);
+        SERIAL_ECHOLNPAIR("L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length));
+      #else
+        auto echo_603 = [](const bool f, const uint8_t n) { say_M603(f); SERIAL_ECHOLNPAIR("T", n, " L", LINEAR_UNIT(fc_settings[n].load_length), " U", LINEAR_UNIT(fc_settings[n].unload_length)); };
+        LOOP_L_N(i, EXTRUDERS) echo_603(forReplay, i);
+      #endif
+    #endif
 
-    //
-    // Tool-changing Parameters
-    //
-    TERN_(HAS_MULTI_EXTRUDER, gcode.M217_report(forReplay));
+    #if HAS_MULTI_EXTRUDER
+      CONFIG_ECHO_HEADING("Tool-changing:");
+      CONFIG_ECHO_START();
+      M217_report(true);
+    #endif
 
-    //
-    // Backlash Compensation
-    //
-    TERN_(BACKLASH_GCODE, gcode.M425_report(forReplay));
+    #if ENABLED(BACKLASH_GCODE)
+      CONFIG_ECHO_HEADING("Backlash compensation:");
+      CONFIG_ECHO_START();
+      SERIAL_ECHOLNPAIR_P(
+          PSTR("  M425 F"), backlash.get_correction()
+        , LIST_N(DOUBLE(LINEAR_AXES),
+            SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x),
+            SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y),
+            SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z),
+            SP_I_STR, LINEAR_UNIT(backlash.distance_mm.i),
+            SP_J_STR, LINEAR_UNIT(backlash.distance_mm.j),
+            SP_K_STR, LINEAR_UNIT(backlash.distance_mm.k)
+          )
+        #ifdef BACKLASH_SMOOTHING_MM
+          , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
+        #endif
+      );
+    #endif
 
-    //
-    // Filament Runout Sensor
-    //
-    TERN_(HAS_FILAMENT_SENSOR, gcode.M412_report(forReplay));
+    #if HAS_FILAMENT_SENSOR
+      CONFIG_ECHO_HEADING("Filament runout sensor:");
+      CONFIG_ECHO_MSG(
+        "  M412 S", runout.enabled
+        #if HAS_FILAMENT_RUNOUT_DISTANCE
+          , " D", LINEAR_UNIT(runout.runout_distance())
+        #endif
+      );
+    #endif
 
     #if HAS_ETHERNET
-      CONFIG_ECHO_HEADING("Ethernet");
-      if (!forReplay) ETH0_report();
+      CONFIG_ECHO_HEADING("Ethernet:");
+      if (!forReplay) { CONFIG_ECHO_START(); ETH0_report(); }
       CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); MAC_report();
-      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); gcode.M552_report();
-      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); gcode.M553_report();
-      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); gcode.M554_report();
+      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M552_report();
+      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M553_report();
+      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M554_report();
     #endif
 
-    TERN_(HAS_MULTI_LANGUAGE, gcode.M414_report(forReplay));
+    #if HAS_MULTI_LANGUAGE
+      CONFIG_ECHO_HEADING("UI Language:");
+      CONFIG_ECHO_MSG("  M414 S", ui.language);
+    #endif
   }
 
 #endif // !DISABLE_M503
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 83aa150..b8fdaa5 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -257,30 +257,25 @@ xyze_int8_t Stepper::count_direction{0};
   };
 #endif
 
-#define MINDIR(A) (count_direction[_AXIS(A)] < 0)
-#define MAXDIR(A) (count_direction[_AXIS(A)] > 0)
-
-#define STEPTEST(A,M,I) TERN0(HAS_ ##A## ##I## _ ##M, !(TEST(endstops.state(), A## ##I## _ ##M) && M## DIR(A)) && !locked_ ##A## ##I## _motor)
-
-#define DUAL_ENDSTOP_APPLY_STEP(A,V)             \
-  if (separate_multi_axis) {                     \
-    if (ENABLED(A##_HOME_TO_MIN)) {              \
-      if (STEPTEST(A,MIN, )) A## _STEP_WRITE(V); \
-      if (STEPTEST(A,MIN,2)) A##2_STEP_WRITE(V); \
-    }                                            \
-    else if (ENABLED(A##_HOME_TO_MAX)) {         \
-      if (STEPTEST(A,MAX, )) A## _STEP_WRITE(V); \
-      if (STEPTEST(A,MAX,2)) A##2_STEP_WRITE(V); \
-    }                                            \
-  }                                              \
-  else {                                         \
-    A##_STEP_WRITE(V);                           \
-    A##2_STEP_WRITE(V);                          \
+#define DUAL_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
+  if (separate_multi_axis) {                                                                                                \
+    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
+      if (TERN0(HAS_##A##_MIN, !(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
+      if (TERN0(HAS_##A##2_MIN, !(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
+    }                                                                                                                       \
+    else {                                                                                                                  \
+      if (TERN0(HAS_##A##_MAX, !(TEST(endstops.state(), A##_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
+      if (TERN0(HAS_##A##2_MAX, !(TEST(endstops.state(), A##2_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
+    }                                                                                                                       \
+  }                                                                                                                         \
+  else {                                                                                                                    \
+    A##_STEP_WRITE(V);                                                                                                      \
+    A##2_STEP_WRITE(V);                                                                                                     \
   }
 
 #define DUAL_SEPARATE_APPLY_STEP(A,V)             \
   if (separate_multi_axis) {                      \
-    if (!locked_##A## _motor) A## _STEP_WRITE(V); \
+    if (!locked_##A##_motor) A##_STEP_WRITE(V);   \
     if (!locked_##A##2_motor) A##2_STEP_WRITE(V); \
   }                                               \
   else {                                          \
@@ -288,68 +283,60 @@ xyze_int8_t Stepper::count_direction{0};
     A##2_STEP_WRITE(V);                           \
   }
 
-#define TRIPLE_ENDSTOP_APPLY_STEP(A,V)           \
-  if (separate_multi_axis) {                     \
-    if (ENABLED(A##_HOME_TO_MIN)) {              \
-      if (STEPTEST(A,MIN, )) A## _STEP_WRITE(V); \
-      if (STEPTEST(A,MIN,2)) A##2_STEP_WRITE(V); \
-      if (STEPTEST(A,MIN,3)) A##3_STEP_WRITE(V); \
-    }                                            \
-    else if (ENABLED(A##_HOME_TO_MAX)) {         \
-      if (STEPTEST(A,MAX, )) A## _STEP_WRITE(V); \
-      if (STEPTEST(A,MAX,2)) A##2_STEP_WRITE(V); \
-      if (STEPTEST(A,MAX,3)) A##3_STEP_WRITE(V); \
-    }                                            \
-  }                                              \
-  else {                                         \
-    A##_STEP_WRITE(V);                           \
-    A##2_STEP_WRITE(V);                          \
-    A##3_STEP_WRITE(V);                          \
+#define TRIPLE_ENDSTOP_APPLY_STEP(A,V)                                                                                      \
+  if (separate_multi_axis) {                                                                                                \
+    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
+      if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
+      if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
+      if (!(TEST(endstops.state(), A##3_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
+    }                                                                                                                       \
+    else {                                                                                                                  \
+      if (!(TEST(endstops.state(), A##_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
+      if (!(TEST(endstops.state(), A##2_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
+      if (!(TEST(endstops.state(), A##3_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
+    }                                                                                                                       \
+  }                                                                                                                         \
+  else {                                                                                                                    \
+    A##_STEP_WRITE(V);                                                                                                      \
+    A##2_STEP_WRITE(V);                                                                                                     \
+    A##3_STEP_WRITE(V);                                                                                                     \
   }
 
 #define TRIPLE_SEPARATE_APPLY_STEP(A,V)           \
   if (separate_multi_axis) {                      \
-    if (!locked_##A## _motor) A## _STEP_WRITE(V); \
+    if (!locked_##A##_motor) A##_STEP_WRITE(V);   \
     if (!locked_##A##2_motor) A##2_STEP_WRITE(V); \
     if (!locked_##A##3_motor) A##3_STEP_WRITE(V); \
   }                                               \
   else {                                          \
-    A## _STEP_WRITE(V);                           \
+    A##_STEP_WRITE(V);                            \
     A##2_STEP_WRITE(V);                           \
     A##3_STEP_WRITE(V);                           \
   }
 
-#define QUAD_ENDSTOP_APPLY_STEP(A,V)             \
-  if (separate_multi_axis) {                     \
-    if (ENABLED(A##_HOME_TO_MIN)) {              \
-      if (STEPTEST(A,MIN, )) A## _STEP_WRITE(V); \
-      if (STEPTEST(A,MIN,2)) A##2_STEP_WRITE(V); \
-      if (STEPTEST(A,MIN,3)) A##3_STEP_WRITE(V); \
-      if (STEPTEST(A,MIN,4)) A##4_STEP_WRITE(V); \
-    }                                            \
-    else if (ENABLED(A##_HOME_TO_MAX)) {         \
-      if (STEPTEST(A,MAX, )) A## _STEP_WRITE(V); \
-      if (STEPTEST(A,MAX,2)) A##2_STEP_WRITE(V); \
-      if (STEPTEST(A,MAX,3)) A##3_STEP_WRITE(V); \
-      if (STEPTEST(A,MAX,4)) A##4_STEP_WRITE(V); \
-    }                                            \
-  }                                              \
-  else {                                         \
-    A## _STEP_WRITE(V);                          \
-    A##2_STEP_WRITE(V);                          \
-    A##3_STEP_WRITE(V);                          \
-    A##4_STEP_WRITE(V);                          \
+#define QUAD_ENDSTOP_APPLY_STEP(A,V) \
+  if (separate_multi_axis) {         \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##_MIN,  A##_MAX)))  && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)  A##_STEP_WRITE(V);  \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##2_MIN, A##2_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##3_MIN, A##3_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##4_MIN, A##4_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##4_motor) A##4_STEP_WRITE(V); \
+  }       \
+  else {  \
+    A##_STEP_WRITE(V);  \
+    A##2_STEP_WRITE(V); \
+    A##3_STEP_WRITE(V); \
+    A##4_STEP_WRITE(V); \
   }
 
 #define QUAD_SEPARATE_APPLY_STEP(A,V)             \
   if (separate_multi_axis) {                      \
-    if (!locked_##A## _motor) A## _STEP_WRITE(V); \
+    if (!locked_##A##_motor) A##_STEP_WRITE(V);   \
     if (!locked_##A##2_motor) A##2_STEP_WRITE(V); \
     if (!locked_##A##3_motor) A##3_STEP_WRITE(V); \
     if (!locked_##A##4_motor) A##4_STEP_WRITE(V); \
   }                                               \
   else {                                          \
-    A## _STEP_WRITE(V);                           \
+    A##_STEP_WRITE(V);                            \
     A##2_STEP_WRITE(V);                           \
     A##3_STEP_WRITE(V);                           \
     A##4_STEP_WRITE(V);                           \
@@ -1441,10 +1428,14 @@ void Stepper::isr() {
 
     // Get the interval to the next ISR call
     const uint32_t interval = _MIN(
-      uint32_t(HAL_TIMER_TYPE_MAX),                     // Come back in a very long time
       nextMainISR                                       // Time until the next Pulse / Block phase
-      OPTARG(LIN_ADVANCE, nextAdvanceISR)               // Come back early for Linear Advance?
-      OPTARG(INTEGRATED_BABYSTEPPING, nextBabystepISR)  // Come back early for Babystepping?
+      #if ENABLED(LIN_ADVANCE)
+        , nextAdvanceISR                                // Come back early for Linear Advance?
+      #endif
+      #if ENABLED(INTEGRATED_BABYSTEPPING)
+        , nextBabystepISR                               // Come back early for Babystepping?
+      #endif
+      , uint32_t(HAL_TIMER_TYPE_MAX)                    // Come back in a very long time
     );
 
     //
@@ -1914,7 +1905,7 @@ uint32_t Stepper::block_phase_isr() {
                     laser_trap.acc_step_count += current_block->laser.entry_per;
                     if (laser_trap.cur_power < current_block->laser.power) laser_trap.cur_power++;
                   }
-                  cutter.ocr_set_power(laser_trap.cur_power);
+                  cutter.set_ocr_power(laser_trap.cur_power);
                 }
               }
             #else
@@ -1923,7 +1914,7 @@ uint32_t Stepper::block_phase_isr() {
               else {
                 laser_trap.till_update = LASER_POWER_INLINE_TRAPEZOID_CONT_PER;
                 laser_trap.cur_power = (current_block->laser.power * acc_step_rate) / current_block->nominal_rate;
-                cutter.ocr_set_power(laser_trap.cur_power); // Cycle efficiency is irrelevant it the last line was many cycles
+                cutter.set_ocr_power(laser_trap.cur_power); // Cycle efficiency is irrelevant it the last line was many cycles
               }
             #endif
           }
@@ -1991,7 +1982,7 @@ uint32_t Stepper::block_phase_isr() {
                     laser_trap.acc_step_count += current_block->laser.exit_per;
                     if (laser_trap.cur_power > current_block->laser.power_exit) laser_trap.cur_power--;
                   }
-                  cutter.ocr_set_power(laser_trap.cur_power);
+                  cutter.set_ocr_power(laser_trap.cur_power);
                 }
               }
             #else
@@ -2000,7 +1991,7 @@ uint32_t Stepper::block_phase_isr() {
               else {
                 laser_trap.till_update = LASER_POWER_INLINE_TRAPEZOID_CONT_PER;
                 laser_trap.cur_power = (current_block->laser.power * step_rate) / current_block->nominal_rate;
-                cutter.ocr_set_power(laser_trap.cur_power); // Cycle efficiency isn't relevant when the last line was many cycles
+                cutter.set_ocr_power(laser_trap.cur_power); // Cycle efficiency isn't relevant when the last line was many cycles
               }
             #endif
           }
@@ -2028,7 +2019,7 @@ uint32_t Stepper::block_phase_isr() {
           if (laser_trap.enabled) {
             if (!laser_trap.cruise_set) {
               laser_trap.cur_power = current_block->laser.power;
-              cutter.ocr_set_power(laser_trap.cur_power);
+              cutter.set_ocr_power(laser_trap.cur_power);
               laser_trap.cruise_set = true;
             }
             #if ENABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
@@ -2205,7 +2196,7 @@ uint32_t Stepper::block_phase_isr() {
       accelerate_until = current_block->accelerate_until << oversampling;
       decelerate_after = current_block->decelerate_after << oversampling;
 
-      TERN_(MIXING_EXTRUDER, mixer.stepper_setup(current_block->b_color));
+      TERN_(MIXING_EXTRUDER, mixer.stepper_setup(current_block->b_color))
 
       TERN_(HAS_MULTI_EXTRUDER, stepper_extruder = current_block->extruder);
 
@@ -2249,14 +2240,14 @@ uint32_t Stepper::block_phase_isr() {
           #endif
           // Always have PWM in this case
           if (stat.isPlanned) {                        // Planner controls the laser
-            cutter.ocr_set_power(
+            cutter.set_ocr_power(
               stat.isEnabled ? laser_trap.cur_power : 0 // ON with power or OFF
             );
           }
         #else
           if (stat.isPlanned) {                        // Planner controls the laser
-            #if ENABLED(SPINDLE_LASER_USE_PWM)
-              cutter.ocr_set_power(
+            #if ENABLED(SPINDLE_LASER_PWM)
+              cutter.set_ocr_power(
                 stat.isEnabled ? current_block->laser.power : 0 // ON with power or OFF
               );
             #else
@@ -2303,8 +2294,8 @@ uint32_t Stepper::block_phase_isr() {
         // This should mean ending file with 'M5 I' will stop the laser; thus the inline flag isn't needed
         const power_status_t stat = planner.laser_inline.status;
         if (stat.isPlanned) {             // Planner controls the laser
-          #if ENABLED(SPINDLE_LASER_USE_PWM)
-            cutter.ocr_set_power(
+          #if ENABLED(SPINDLE_LASER_PWM)
+            cutter.set_ocr_power(
               stat.isEnabled ? planner.laser_inline.power : 0 // ON with power or OFF
             );
           #else
@@ -2845,7 +2836,7 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
 #endif
 
 void Stepper::report_a_position(const xyz_long_t &pos) {
-  SERIAL_ECHOLNPGM_P(
+  SERIAL_ECHOLNPAIR_P(
     LIST_N(DOUBLE(LINEAR_AXES),
       TERN(SAYS_A, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
       TERN(SAYS_B, PSTR("B:"), SP_Y_LBL), pos.y,
@@ -3167,7 +3158,7 @@ void Stepper::report_positions() {
 
       #if HAS_MOTOR_CURRENT_SPI
 
-        //SERIAL_ECHOLNPGM("Digipotss current ", current);
+        //SERIAL_ECHOLNPAIR("Digipotss current ", current);
 
         const uint8_t digipot_ch[] = DIGIPOT_CHANNELS;
         set_digipot_value_spi(digipot_ch[driver], current);
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index d2f42b6..236ba5e 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -372,11 +372,11 @@ class Stepper {
         uint8_t cur_power;  // Current laser power
         bool cruise_set;    // Power set up for cruising?
 
-        #if ENABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-          uint16_t till_update;     // Countdown to the next update
-        #else
+        #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
           uint32_t last_step_count, // Step count from the last update
                    acc_step_count;  // Bresenham counter for laser accel/decel
+        #else
+          uint16_t till_update;     // Countdown to the next update
         #endif
       } stepper_laser_t;
 
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index beba036..08d0be0 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -44,7 +44,7 @@
   #include "trinamic.h"
 #endif
 
-void restore_stepper_drivers();  // Called by powerManager.power_on()
+void restore_stepper_drivers();  // Called by PSU_ON
 void reset_stepper_drivers();    // Called by settings.load / settings.reset
 
 // X Stepper
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index 7957a1b..766f8fc 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -121,7 +121,7 @@ void reset_trinamic_drivers();
     #define X_ENABLE_READ() stepperX.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(X)
-    #define X_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(X_STEP_PIN); }while(0)
+    #define X_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(X_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -149,7 +149,7 @@ void reset_trinamic_drivers();
     #define Z_ENABLE_READ() stepperZ.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z)
-    #define Z_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z_STEP_PIN); }while(0)
+    #define Z_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -166,7 +166,7 @@ void reset_trinamic_drivers();
     #define X2_ENABLE_READ() stepperX2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(X2)
-    #define X2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(X2_STEP_PIN); }while(0)
+    #define X2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(X2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -183,7 +183,7 @@ void reset_trinamic_drivers();
     #define Y2_ENABLE_READ() stepperY2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Y2)
-    #define Y2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Y2_STEP_PIN); }while(0)
+    #define Y2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Y2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -200,7 +200,7 @@ void reset_trinamic_drivers();
     #define Z2_ENABLE_READ() stepperZ2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z2)
-    #define Z2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z2_STEP_PIN); }while(0)
+    #define Z2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -217,7 +217,7 @@ void reset_trinamic_drivers();
     #define Z3_ENABLE_READ() stepperZ3.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z3)
-    #define Z3_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z3_STEP_PIN); }while(0)
+    #define Z3_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z3_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -234,7 +234,7 @@ void reset_trinamic_drivers();
     #define Z4_ENABLE_READ() stepperZ4.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z4)
-    #define Z4_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z4_STEP_PIN); }while(0)
+    #define Z4_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z4_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -293,7 +293,7 @@ void reset_trinamic_drivers();
     #define E0_ENABLE_READ() stepperE0.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E0)
-    #define E0_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E0_STEP_PIN); }while(0)
+    #define E0_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E0_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -310,7 +310,7 @@ void reset_trinamic_drivers();
     #define E1_ENABLE_READ() stepperE1.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E1)
-    #define E1_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E1_STEP_PIN); }while(0)
+    #define E1_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E1_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -327,7 +327,7 @@ void reset_trinamic_drivers();
     #define E2_ENABLE_READ() stepperE2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E2)
-    #define E2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E2_STEP_PIN); }while(0)
+    #define E2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -344,7 +344,7 @@ void reset_trinamic_drivers();
     #define E3_ENABLE_READ() stepperE3.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E3)
-    #define E3_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E3_STEP_PIN); }while(0)
+    #define E3_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E3_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -361,7 +361,7 @@ void reset_trinamic_drivers();
     #define E4_ENABLE_READ() stepperE4.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E4)
-    #define E4_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E4_STEP_PIN); }while(0)
+    #define E4_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E4_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -378,7 +378,7 @@ void reset_trinamic_drivers();
     #define E5_ENABLE_READ() stepperE5.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E5)
-    #define E5_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E5_STEP_PIN); }while(0)
+    #define E5_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E5_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -395,7 +395,7 @@ void reset_trinamic_drivers();
     #define E6_ENABLE_READ() stepperE6.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E6)
-    #define E6_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E6_STEP_PIN); }while(0)
+    #define E6_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E6_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -412,6 +412,6 @@ void reset_trinamic_drivers();
     #define E7_ENABLE_READ() stepperE7.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E7)
-    #define E7_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E7_STEP_PIN); }while(0)
+    #define E7_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E7_STEP_PIN); }while(0)
   #endif
 #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 6be98e9..5632213 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -47,8 +47,6 @@
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
@@ -59,31 +57,27 @@
   #include "../feature/host_actions.h"
 #endif
 
-#if HAS_TEMP_SENSOR
-  #include "../gcode/gcode.h"
-#endif
-
 // MAX TC related macros
-#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
-#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
+#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && TEMP_SENSOR_REDUNDANT_SOURCE == (n)))
+#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && TEMP_SENSOR_REDUNDANT_SOURCE == n))
 
 // LIB_MAX6675 can be added to the build_flags in platformio.ini to use a user-defined library
 // If LIB_MAX6675 is not on the build_flags then raw SPI reads will be used.
-#if HAS_MAX6675 && USE_LIB_MAX6675
+#if HAS_MAX6675 && LIB_USR_MAX6675
   #include <max6675.h>
   #define HAS_MAX6675_LIBRARY 1
 #endif
 
 // LIB_MAX31855 can be added to the build_flags in platformio.ini to use a user-defined library.
 // If LIB_MAX31855 is not on the build_flags then raw SPI reads will be used.
-#if HAS_MAX31855 && USE_ADAFRUIT_MAX31855
+#if HAS_MAX31855 && LIB_USR_MAX31855
   #include <Adafruit_MAX31855.h>
   #define HAS_MAX31855_LIBRARY 1
   typedef Adafruit_MAX31855 MAX31855;
 #endif
 
 #if HAS_MAX31865
-  #if USE_ADAFRUIT_MAX31865
+  #if LIB_USR_MAX31865
     #include <Adafruit_MAX31865.h>
     typedef Adafruit_MAX31865 MAX31865;
   #else
@@ -287,7 +281,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
 #endif
 
 #if HAS_TEMP_REDUNDANT
-  redundant_info_t Temperature::temp_redundant;
+  redundant_temp_info_t Temperature::temp_redundant;
 #endif
 
 #if ENABLED(AUTO_POWER_E_FANS)
@@ -394,7 +388,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
     void Temperature::report_fan_speed(const uint8_t fan) {
       if (fan >= FAN_COUNT) return;
       PORT_REDIRECT(SerialMask::All);
-      SERIAL_ECHOLNPGM("M106 P", fan, " S", fan_speed[fan]);
+      SERIAL_ECHOLNPAIR("M106 P", fan, " S", fan_speed[fan]);
     }
   #endif
 
@@ -461,14 +455,6 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
   probe_info_t Temperature::temp_probe; // = { 0 }
 #endif
 
-#if HAS_TEMP_BOARD
-  board_info_t Temperature::temp_board; // = { 0 }
-  #if ENABLED(THERMAL_PROTECTION_BOARD)
-    int16_t Temperature::mintemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_LO_TEMP,
-            Temperature::maxtemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_HI_TEMP;
-  #endif
-#endif
-
 #if ENABLED(PREVENT_COLD_EXTRUSION)
   bool Temperature::allow_cold_extrude = false;
   celsius_t Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
@@ -609,12 +595,10 @@ volatile bool Temperature::raw_temps_ready = false;
     TERN_(HAS_AUTO_FAN, next_auto_fan_check_ms = next_temp_ms + 2500UL);
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
 
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
       return;
     }
 
@@ -635,7 +619,6 @@ volatile bool Temperature::raw_temps_ready = false;
 
     // PID Tuning loop
     wait_for_heatup = true; // Can be interrupted with M108
-    TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT), "Wait for heat up..."));
     while (wait_for_heatup) {
 
       const millis_t ms = millis();
@@ -676,7 +659,7 @@ volatile bool Temperature::raw_temps_ready = false;
             LIMIT(bias, 20, max_pow - 20);
             d = (bias > max_pow >> 1) ? max_pow - 1 - bias : bias;
 
-            SERIAL_ECHOPGM(STR_BIAS, bias, STR_D_COLON, d, STR_T_MIN, minT, STR_T_MAX, maxT);
+            SERIAL_ECHOPAIR(STR_BIAS, bias, STR_D_COLON, d, STR_T_MIN, minT, STR_T_MAX, maxT);
             if (cycles > 2) {
               const float Ku = (4.0f * d) / (float(M_PI) * (maxT - minT) * 0.5f),
                           Tu = float(t_low + t_high) * 0.001f,
@@ -687,16 +670,15 @@ volatile bool Temperature::raw_temps_ready = false;
               tune_pid.Ki = tune_pid.Kp * 2.0f / Tu;
               tune_pid.Kd = tune_pid.Kp * Tu * df;
 
-              SERIAL_ECHOLNPGM(STR_KU, Ku, STR_TU, Tu);
+              SERIAL_ECHOLNPAIR(STR_KU, Ku, STR_TU, Tu);
               if (ischamber || isbed)
                 SERIAL_ECHOLNPGM(" No overshoot");
               else
                 SERIAL_ECHOLNPGM(STR_CLASSIC_PID);
-              SERIAL_ECHOLNPGM(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
+              SERIAL_ECHOLNPAIR(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
             }
           }
           SHV((bias + d) >> 1);
-          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PID_CYCLE), cycles, ncycles));
           cycles++;
           minT = target;
         }
@@ -709,7 +691,6 @@ volatile bool Temperature::raw_temps_ready = false;
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
         break;
       }
 
@@ -745,7 +726,6 @@ volatile bool Temperature::raw_temps_ready = false;
       #endif
       if ((ms - _MIN(t1, t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) {
         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
         break;
@@ -756,13 +736,13 @@ volatile bool Temperature::raw_temps_ready = false;
 
         #if EITHER(PIDTEMPBED, PIDTEMPCHAMBER)
           PGM_P const estring = GHV(PSTR("chamber"), PSTR("bed"), NUL_STR);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
+          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPAIR("Kp ", tune_pid.Kp);
+          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPAIR("Ki ", tune_pid.Ki);
+          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPAIR("Kd ", tune_pid.Kd);
         #else
-          say_default_(); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
-          say_default_(); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
-          say_default_(); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
+          say_default_(); SERIAL_ECHOLNPAIR("Kp ", tune_pid.Kp);
+          say_default_(); SERIAL_ECHOLNPAIR("Ki ", tune_pid.Ki);
+          say_default_(); SERIAL_ECHOLNPAIR("Kd ", tune_pid.Kd);
         #endif
 
         auto _set_hotend_pid = [](const uint8_t e, const PID_t &in_pid) {
@@ -799,7 +779,6 @@ volatile bool Temperature::raw_temps_ready = false;
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
 
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
 
         goto EXIT_M303;
       }
@@ -808,7 +787,7 @@ volatile bool Temperature::raw_temps_ready = false;
       TERN_(HAL_IDLETASK, HAL_idletask());
 
       // Run UI update
-      TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
+      TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
     }
     wait_for_heatup = false;
 
@@ -817,7 +796,6 @@ volatile bool Temperature::raw_temps_ready = false;
     TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
 
     EXIT_M303:
       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true);
@@ -978,26 +956,14 @@ void Temperature::_temp_error(const heater_id_t heater_id, PGM_P const serial_ms
     SERIAL_ERROR_START();
     SERIAL_ECHOPGM_P(serial_msg);
     SERIAL_ECHOPGM(STR_STOPPED_HEATER);
-
-    heater_id_t real_heater_id = heater_id;
-
-    #if HAS_TEMP_REDUNDANT
-      if (heater_id == H_REDUNDANT) {
-        SERIAL_ECHOPGM(STR_REDUNDANT); // print redundant and cascade to print target, too.
-        real_heater_id = (heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET);
-      }
-    #endif
-
-    switch (real_heater_id) {
-      OPTCODE(HAS_TEMP_COOLER,  case H_COOLER:  SERIAL_ECHOPGM(STR_COOLER);         break)
-      OPTCODE(HAS_TEMP_PROBE,   case H_PROBE:   SERIAL_ECHOPGM(STR_PROBE);          break)
-      OPTCODE(HAS_TEMP_BOARD,   case H_BOARD:   SERIAL_ECHOPGM(STR_MOTHERBOARD);    break)
-      OPTCODE(HAS_TEMP_CHAMBER, case H_CHAMBER: SERIAL_ECHOPGM(STR_HEATER_CHAMBER); break)
-      OPTCODE(HAS_TEMP_BED,     case H_BED:     SERIAL_ECHOPGM(STR_HEATER_BED);     break)
-      default:
-        if (real_heater_id >= 0)
-          SERIAL_ECHOLNPGM("E", real_heater_id);
-    }
+    if (heater_id >= 0)
+      SERIAL_ECHO(heater_id);
+    else if (TERN0(HAS_HEATED_CHAMBER, heater_id == H_CHAMBER))
+      SERIAL_ECHOPGM(STR_HEATER_CHAMBER);
+    else if (TERN0(HAS_COOLER, heater_id == H_COOLER))
+      SERIAL_ECHOPGM(STR_COOLER);
+    else
+      SERIAL_ECHOPGM(STR_HEATER_BED);
     SERIAL_EOL();
   }
 
@@ -1028,14 +994,14 @@ void Temperature::_temp_error(const heater_id_t heater_id, PGM_P const serial_ms
 }
 
 void Temperature::max_temp_error(const heater_id_t heater_id) {
-  #if HAS_DWIN_E3V2_BASIC && (HAS_HOTEND || HAS_HEATED_BED)
+  #if ENABLED(DWIN_CREALITY_LCD) && (HAS_HOTEND || HAS_HEATED_BED)
     DWIN_Popup_Temperature(1);
   #endif
   _temp_error(heater_id, PSTR(STR_T_MAXTEMP), GET_TEXT(MSG_ERR_MAXTEMP));
 }
 
 void Temperature::min_temp_error(const heater_id_t heater_id) {
-  #if HAS_DWIN_E3V2_BASIC && (HAS_HOTEND || HAS_HEATED_BED)
+  #if ENABLED(DWIN_CREALITY_LCD) && (HAS_HOTEND || HAS_HEATED_BED)
     DWIN_Popup_Temperature(0);
   #endif
   _temp_error(heater_id, PSTR(STR_T_MINTEMP), GET_TEXT(MSG_ERR_MINTEMP));
@@ -1343,7 +1309,7 @@ void Temperature::manage_heater() {
           if (watch_hotend[e].check(degHotend(e)))  // Increased enough?
             start_watching_hotend(e);               // If temp reached, turn off elapsed check
           else {
-            TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
+            TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
             _temp_error((heater_id_t)e, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
           }
         }
@@ -1356,7 +1322,7 @@ void Temperature::manage_heater() {
   #if HAS_TEMP_REDUNDANT
     // Make sure measured temperatures are close together
     if (ABS(degRedundantTarget() - degRedundant()) > TEMP_SENSOR_REDUNDANT_MAX_DIFF)
-      _temp_error((heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET), PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
+      _temp_error((heater_id_t)TEMP_SENSOR_REDUNDANT_TARGET, PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
   #endif
 
   #if HAS_AUTO_FAN
@@ -1386,7 +1352,7 @@ void Temperature::manage_heater() {
         if (watch_bed.check(degBed()))          // Increased enough?
           start_watching_bed();                 // If temp reached, turn off elapsed check
         else {
-          TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
+          TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
           _temp_error(H_BED, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
         }
       }
@@ -1716,9 +1682,6 @@ void Temperature::manage_heater() {
       #if TEMP_SENSOR_PROBE_IS_CUSTOM
         { true, 0, 0, PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS, 0, 0, PROBE_BETA, 0 },
       #endif
-      #if TEMP_SENSOR_BOARD_IS_CUSTOM
-        { true, 0, 0, BOARD_PULLUP_RESISTOR_OHMS, BOARD_RESISTANCE_25C_OHMS, 0, 0, BOARD_BETA, 0 },
-      #endif
       #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
         { true, 0, 0, REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS, 0, 0, REDUNDANT_BETA, 0 },
       #endif
@@ -1726,9 +1689,13 @@ void Temperature::manage_heater() {
     COPY(user_thermistor, default_user_thermistor);
   }
 
-  void Temperature::M305_report(const uint8_t t_index, const bool forReplay/*=true*/) {
-    gcode.report_heading_etc(forReplay, PSTR(STR_USER_THERMISTORS));
-    SERIAL_ECHOPGM("  M305 P", AS_DIGIT(t_index));
+  void Temperature::log_user_thermistor(const uint8_t t_index, const bool eprom/*=false*/) {
+
+    if (eprom)
+      SERIAL_ECHOPGM("  M305 ");
+    else
+      SERIAL_ECHO_START();
+    SERIAL_CHAR('P', '0' + t_index);
 
     const user_thermistor_t &t = user_thermistor[t_index];
 
@@ -1750,7 +1717,6 @@ void Temperature::manage_heater() {
       TERN_(TEMP_SENSOR_CHAMBER_IS_CUSTOM, t_index == CTI_CHAMBER ? PSTR("CHAMBER") :)
       TERN_(TEMP_SENSOR_COOLER_IS_CUSTOM, t_index == CTI_COOLER ? PSTR("COOLER") :)
       TERN_(TEMP_SENSOR_PROBE_IS_CUSTOM, t_index == CTI_PROBE ? PSTR("PROBE") :)
-      TERN_(TEMP_SENSOR_BOARD_IS_CUSTOM, t_index == CTI_BOARD ? PSTR("BOARD") :)
       TERN_(TEMP_SENSOR_REDUNDANT_IS_CUSTOM, t_index == CTI_REDUNDANT ? PSTR("REDUNDANT") :)
       nullptr
     );
@@ -1794,13 +1760,13 @@ void Temperature::manage_heater() {
   // Derived from RepRap FiveD extruder::getTemperature()
   // For hot end temperature measurement.
   celsius_float_t Temperature::analog_to_celsius_hotend(const int16_t raw, const uint8_t e) {
-    if (e >= HOTENDS) {
-      SERIAL_ERROR_START();
-      SERIAL_ECHO(e);
-      SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER_NUM);
-      kill();
-      return 0;
-    }
+      if (e >= HOTENDS) {
+        SERIAL_ERROR_START();
+        SERIAL_ECHO(e);
+        SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER_NUM);
+        kill();
+        return 0;
+      }
 
     switch (e) {
       case 0:
@@ -1986,32 +1952,14 @@ void Temperature::manage_heater() {
   }
 #endif // HAS_TEMP_PROBE
 
-#if HAS_TEMP_BOARD
-  // For motherboard temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_board(const int16_t raw) {
-    #if TEMP_SENSOR_BOARD_IS_CUSTOM
-      return user_thermistor_to_deg_c(CTI_BOARD, raw);
-    #elif TEMP_SENSOR_BOARD_IS_THERMISTOR
-      SCAN_THERMISTOR_TABLE(TEMPTABLE_BOARD, TEMPTABLE_BOARD_LEN);
-    #elif TEMP_SENSOR_BOARD_IS_AD595
-      return TEMP_AD595(raw);
-    #elif TEMP_SENSOR_BOARD_IS_AD8495
-      return TEMP_AD8495(raw);
-    #else
-      UNUSED(raw);
-      return 0;
-    #endif
-  }
-#endif // HAS_TEMP_BOARD
-
 #if HAS_TEMP_REDUNDANT
   // For redundant temperature measurement.
   celsius_float_t Temperature::analog_to_celsius_redundant(const int16_t raw) {
     #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_REDUNDANT, raw);
-    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0)
+    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature((uint16_t)raw), raw * 0.25);
-    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1)
+    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature((uint16_t)raw), raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
       SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
@@ -2044,7 +1992,7 @@ void Temperature::updateTemperaturesFromRawValues() {
 
   TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].raw = READ_MAX_TC(0));
   TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].raw = READ_MAX_TC(1));
-  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.raw = READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE)));
+  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.raw = READ_MAX_TC(TEMP_SENSOR_REDUNDANT_SOURCE));
 
   #if HAS_HOTEND
     HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].raw, e);
@@ -2054,7 +2002,6 @@ void Temperature::updateTemperaturesFromRawValues() {
   TERN_(HAS_TEMP_CHAMBER,   temp_chamber.celsius   = analog_to_celsius_chamber(temp_chamber.raw));
   TERN_(HAS_TEMP_COOLER,    temp_cooler.celsius    = analog_to_celsius_cooler(temp_cooler.raw));
   TERN_(HAS_TEMP_PROBE,     temp_probe.celsius     = analog_to_celsius_probe(temp_probe.raw));
-  TERN_(HAS_TEMP_BOARD,     temp_board.celsius     = analog_to_celsius_board(temp_board.raw));
   TERN_(HAS_TEMP_REDUNDANT, temp_redundant.celsius = analog_to_celsius_redundant(temp_redundant.raw));
 
   TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_measured_mm());
@@ -2102,28 +2049,23 @@ void Temperature::updateTemperaturesFromRawValues() {
 
   #endif // HAS_HOTEND
 
-  #define TP_CMP(S,A,B) (TEMPDIR(S) < 0 ? ((A)<(B)) : ((A)>(B)))
   #if ENABLED(THERMAL_PROTECTION_BED)
-    if (TP_CMP(BED, temp_bed.raw, maxtemp_raw_BED)) max_temp_error(H_BED);
-    if (temp_bed.target > 0 && TP_CMP(BED, mintemp_raw_BED, temp_bed.raw)) min_temp_error(H_BED);
+    #define BEDCMP(A,B) (TEMPDIR(BED) < 0 ? ((A)<(B)) : ((A)>(B)))
+    if (BEDCMP(temp_bed.raw, maxtemp_raw_BED)) max_temp_error(H_BED);
+    if (temp_bed.target > 0 && BEDCMP(mintemp_raw_BED, temp_bed.raw)) min_temp_error(H_BED);
   #endif
 
   #if BOTH(HAS_HEATED_CHAMBER, THERMAL_PROTECTION_CHAMBER)
-    if (TP_CMP(CHAMBER, temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
-    if (temp_chamber.target > 0 && TP_CMP(CHAMBER, mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(H_CHAMBER);
+    #define CHAMBERCMP(A,B) (TEMPDIR(CHAMBER) < 0 ? ((A)<(B)) : ((A)>(B)))
+    if (CHAMBERCMP(temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
+    if (temp_chamber.target > 0 && CHAMBERCMP(mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(H_CHAMBER);
   #endif
 
   #if BOTH(HAS_COOLER, THERMAL_PROTECTION_COOLER)
-    if (cutter.unitPower > 0 && TP_CMP(COOLER, temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
-    if (TP_CMP(COOLER, mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
+    #define COOLERCMP(A,B) (TEMPDIR(COOLER) < 0 ? ((A)<(B)) : ((A)>(B)))
+    if (cutter.unitPower > 0 && COOLERCMP(temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
+    if (COOLERCMP(mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
   #endif
-
-  #if BOTH(HAS_TEMP_BOARD, THERMAL_PROTECTION_BOARD)
-    if (TP_CMP(BOARD, temp_board.raw, maxtemp_raw_BOARD)) max_temp_error(H_BOARD);
-    if (TP_CMP(BOARD, mintemp_raw_BOARD, temp_board.raw)) min_temp_error(H_BOARD);
-  #endif
-  #undef TP_CMP
-
 } // Temperature::updateTemperaturesFromRawValues
 
 /**
@@ -2298,7 +2240,9 @@ void Temperature::init() {
     INIT_FAN_PIN(CONTROLLER_FAN_PIN);
   #endif
 
-  TERN_(HAS_MAXTC_SW_SPI, max_tc_spi.init());
+  #if HAS_MAXTC_SW_SPI
+    max_tc_spi.init();
+  #endif
 
   HAL_adc_init();
 
@@ -2350,9 +2294,6 @@ void Temperature::init() {
   #if HAS_TEMP_ADC_PROBE
     HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
   #endif
-  #if HAS_TEMP_ADC_BOARD
-    HAL_ANALOG_SELECT(TEMP_BOARD_PIN);
-  #endif
   #if HAS_TEMP_ADC_REDUNDANT
     HAL_ANALOG_SELECT(TEMP_REDUNDANT_PIN);
   #endif
@@ -2466,7 +2407,6 @@ void Temperature::init() {
     #endif
   #endif // HAS_HOTEND
 
-  // TODO: combine these into the macros above
   #if HAS_HEATED_BED
     while (analog_to_celsius_bed(mintemp_raw_BED) < BED_MINTEMP) mintemp_raw_BED += TEMPDIR(BED) * (OVERSAMPLENR);
     while (analog_to_celsius_bed(maxtemp_raw_BED) > BED_MAXTEMP) maxtemp_raw_BED -= TEMPDIR(BED) * (OVERSAMPLENR);
@@ -2482,25 +2422,18 @@ void Temperature::init() {
     while (analog_to_celsius_cooler(maxtemp_raw_COOLER) < COOLER_MAXTEMP) maxtemp_raw_COOLER -= TEMPDIR(COOLER) * (OVERSAMPLENR);
   #endif
 
-  #if BOTH(HAS_TEMP_BOARD, THERMAL_PROTECTION_BOARD)
-    while (analog_to_celsius_board(mintemp_raw_BOARD) < BOARD_MINTEMP) mintemp_raw_BOARD += TEMPDIR(BOARD) * (OVERSAMPLENR);
-    while (analog_to_celsius_board(maxtemp_raw_BOARD) > BOARD_MAXTEMP) maxtemp_raw_BOARD -= TEMPDIR(BOARD) * (OVERSAMPLENR);
-  #endif
-
   #if HAS_TEMP_REDUNDANT
     temp_redundant.target = &(
-      #if REDUNDANT_TEMP_MATCH(TARGET, COOLER) && HAS_TEMP_COOLER
+      #if TEMP_SENSOR_REDUNDANT_TARGET == -5 && HAS_TEMP_COOLER
         temp_cooler
-      #elif REDUNDANT_TEMP_MATCH(TARGET, PROBE) && HAS_TEMP_PROBE
+      #elif TEMP_SENSOR_REDUNDANT_TARGET == -4 && HAS_TEMP_PROBE
         temp_probe
-      #elif REDUNDANT_TEMP_MATCH(TARGET, BOARD) && HAS_TEMP_BOARD
-        temp_board
-      #elif REDUNDANT_TEMP_MATCH(TARGET, CHAMBER) && HAS_TEMP_CHAMBER
+      #elif TEMP_SENSOR_REDUNDANT_TARGET == -2 && HAS_TEMP_CHAMBER
         temp_chamber
-      #elif REDUNDANT_TEMP_MATCH(TARGET, BED) && HAS_TEMP_BED
+      #elif TEMP_SENSOR_REDUNDANT_TARGET == -1 && HAS_TEMP_BED
         temp_bed
       #else
-        temp_hotend[HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET)]
+        temp_hotend[TEMP_SENSOR_REDUNDANT_TARGET]
       #endif
     );
   #endif
@@ -2535,7 +2468,7 @@ void Temperature::init() {
         case H_CHAMBER: SERIAL_ECHOPGM("chamber"); break;
         default:        SERIAL_ECHO(heater_id);
       }
-      SERIAL_ECHOLNPGM(
+      SERIAL_ECHOLNPAIR(
         " ; sizeof(running_temp):", sizeof(running_temp),
         " ;  State:", state, " ;  Timer:", timer, " ;  Temperature:", current, " ;  Target Temp:", target
         #if HEATER_IDLE_HANDLER
@@ -2596,7 +2529,7 @@ void Temperature::init() {
         state = TRRunaway;
 
       case TRRunaway:
-        TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
+        TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
         _temp_error(heater_id, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
     }
   }
@@ -2813,7 +2746,7 @@ void Temperature::disable_all_heaters() {
         SERIAL_ERROR_START();
         SERIAL_ECHOPGM("Temp measurement error! ");
         #if HAS_MAX31855
-          SERIAL_ECHOPGM("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
+          SERIAL_ECHOPAIR("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
           if (max_tc_temp & 0x1)
             SERIAL_ECHOLNPGM("Open Circuit");
           else if (max_tc_temp & 0x2)
@@ -2825,7 +2758,7 @@ void Temperature::disable_all_heaters() {
           max865ref.clearFault();
           if (fault_31865) {
             SERIAL_EOL();
-            SERIAL_ECHOLNPGM("\nMAX31865 Fault: (", fault_31865, ")  >>");
+            SERIAL_ECHOLNPAIR("\nMAX31865 Fault: (", fault_31865, ")  >>");
             if (fault_31865 & MAX31865_FAULT_HIGHTHRESH)
               SERIAL_ECHOLNPGM("RTD High Threshold");
             if (fault_31865 & MAX31865_FAULT_LOWTHRESH)
@@ -2873,7 +2806,6 @@ void Temperature::disable_all_heaters() {
  */
 void Temperature::update_raw_temperatures() {
 
-  // TODO: can this be collapsed into a HOTEND_LOOP()?
   #if HAS_TEMP_ADC_0 && !TEMP_SENSOR_0_IS_MAX_TC
     temp_hotend[0].update();
   #endif
@@ -2895,7 +2827,6 @@ void Temperature::update_raw_temperatures() {
   TERN_(HAS_TEMP_ADC_BED,     temp_bed.update());
   TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update());
   TERN_(HAS_TEMP_ADC_PROBE,   temp_probe.update());
-  TERN_(HAS_TEMP_ADC_BOARD,   temp_board.update());
   TERN_(HAS_TEMP_ADC_COOLER,  temp_cooler.update());
 
   TERN_(HAS_JOY_ADC_X, joystick.x.update());
@@ -2922,11 +2853,10 @@ void Temperature::readings_ready() {
     HOTEND_LOOP() temp_hotend[e].reset();
   #endif
 
-  TERN_(HAS_HEATED_BED,     temp_bed.reset());
-  TERN_(HAS_TEMP_CHAMBER,   temp_chamber.reset());
-  TERN_(HAS_TEMP_PROBE,     temp_probe.reset());
-  TERN_(HAS_TEMP_COOLER,    temp_cooler.reset());
-  TERN_(HAS_TEMP_BOARD,     temp_board.reset());
+  TERN_(HAS_HEATED_BED, temp_bed.reset());
+  TERN_(HAS_TEMP_CHAMBER, temp_chamber.reset());
+  TERN_(HAS_TEMP_PROBE, temp_probe.reset());
+  TERN_(HAS_TEMP_COOLER, temp_cooler.reset());
   TERN_(HAS_TEMP_REDUNDANT, temp_redundant.reset());
 
   TERN_(HAS_JOY_ADC_X, joystick.x.reset());
@@ -3045,15 +2975,15 @@ void Temperature::isr() {
       #endif
 
       #if HAS_HEATED_BED
-        _PWM_MOD(BED, soft_pwm_bed, temp_bed);
+        _PWM_MOD(BED,soft_pwm_bed,temp_bed);
       #endif
 
       #if HAS_HEATED_CHAMBER
-        _PWM_MOD(CHAMBER, soft_pwm_chamber, temp_chamber);
+        _PWM_MOD(CHAMBER,soft_pwm_chamber,temp_chamber);
       #endif
 
       #if HAS_COOLER
-        _PWM_MOD(COOLER, soft_pwm_cooler, temp_cooler);
+        _PWM_MOD(COOLER,soft_pwm_cooler,temp_cooler);
       #endif
 
       #if ENABLED(FAN_SOFT_PWM)
@@ -3353,11 +3283,6 @@ void Temperature::isr() {
       case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
     #endif
 
-    #if HAS_TEMP_ADC_BOARD
-      case PrepareTemp_BOARD: HAL_START_ADC(TEMP_BOARD_PIN); break;
-      case MeasureTemp_BOARD: ACCUMULATE_ADC(temp_board); break;
-    #endif
-
     #if HAS_TEMP_ADC_REDUNDANT
       case PrepareTemp_REDUNDANT: HAL_START_ADC(TEMP_REDUNDANT_PIN); break;
       case MeasureTemp_REDUNDANT: ACCUMULATE_ADC(temp_redundant); break;
@@ -3490,6 +3415,9 @@ void Temperature::isr() {
 }
 
 #if HAS_TEMP_SENSOR
+
+  #include "../gcode/gcode.h"
+
   /**
    * Print a single heater state in the form:
    *        Bed: " B:nnn.nn /nnn.nn"
@@ -3521,9 +3449,6 @@ void Temperature::isr() {
       #if HAS_TEMP_COOLER
         case H_COOLER: k = 'L'; break;
       #endif
-      #if HAS_TEMP_BOARD
-        case H_BOARD: k = 'M'; break;
-      #endif
       #if HAS_TEMP_REDUNDANT
         case H_REDUNDANT: k = 'R'; break;
       #endif
@@ -3543,7 +3468,7 @@ void Temperature::isr() {
     SERIAL_PRINT(t, SFP);
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
       // Temperature MAX SPI boards do not have an OVERSAMPLENR defined
-      SERIAL_ECHOPGM(" (", TERN(HAS_MAXTC_LIBRARIES, k == 'T', false) ? r : r * RECIPROCAL(OVERSAMPLENR));
+      SERIAL_ECHOPAIR(" (", TERN(HAS_MAXTC_LIBRARIES, k == 'T', false) ? r : r * RECIPROCAL(OVERSAMPLENR));
       SERIAL_CHAR(')');
     #endif
     delay(2);
@@ -3553,7 +3478,7 @@ void Temperature::isr() {
     OPTARG(HAS_TEMP_REDUNDANT, const bool include_r/*=false*/)
   ) {
     #if HAS_TEMP_HOTEND
-      print_heater_state(H_E0, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
+      print_heater_state(H_NONE, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
     #endif
     #if HAS_HEATED_BED
       print_heater_state(H_BED, degBed(), degTargetBed() OPTARG(SHOW_TEMP_ADC_VALUES, rawBedTemp()));
@@ -3565,10 +3490,7 @@ void Temperature::isr() {
       print_heater_state(H_COOLER, degCooler(), TERN0(HAS_COOLER, degTargetCooler()) OPTARG(SHOW_TEMP_ADC_VALUES, rawCoolerTemp()));
     #endif
     #if HAS_TEMP_PROBE
-      print_heater_state(H_PROBE, degProbe(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawProbeTemp()));
-    #endif
-    #if HAS_TEMP_BOARD
-      print_heater_state(H_BOARD, degBoard(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawBoardTemp()));
+      print_heater_state(H_PROBE, degProbe(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawProbeTemp()) );
     #endif
     #if HAS_TEMP_REDUNDANT
       if (include_r) print_heater_state(H_REDUNDANT, degRedundant(), degRedundantTarget() OPTARG(SHOW_TEMP_ADC_VALUES, rawRedundantTemp()));
@@ -3576,19 +3498,19 @@ void Temperature::isr() {
     #if HAS_MULTI_HOTEND
       HOTEND_LOOP() print_heater_state((heater_id_t)e, degHotend(e), degTargetHotend(e) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(e)));
     #endif
-    SERIAL_ECHOPGM(" @:", getHeaterPower((heater_id_t)target_extruder));
+    SERIAL_ECHOPAIR(" @:", getHeaterPower((heater_id_t)target_extruder));
     #if HAS_HEATED_BED
-      SERIAL_ECHOPGM(" B@:", getHeaterPower(H_BED));
+      SERIAL_ECHOPAIR(" B@:", getHeaterPower(H_BED));
     #endif
     #if HAS_HEATED_CHAMBER
-      SERIAL_ECHOPGM(" C@:", getHeaterPower(H_CHAMBER));
+      SERIAL_ECHOPAIR(" C@:", getHeaterPower(H_CHAMBER));
     #endif
     #if HAS_COOLER
-      SERIAL_ECHOPGM(" C@:", getHeaterPower(H_COOLER));
+      SERIAL_ECHOPAIR(" C@:", getHeaterPower(H_COOLER));
     #endif
     #if HAS_MULTI_HOTEND
       HOTEND_LOOP() {
-        SERIAL_ECHOPGM(" @", e);
+        SERIAL_ECHOPAIR(" @", e);
         SERIAL_CHAR(':');
         SERIAL_ECHO(getHeaterPower((heater_id_t)e));
       }
@@ -3607,7 +3529,7 @@ void Temperature::isr() {
         #if HAS_MULTI_HOTEND
           PSTR("E%c " S_FMT), '1' + e
         #else
-          PSTR("E1 " S_FMT)
+          PSTR("E " S_FMT)
         #endif
         , heating ? GET_TEXT(MSG_HEATING) : GET_TEXT(MSG_COOLING)
       );
@@ -3727,12 +3649,13 @@ void Temperature::isr() {
 
       if (wait_for_heatup) {
         wait_for_heatup = false;
-        #if HAS_DWIN_E3V2_BASIC
+        #if ENABLED(DWIN_CREALITY_LCD)
           HMI_flag.heat_flag = 0;
           duration_t elapsed = print_job_timer.duration();  // print timer
           dwin_heat_time = elapsed.value;
+        #else
+          ui.reset_status();
         #endif
-        ui.reset_status();
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onHeatingDone());
         return true;
       }
@@ -3896,7 +3819,7 @@ void Temperature::isr() {
       const bool wants_to_cool = isProbeAboveTemp(target_temp),
                  will_wait = !(wants_to_cool && no_wait_for_cooling);
       if (will_wait)
-        SERIAL_ECHOLNPGM("Waiting for probe to ", (wants_to_cool ? PSTR("cool down") : PSTR("heat up")), " to ", target_temp, " degrees.");
+        SERIAL_ECHOLNPAIR("Waiting for probe to ", (wants_to_cool ? PSTR("cool down") : PSTR("heat up")), " to ", target_temp, " degrees.");
 
       #if DISABLED(BUSY_WHILE_HEATING) && ENABLED(HOST_KEEPALIVE_FEATURE)
         KEEPALIVE_STATE(NOT_BUSY);
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 1675507..c8d0851 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -46,13 +46,9 @@
 
 // Element identifiers. Positive values are hotends. Negative values are other heaters or coolers.
 typedef enum : int8_t {
-  H_REDUNDANT = HID_REDUNDANT,
-  H_COOLER = HID_COOLER,
-  H_PROBE = HID_PROBE,
-  H_BOARD = HID_BOARD,
-  H_CHAMBER = HID_CHAMBER,
-  H_BED = HID_BED,
-  H_E0 = HID_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7
+  H_NONE = -6,
+  H_COOLER, H_PROBE, H_REDUNDANT, H_CHAMBER, H_BED,
+  H_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7
 } heater_id_t;
 
 // PID storage
@@ -109,9 +105,6 @@ enum ADCSensorState : char {
   #if HAS_TEMP_ADC_PROBE
     PrepareTemp_PROBE, MeasureTemp_PROBE,
   #endif
-  #if HAS_TEMP_ADC_BOARD
-    PrepareTemp_BOARD, MeasureTemp_BOARD,
-  #endif
   #if HAS_TEMP_ADC_REDUNDANT
     PrepareTemp_REDUNDANT, MeasureTemp_REDUNDANT,
   #endif
@@ -199,7 +192,7 @@ typedef struct TempInfo {
   // A redundant temperature sensor
   typedef struct RedundantTempInfo : public TempInfo {
     temp_info_t* target;
-  } redundant_info_t;
+  } redundant_temp_info_t;
 #endif
 
 // A PWM heater with temperature sensor
@@ -238,9 +231,6 @@ struct PIDHeaterInfo : public HeaterInfo {
 #elif HAS_TEMP_CHAMBER
   typedef temp_info_t chamber_info_t;
 #endif
-#if HAS_TEMP_BOARD
-  typedef temp_info_t board_info_t;
-#endif
 #if EITHER(HAS_COOLER, HAS_TEMP_COOLER)
   typedef heater_info_t cooler_info_t;
 #endif
@@ -322,9 +312,6 @@ typedef struct { int16_t raw_min, raw_max; celsius_t mintemp, maxtemp; } temp_ra
     #if TEMP_SENSOR_COOLER_IS_CUSTOM
       CTI_COOLER,
     #endif
-    #if TEMP_SENSOR_BOARD_IS_CUSTOM
-      CTI_BOARD,
-    #endif
     #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
       CTI_REDUNDANT,
     #endif
@@ -365,11 +352,8 @@ class Temperature {
     #if HAS_TEMP_COOLER
       static cooler_info_t temp_cooler;
     #endif
-    #if HAS_TEMP_BOARD
-      static board_info_t temp_board;
-    #endif
     #if HAS_TEMP_REDUNDANT
-      static redundant_info_t temp_redundant;
+      static redundant_temp_info_t temp_redundant;
     #endif
 
     #if ENABLED(AUTO_POWER_E_FANS)
@@ -494,10 +478,6 @@ class Temperature {
       static int16_t mintemp_raw_COOLER, maxtemp_raw_COOLER;
     #endif
 
-    #if HAS_TEMP_BOARD && ENABLED(THERMAL_PROTECTION_BOARD)
-      static int16_t mintemp_raw_BOARD, maxtemp_raw_BOARD;
-    #endif
-
     #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
       static uint8_t consecutive_low_temperature_error[HOTENDS];
     #endif
@@ -527,7 +507,7 @@ class Temperature {
 
     #if HAS_USER_THERMISTORS
       static user_thermistor_t user_thermistor[USER_THERMISTORS];
-      static void M305_report(const uint8_t t_index, const bool forReplay=true);
+      static void log_user_thermistor(const uint8_t t_index, const bool eprom=false);
       static void reset_user_thermistors();
       static celsius_float_t user_thermistor_to_deg_c(const uint8_t t_index, const int16_t raw);
       static inline bool set_pull_up_res(int8_t t_index, float value) {
@@ -571,9 +551,6 @@ class Temperature {
     #if HAS_TEMP_COOLER
       static celsius_float_t analog_to_celsius_cooler(const int16_t raw);
     #endif
-    #if HAS_TEMP_BOARD
-      static celsius_float_t analog_to_celsius_board(const int16_t raw);
-    #endif
     #if HAS_TEMP_REDUNDANT
       static celsius_float_t analog_to_celsius_redundant(const int16_t raw);
     #endif
@@ -810,14 +787,6 @@ class Temperature {
       #endif
     #endif
 
-    #if HAS_TEMP_BOARD
-      #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static inline int16_t rawBoardTemp()    { return temp_board.raw; }
-      #endif
-      static inline celsius_float_t degBoard()  { return temp_board.celsius; }
-      static inline celsius_t wholeDegBoard()   { return static_cast<celsius_t>(temp_board.celsius + 0.5f); }
-    #endif
-
     #if HAS_TEMP_REDUNDANT
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
         static inline int16_t rawRedundantTemp()         { return temp_redundant.raw; }
diff --git a/Marlin/src/module/thermistor/thermistor_99.h b/Marlin/src/module/thermistor/thermistor_99.h
index fa3dae9..f813aba 100644
--- a/Marlin/src/module/thermistor/thermistor_99.h
+++ b/Marlin/src/module/thermistor/thermistor_99.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #pragma once
 
 // 100k bed thermistor with a 10K pull-up resistor - made by $ buildroot/share/scripts/createTemperatureLookupMarlin.py --rp=10000
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 28a1e2f..a6cd7c8 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -51,7 +51,6 @@
                             || TEMP_SENSOR_IS(n, CHAMBER) \
                             || TEMP_SENSOR_IS(n, COOLER) \
                             || TEMP_SENSOR_IS(n, PROBE) \
-                            || TEMP_SENSOR_IS(n, BOARD) \
                             || TEMP_SENSOR_IS(n, REDUNDANT) )
 
 typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
@@ -201,9 +200,6 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
 #if ANY_THERMISTOR_IS(1047) // Pt1000 with 4k7 pullup
   #include "thermistor_1047.h"
 #endif
-#if ANY_THERMISTOR_IS(2000) // "Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor" https://product.tdk.com/en/search/sensor/ntc/chip-ntc-thermistor/info?part_no=NTCG104LH104KT1
-  #include "thermistor_2000.h"
-#endif
 #if ANY_THERMISTOR_IS(998) // User-defined table 1
   #include "thermistor_998.h"
 #endif
@@ -309,13 +305,6 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
   #define TEMPTABLE_PROBE_LEN 0
 #endif
 
-#if TEMP_SENSOR_BOARD > 0
-  #define TEMPTABLE_BOARD TT_NAME(TEMP_SENSOR_BOARD)
-  #define TEMPTABLE_BOARD_LEN COUNT(TEMPTABLE_BOARD)
-#else
-  #define TEMPTABLE_BOARD_LEN 0
-#endif
-
 #if TEMP_SENSOR_REDUNDANT > 0
   #define TEMPTABLE_REDUNDANT TT_NAME(TEMP_SENSOR_REDUNDANT)
   #define TEMPTABLE_REDUNDANT_LEN COUNT(TEMPTABLE_REDUNDANT)
@@ -330,7 +319,6 @@ static_assert(255 > TEMPTABLE_0_LEN || 255 > TEMPTABLE_1_LEN || 255 > TEMPTABLE_
            || 255 > TEMPTABLE_CHAMBER_LEN
            || 255 > TEMPTABLE_COOLER_LEN
            || 255 > TEMPTABLE_PROBE_LEN
-           || 255 > TEMPTABLE_BOARD_LEN
            || 255 > TEMPTABLE_REDUNDANT_LEN
   , "Temperature conversion tables over 255 entries need special consideration."
 );
@@ -525,15 +513,6 @@ static_assert(255 > TEMPTABLE_0_LEN || 255 > TEMPTABLE_1_LEN || 255 > TEMPTABLE_
     #define TEMP_SENSOR_PROBE_RAW_LO_TEMP MAX_RAW_THERMISTOR_VALUE
   #endif
 #endif
-#ifndef TEMP_SENSOR_BOARD_RAW_HI_TEMP
-  #if TT_REVRAW(BOARD)
-    #define TEMP_SENSOR_BOARD_RAW_HI_TEMP MAX_RAW_THERMISTOR_VALUE
-    #define TEMP_SENSOR_BOARD_RAW_LO_TEMP 0
-  #else
-    #define TEMP_SENSOR_BOARD_RAW_HI_TEMP 0
-    #define TEMP_SENSOR_BOARD_RAW_LO_TEMP MAX_RAW_THERMISTOR_VALUE
-  #endif
-#endif
 #ifndef TEMP_SENSOR_REDUNDANT_RAW_HI_TEMP
   #if TT_REVRAW(REDUNDANT)
     #define TEMP_SENSOR_REDUNDANT_RAW_HI_TEMP MAX_RAW_THERMISTOR_VALUE
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index cb55164..6d69b87 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -189,7 +189,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[new_tool] + offsetcompensation;
 
-    DEBUG_ECHOPGM("(1) Move extruder ", new_tool);
+    DEBUG_ECHOPAIR("(1) Move extruder ", new_tool);
     DEBUG_POS(" to new extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.fast_feedrate, new_tool);
@@ -199,7 +199,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = grabpos + offsetcompensation;
 
-    DEBUG_ECHOPGM("(2) Couple extruder ", new_tool);
+    DEBUG_ECHOPAIR("(2) Couple extruder ", new_tool);
     DEBUG_POS(" to new extruder GrabPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.slow_feedrate, new_tool);
@@ -212,7 +212,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[new_tool] + offsetcompensation;
 
-    DEBUG_ECHOPGM("(3) Move extruder ", new_tool);
+    DEBUG_ECHOPAIR("(3) Move extruder ", new_tool);
     DEBUG_POS(" back to new extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.slow_feedrate, new_tool);
@@ -222,7 +222,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[active_extruder] + (active_extruder == 0 ? MPE_TRAVEL_DISTANCE : -MPE_TRAVEL_DISTANCE) + offsetcompensation;
 
-    DEBUG_ECHOPGM("(4) Move extruder ", new_tool);
+    DEBUG_ECHOPAIR("(4) Move extruder ", new_tool);
     DEBUG_POS(" close to old extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.fast_feedrate, new_tool);
@@ -232,7 +232,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[active_extruder] + offsetcompensation;
 
-    DEBUG_ECHOPGM("(5) Park extruder ", new_tool);
+    DEBUG_ECHOPAIR("(5) Park extruder ", new_tool);
     DEBUG_POS(" at old extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.slow_feedrate, new_tool);
@@ -242,7 +242,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = oldx;
 
-    DEBUG_ECHOPGM("(6) Move extruder ", new_tool);
+    DEBUG_ECHOPAIR("(6) Move extruder ", new_tool);
     DEBUG_POS(" to starting position", current_position);
 
     planner.buffer_line(current_position, mpe_settings.fast_feedrate, new_tool);
@@ -277,9 +277,9 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     if (homed_towards_final_tool) {
       pe_solenoid_magnet_off(1 - final_tool);
-      DEBUG_ECHOLNPGM("Disengage magnet", 1 - final_tool);
+      DEBUG_ECHOLNPAIR("Disengage magnet", 1 - final_tool);
       pe_solenoid_magnet_on(final_tool);
-      DEBUG_ECHOLNPGM("Engage magnet", final_tool);
+      DEBUG_ECHOLNPAIR("Engage magnet", final_tool);
       parking_extruder_set_parked(false);
       return false;
     }
@@ -318,7 +318,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
       if (!extruder_parked) {
         current_position.x = parkingposx[active_extruder] + x_offset;
 
-        DEBUG_ECHOLNPGM("(1) Park extruder ", active_extruder);
+        DEBUG_ECHOLNPAIR("(1) Park extruder ", active_extruder);
         DEBUG_POS("Moving ParkPos", current_position);
 
         fast_line_to_current(X_AXIS);
@@ -521,7 +521,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = placexpos;
 
-    DEBUG_ECHOLNPGM("(1) Place old tool ", active_extruder);
+    DEBUG_ECHOLNPAIR("(1) Place old tool ", active_extruder);
     DEBUG_POS("Move X SwitchPos", current_position);
 
     fast_line_to_current(X_AXIS);
@@ -627,7 +627,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.y = SWITCHING_TOOLHEAD_Y_POS + SWITCHING_TOOLHEAD_Y_CLEAR;
 
-    SERIAL_ECHOLNPGM("(1) Place old tool ", active_extruder);
+    SERIAL_ECHOLNPAIR("(1) Place old tool ", active_extruder);
     DEBUG_POS("Move Y SwitchPos + Security", current_position);
 
     fast_line_to_current(Y_AXIS);
@@ -759,7 +759,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     // 2. Move to position near active extruder parking
 
     DEBUG_SYNCHRONIZE();
-    DEBUG_ECHOLNPGM("(2) Move near active extruder parking", active_extruder);
+    DEBUG_ECHOLNPAIR("(2) Move near active extruder parking", active_extruder);
     DEBUG_POS("Moving ParkPos", current_position);
 
     current_position.set(hoffs.x + placexpos,
@@ -769,7 +769,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     // 3. Move gently to park position of active extruder
 
     DEBUG_SYNCHRONIZE();
-    SERIAL_ECHOLNPGM("(3) Move gently to park position of active extruder", active_extruder);
+    SERIAL_ECHOLNPAIR("(3) Move gently to park position of active extruder", active_extruder);
     DEBUG_POS("Moving ParkPos", current_position);
 
     current_position.y -= SWITCHING_TOOLHEAD_Y_CLEAR;
@@ -858,7 +858,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         && IsRunning() && !no_move                                  // ...and movement is permitted
         && (delayed_move_time || current_position.x != xhome)       // ...and delayed_move_time is set OR not "already parked"...
     ) {
-      DEBUG_ECHOLNPGM("MoveX to ", xhome);
+      DEBUG_ECHOLNPAIR("MoveX to ", xhome);
       current_position.x = xhome;
       line_to_current_position(planner.settings.max_feedrate_mm_s[X_AXIS]);   // Park the current head
       planner.synchronize();
@@ -878,7 +878,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         current_position.x = inactive_extruder_x;
         // Save the inactive extruder's position (from the old current_position)
         inactive_extruder_x = destination.x;
-        DEBUG_ECHOLNPGM("DXC Full Control curr.x=", current_position.x, " dest.x=", destination.x);
+        DEBUG_ECHOLNPAIR("DXC Full Control curr.x=", current_position.x, " dest.x=", destination.x);
         break;
       case DXC_AUTO_PARK_MODE:
         idex_set_parked();
@@ -890,7 +890,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     // Ensure X axis DIR pertains to the correct carriage
     stepper.set_directions();
 
-    DEBUG_ECHOLNPGM("Active extruder parked: ", active_extruder_parked ? "yes" : "no");
+    DEBUG_ECHOLNPAIR("Active extruder parked: ", active_extruder_parked ? "yes" : "no");
     DEBUG_POS("New extruder (parked)", current_position);
   }
 
@@ -918,7 +918,9 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
       if (ok) {
         // Do a small lift to avoid the workpiece in the move back (below)
         current_position.z += toolchange_settings.z_raise;
-        TERN_(HAS_SOFTWARE_ENDSTOPS, NOMORE(current_position.z, soft_endstop.max.z));
+        #if HAS_SOFTWARE_ENDSTOPS
+          NOMORE(current_position.z, soft_endstop.max.z);
+        #endif
         fast_line_to_current(Z_AXIS);
         planner.synchronize();
       }
@@ -1066,7 +1068,9 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         if (can_move_away && TERN1(TOOLCHANGE_PARK, toolchange_settings.enable_park)) {
           // Do a small lift to avoid the workpiece in the move back (below)
           current_position.z += toolchange_settings.z_raise;
-          TERN_(HAS_SOFTWARE_ENDSTOPS, NOMORE(current_position.z, soft_endstop.max.z));
+          #if HAS_SOFTWARE_ENDSTOPS
+            NOMORE(current_position.z, soft_endstop.max.z);
+          #endif
           fast_line_to_current(Z_AXIS);
           planner.synchronize();
         }
@@ -1113,7 +1117,9 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         if (can_move_away && TERN1(TOOLCHANGE_PARK, toolchange_settings.enable_park)) {
           // Do a small lift to avoid the workpiece in the move back (below)
           current_position.z += toolchange_settings.z_raise;
-          TERN_(HAS_SOFTWARE_ENDSTOPS, NOMORE(current_position.z, soft_endstop.max.z));
+          #if HAS_SOFTWARE_ENDSTOPS
+            NOMORE(current_position.z, soft_endstop.max.z);
+          #endif
           fast_line_to_current(Z_AXIS);
         }
       #endif
@@ -1170,7 +1176,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       (void)check_tool_sensor_stats(active_extruder, true);
 
       // The newly-selected extruder XYZ is actually at...
-      DEBUG_ECHOLNPGM("Offset Tool XYZ by { ", diff.x, ", ", diff.y, ", ", diff.z, " }");
+      DEBUG_ECHOLNPAIR("Offset Tool XYZ by { ", diff.x, ", ", diff.y, ", ", diff.z, " }");
       current_position += diff;
 
       // Tell the planner the new "current position"
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 54621f3..9e28af2 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -22,10 +22,9 @@
 #pragma once
 
 /**
- * E4d@box pin assignments
- *
- * Small factor 3D printer control board based on the ESP32 microcontroller for Laser, CNC and 3D printers.
- * More info at https://atbox.tech/ and the E4d@box Facebook page.
+ * E4d@Box  pin assignments
+ * E4d@Box is a small factor 3D printer control board based on the ESP32 microcontroller for Laser, CNC and 3d printers
+ * for more info check https://atbox.tech/ and join to Facebook page E4d@box.
  */
 
 #include "env_validate.h"
@@ -36,7 +35,7 @@
   #error "E4d@box only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
-#define BOARD_INFO_NAME       "E4d@box"
+#define BOARD_INFO_NAME       "E4D@BOX"
 #define BOARD_WEBSITE_URL     "github.com/Exilaus/E4d@box"
 #define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
 
diff --git a/Marlin/src/pins/esp32/pins_FYSETC_E4.h b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
index 2b2fe40..7dd7f94 100644
--- a/Marlin/src/pins/esp32/pins_FYSETC_E4.h
+++ b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
@@ -23,8 +23,7 @@
 
 /**
  * FYSETC E4 pin assignments
- *
- * 3D printer control board based on the ESP32 microcontroller.
+ * FYSETC E4 is a 3D printer control board based on the ESP32 microcontroller.
  * Supports 4 stepper drivers, heated bed, single hotend.
  */
 
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index ab4f401..38f43b5 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -23,8 +23,7 @@
 
 /**
  * MRR ESPA pin assignments
- *
- * 3D printer control board based on the ESP32 microcontroller.
+ * MRR ESPA is a 3D printer control board based on the ESP32 microcontroller.
  * Supports 4 stepper drivers, heated bed, single hotend.
  */
 
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index 1f829b7..f156efd 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -23,8 +23,7 @@
 
 /**
  * MRR ESPE pin assignments
- *
- * 3D printer control board based on the ESP32 microcontroller.
+ * MRR ESPE is a 3D printer control board based on the ESP32 microcontroller.
  * Supports 5 stepper drivers (using I2S stepper stream), heated bed,
  * single hotend, and LCD controller.
  */
@@ -123,7 +122,7 @@
 // LCDs and Controllers //
 //////////////////////////
 
-#if HAS_WIRED_LCD
+#if HAS_MARLINUI_U8GLIB
 
   #define LCD_PINS_RS                         13
   #define LCD_PINS_ENABLE                     17
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 04f9afa..a0f8c16 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -416,10 +416,10 @@
   #if HAS_SPI_FLASH
     #define SPI_DEVICE                         1
     #define SPI_FLASH_SIZE             0x1000000  // 16MB
-    #define SPI_FLASH_CS_PIN                  31
-    #define SPI_FLASH_MOSI_PIN       SD_MOSI_PIN
-    #define SPI_FLASH_MISO_PIN       SD_MISO_PIN
-    #define SPI_FLASH_SCK_PIN         SD_SCK_PIN
+    #define W25QXX_CS_PIN                     31
+    #define W25QXX_MOSI_PIN          SD_MOSI_PIN
+    #define W25QXX_MISO_PIN          SD_MISO_PIN
+    #define W25QXX_SCK_PIN            SD_SCK_PIN
   #endif
 
   #define TFT_BUFFER_SIZE                 0xFFFF
@@ -427,10 +427,10 @@
     #define TFT_DRIVER                    ST7796
   #endif
   #ifndef XPT2046_X_CALIBRATION
-    #define XPT2046_X_CALIBRATION          63934
+    #define XPT2046_X_CALIBRATION            63934
   #endif
   #ifndef XPT2046_Y_CALIBRATION
-    #define XPT2046_Y_CALIBRATION          63598
+    #define XPT2046_Y_CALIBRATION            63598
   #endif
   #ifndef XPT2046_X_OFFSET
     #define XPT2046_X_OFFSET                  -1
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index ff36796..5131069 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -27,7 +27,7 @@
 
 #include "env_validate.h"
 
-#define BOARD_INFO_NAME "AZSMZ Mini"
+#define BOARD_INFO_NAME "AZSMZ MINI"
 
 //
 // Servos
@@ -76,7 +76,6 @@
 //
 // Heaters / Fans
 //
-
 // EFB
 #define HEATER_0_PIN                       P2_04
 #define HEATER_BED_PIN                     P2_05
@@ -86,6 +85,7 @@
 #define FAN1_PIN                           P0_26
 
 #define LCD_SDSS                           P0_16  // LCD SD chip select
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if ENABLED(AZSMZ_12864)
   #define BEEPER_PIN                       P1_30
@@ -109,7 +109,6 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
-  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
@@ -118,14 +117,14 @@
 //
 // Ethernet pins
 //
-#define REF_CLK                            P1_15
 #define ENET_MDIO                          P1_17
-#define ENET_MOC                           P1_16
-#define ENET_CRS                           P1_08
 #define ENET_RX_ER                         P1_14
-#define ENET_TX_EN                         P1_04
-#define ENET_RXD0                          P1_09
 #define ENET_RXD1                          P1_10
+#define ENET_MOC                           P1_16
+#define REF_CLK                            P1_15
+#define ENET_RXD0                          P1_09
+#define ENET_CRS                           P1_08
+#define ENET_TX_EN                         P1_04
 #define ENET_TXD0                          P1_00
 #define ENET_TXD1                          P1_01
 
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
index 9215217..f94381e 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -22,7 +22,11 @@
 #pragma once
 
 /**
- * BIQU BQ111-A4 pin assignments
+ * BIQU BQ111-A4
+ *
+ * Applies to the following boards:
+ *
+ *  BOARD_BIQU_BQ111_A4 (Hotend, Fan, Bed)
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index 48b178d..c6a4412 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * BigTreeTech SKR 1.1 pin assignments
- */
-
 #define BOARD_INFO_NAME "BTT SKR V1.1"
 
 //
@@ -57,25 +53,27 @@
 #define E0_ENABLE_PIN                      P2_12
 
 
-/**        ------                  ------
- *   1.30 |10  9 | 2.11      0.17 |10  9 | 0.15
- *   0.18 | 8  7 | 0.16      3.26 | 8  7 | 1.23
- *   0.15   6  5 | NC        3.25   6  5 | 0.18
- *     NC | 4  3 | NC        1.31 | 4  3 | RESET
- *    GND | 2  1 | 5V         GND | 2  1 | NC
- *         ------                  ------
- *          EXP1                    EXP2
+/**
+ *          ______                    ______
+ *      NC | 1  2 | GND           5V | 1  2 | GND
+ *   RESET | 3  4 | 1.31          NC | 3  4 | NC
+ *    0.18 | 5  6   3.25          NC | 5  6   0.15
+ *    1.23 | 7  8 | 3.26        0.16 | 7  8 | 0.18
+ *    0.15 | 9 10 | 0.17        2.11 | 9 10 | 1.30
+ *          ------                    ------
+ *           EXP2                      EXP1
  */
-#define EXP1_03_PIN                        -1     // NC
-#define EXP1_04_PIN                        -1     // NC
-#define EXP1_05_PIN                        -1     // NC
+
+#define EXP1_03_PIN                        -1
+#define EXP1_04_PIN                        -1
+#define EXP1_05_PIN                        -1
 #define EXP1_06_PIN                        P0_15
 #define EXP1_07_PIN                        P0_16
 #define EXP1_08_PIN                        P0_18
 #define EXP1_09_PIN                        P2_11
 #define EXP1_10_PIN                        P1_30
 
-#define EXP2_03_PIN                        -1     // RESET
+#define EXP2_03_PIN                        -1
 #define EXP2_04_PIN                        P1_31
 #define EXP2_05_PIN                        P0_18
 #define EXP2_06_PIN                        P3_25
@@ -84,6 +82,7 @@
 #define EXP2_09_PIN                        P0_15
 #define EXP2_10_PIN                        P0_17
 
+
 /**
  * LCD / Controller
  *
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index dc52a7c..42c6f4d 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * BigTreeTech SKR 1.3 pin assignments
- */
-
 #define BOARD_INFO_NAME "BTT SKR V1.3"
 #define LPC1768_IS_SKRV1_3 1
 
@@ -168,6 +164,9 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                  P4_29
   #define X_SERIAL_RX_PIN                  P1_17
 
@@ -188,15 +187,16 @@
 #endif
 
 /**
- *                 ------                                     ------
- *  (BEEPER) 1.30 |10  9 | 0.28 (BTN_ENC)        (MISO) 0.17 |10  9 | 0.15 (SCK)
- *  (LCD_EN) 1.18 | 8  7 | 1.19  (LCD_RS)     (BTN_EN1) 3.26 | 8  7 | 0.16 (SD_SS)
- *  (LCD_D4) 1.20   6  5 | 1.21  (LCD_D5)     (BTN_EN2) 3.25   6  5 | 0.18 (MOSI)
- *  (LCD_D6) 1.22 | 4  3 | 1.23  (LCD_D7)   (SD_DETECT) 1.31 | 4  3 | RESET
- *            GND | 2  1 | 5V                            GND | 2  1 | NC
- *                 ------                                     ------
- *                  EXP1                                       EXP2
+ *               ______                                             ______
+ *           NC | 1  2 | GND                                    5V | 1  2 | GND
+ *        RESET | 3  4 | 1.31 (SD_DETECT)            (LCD_D7) 1.23 | 3  4 | 1.22 (LCD_D6)
+ *  (MOSI) 0.18 | 5  6   3.25 (BTN_EN2)              (LCD_D5) 1.21 | 5  6   1.20 (LCD_D4)
+ * (SD_SS) 0.16 | 7  8 | 3.26 (BTN_EN1)              (LCD_RS) 1.19 | 7  8 | 1.18 (LCD_EN)
+ *   (SCK) 0.15 | 9 10 | 0.17 (MISO)                (BTN_ENC) 0.28 | 9 10 | 1.30 (BEEPER)
+ *               ------                                             ------
+ *               EXP2                                               EXP1
  */
+
 #define EXP1_03_PIN                        P1_23
 #define EXP1_04_PIN                        P1_22
 #define EXP1_05_PIN                        P1_21
@@ -233,7 +233,7 @@
     * The ANET_FULL_GRAPHICS_LCD connector plug:
     *
     *                  BEFORE                          AFTER
-    *                  ------                          ------
+    *                  ______                          ______
     *           GND 1 | 1  2 |  2 5V             5V 1 | 1  2 |  2 GND
     *            CS 3 | 3  4 |  4 BTN_EN2        CS 3 | 3  4 |  4 BTN_EN2
     *           SID 5 | 5  6    6 BTN_EN1       SID 5 | 5  6    6 BTN_EN1
@@ -389,11 +389,11 @@
 
         /**
          * Creality Ender-2 display pinout
-         *                   -----
+         *                   _____
          *               5V | 1 2 | GND
          *     (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
          *   (LCD_A0) P1_21 | 5 6   P1_20 (BTN_EN2)
-         *    (RESET) P1_19 | 7 8 | P1_18 (BTN_EN1)
+         *      RESET P1_19 | 7 8 | P1_18 (BTN_EN1)
          *  (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
          *                   -----
          *                    EXP1
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index 17daf17..43e954a 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * BigTreeTech SKR 1.4 pin assignments
- */
-
 #include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
@@ -224,34 +220,38 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                  P1_10
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                  P1_10
 
   #define Y_SERIAL_TX_PIN                  P1_09
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                  P1_09
 
   #define Z_SERIAL_TX_PIN                  P1_08
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                  P1_08
 
   #define E0_SERIAL_TX_PIN                 P1_04
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                 P1_04
 
   #define E1_SERIAL_TX_PIN                 P1_01
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                 P1_01
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
 #endif
 
-/**       ------                ------
- *  1.30 |10  9 | 0.28    0.17 |10  9 | 0.15
- *  1.18 | 8  7 | 1.19    3.26 | 8  7 | 0.16
- *  1.20   6  5 | 1.21    3.25   6  5 | 0.18
- *  1.22 | 4  3 | 1.23    1.31 | 4  3 | RESET
- *   GND | 2  1 | 5V       GND | 2  1 | NC
- *        ------                ------
- *         EXP1                  EXP2
+/*               _____                        _____
+ *           NC | 1 2 | GND               5V | 1 2 | GND
+ *        RESET | 3 4 | 1.31            1.23 | 3 4 | 1.22
+ *         0.18 | 5 6   3.25            1.21 | 5 6   1.20
+ *         0.16 | 7 8 | 3.26            1.19 | 7 8 | 1.18
+ *         0.15 | 9 10| 0.17            0.28 | 9 10| 1.30
+ *               -----                        -----
+ *               EXP2                         EXP1
  */
+
 #define EXP1_03_PIN                        P1_23
 #define EXP1_04_PIN                        P1_22
 #define EXP1_05_PIN                        P1_21
@@ -261,7 +261,7 @@
 #define EXP1_09_PIN                        P0_28
 #define EXP1_10_PIN                        P1_30
 
-#define EXP2_03_PIN                        -1     // RESET
+#define EXP2_03_PIN                        -1
 #define EXP2_04_PIN                        P1_31
 #define EXP2_05_PIN                        P0_18
 #define EXP2_06_PIN                        P3_25
@@ -270,15 +270,27 @@
 #define EXP2_09_PIN                        P0_15
 #define EXP2_10_PIN                        P0_17
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+/**
+ *               _____                                             _____
+ *           NC | · · | GND                                    5V | · · | GND
+ *        RESET | · · | 1.31 (SD_DETECT)            (LCD_D7) 1.23 | · · | 1.22 (LCD_D6)
+ *  (MOSI) 0.18 | · ·   3.25 (BTN_EN2)              (LCD_D5) 1.21 | · ·   1.20 (LCD_D4)
+ * (SD_SS) 0.16 | · · | 3.26 (BTN_EN1)              (LCD_RS) 1.19 | · · | 1.18 (LCD_EN)
+ *   (SCK) 0.15 | · · | 0.17 (MISO)                (BTN_ENC) 0.28 | · · | 1.30 (BEEPER)
+ *               -----                                             -----
+ *               EXP2                                              EXP1
+ */
+
+#if ENABLED(DWIN_CREALITY_LCD)
 
   // RET6 DWIN ENCODER LCD
-  #define BTN_ENC                    EXP1_06_PIN
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_04_PIN
+  #define BTN_ENC                          P1_20
+  #define BTN_EN1                          P1_23
+  #define BTN_EN2                          P1_22
 
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN               EXP1_05_PIN
+    #define BEEPER_PIN                     P1_21
+    #undef SPEAKER
   #endif
 
 #elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
@@ -295,13 +307,13 @@
      * The ANET_FULL_GRAPHICS_LCD_ALT_WIRING connector plug:
      *
      *                BEFORE                     AFTER
-     *                ------                     ------
-     *           GND | 1  2 | 5V             5V | 1  2 | GND
-     *            CS | 3  4 | BTN_EN2        CS | 3  4 | BTN_EN2
-     *           SID | 5  6   BTN_EN1       SID | 5  6   BTN_EN1
-     *          open | 7  8 | BTN_ENC      open | 7  8 | BTN_ENC
-     *           CLK | 9  10| BEEPER        CLK | 9  10| BEEPER
-     *                ------                     ------
+     *                _____                      _____
+     *           GND | 1 2 | 5V              5V | 1 2 | GND
+     *            CS | 3 4 | BTN_EN2         CS | 3 4 | BTN_EN2
+     *           SID | 5 6   BTN_EN1        SID | 5 6   BTN_EN1
+     *          open | 7 8 | BTN_ENC       open | 7 8 | BTN_ENC
+     *           CLK | 9 10| Beeper         CLK | 9 10| Beeper
+     *                -----                      -----
      *                 LCD                        LCD
      */
 
@@ -328,15 +340,15 @@
     *
     * The ANET_FULL_GRAPHICS_LCD connector plug:
     *
-    *         BEFORE                     AFTER
-    *         ------                     ------
-    *    GND | 1  2 | 5V             5V | 1  2 | GND
-    *     CS | 3  4 | BTN_EN2        CS | 3  4 | BTN_EN2
-    *    SID | 5  6   BTN_EN1       SID | 5  6   BTN_EN1
-    *   open | 7  8 | BTN_ENC       CLK | 7  8 | BTN_ENC
-    *    CLK | 9 10 | BEEPER       open | 9 10 | BEEPER
-    *         ------                     ------
-    *          LCD                        LCD
+    *                BEFORE                     AFTER
+    *                ______                     ______
+    *           GND | 1  2 | 5V             5V | 1  2 | GND
+    *            CS | 3  4 | BTN_EN2        CS | 3  4 | BTN_EN2
+    *           SID | 5  6   BTN_EN1       SID | 5  6   BTN_EN1
+    *          open | 7  8 | BTN_ENC       CLK | 7  8 | BTN_ENC
+    *           CLK | 9 10 | Beeper       open | 9 10 | Beeper
+    *                ------                     ------
+    *                 LCD                        LCD
     */
 
     #define LCD_PINS_RS              EXP1_03_PIN
@@ -363,7 +375,7 @@
   #elif ENABLED(ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
-     *                   ------
+     *                   ______
      *               5V | 1  2 | GND
      *      (MOSI) 1.23 | 3  4 | 1.22 (LCD_RS)
      *    (LCD_A0) 1.21 | 5  6   1.20 (BTN_EN2)
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 52f34ed..9f33c7c 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -65,7 +65,7 @@
   #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
 #endif
 
-#if HOTENDS == 1 && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
+#if HOTENDS == 1 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
   #if TEMP_SENSOR_PROBE
     #define TEMP_PROBE_PIN            TEMP_1_PIN
   #elif TEMP_SENSOR_CHAMBER
@@ -126,6 +126,8 @@
   #endif
 #endif
 
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
 #if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
   #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
 #endif
@@ -143,14 +145,13 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
-  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       ------                       ------
+  /**       ______                       ______
    *    NC | 1  2 | GND              NC | 1  2 | GND
    *    NC | 3  4 | M1EN           M2EN | 3  4 | M3EN
    * M1STP | 5  6   M1DIR          M1RX | 5  6   M1DIAG
@@ -171,7 +172,7 @@
     #define E2_CS_PIN                EXP1_05_PIN
     #if HAS_TMC_UART
       #define E2_SERIAL_TX_PIN       EXP1_05_PIN
-      #define E2_SERIAL_RX_PIN  E2_SERIAL_TX_PIN
+      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
     #endif
   #endif
 
@@ -184,7 +185,7 @@
     #define E3_CS_PIN                EXP1_07_PIN
     #if HAS_TMC_UART
       #define E3_SERIAL_TX_PIN       EXP1_07_PIN
-      #define E3_SERIAL_RX_PIN  E3_SERIAL_TX_PIN
+      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
     #endif
   #else
     #define E3_ENABLE_PIN            EXP2_04_PIN
@@ -199,7 +200,7 @@
     #define E4_CS_PIN                EXP1_09_PIN
     #if HAS_TMC_UART
       #define E4_SERIAL_TX_PIN       EXP1_09_PIN
-      #define E4_SERIAL_RX_PIN  E4_SERIAL_TX_PIN
+      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
     #endif
   #else
     #define E4_ENABLE_PIN            EXP2_04_PIN
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 39ab0bb..1ec1131 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * GMARSH X6 Rev.1 pin assignments
- */
-
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME "GMARSH X6 REV1"
@@ -86,22 +82,17 @@
 //
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                  P1_00
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
-
+  #define X_SERIAL_RX_PIN                  P1_00
   #define Y_SERIAL_TX_PIN                  P1_09
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
-
+  #define Y_SERIAL_RX_PIN                  P1_09
   #define Z_SERIAL_TX_PIN                  P1_16
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
-
+  #define Z_SERIAL_RX_PIN                  P1_16
   #define E0_SERIAL_TX_PIN                 P0_04
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
-
+  #define E0_SERIAL_RX_PIN                 P0_04
   #define E1_SERIAL_TX_PIN                 P2_02
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
-
+  #define E1_SERIAL_RX_PIN                 P2_02
   #define E2_SERIAL_TX_PIN                 P2_06
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                 P2_06
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -159,6 +150,8 @@
   #define SDCARD_CONNECTION                  LCD
 #endif
 
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
 #if SD_CONNECTION_IS(LCD)
   #define SD_SCK_PIN                       P0_15
   #define SD_MISO_PIN                      P0_17
@@ -169,6 +162,5 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
-  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 258ecd1..4c2b606 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Makerbase MKS SBASE pin assignments
+ * MKS SBASE pin assignments
  */
 
 #include "env_validate.h"
@@ -138,10 +138,14 @@
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #define PS_ON_PIN                        P0_25  // SERVO
-  #define KILL_PIN                         P1_29  // Z+
-  #define KILL_PIN_STATE                    HIGH
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                      P0_25  // SERVO
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                       P1_29  // Z+
+    #define KILL_PIN_STATE                  HIGH
+  #endif
 #endif
 
 //
@@ -165,6 +169,8 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
 
   /**
@@ -197,7 +203,6 @@
     #define SD_SS_PIN                      P0_28
   #else
     #define SD_DETECT_PIN                  P0_27
-    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #endif
 #endif
@@ -215,9 +220,6 @@
  * that the garbage/lines are erased immediately after the SD card accesses are completed.
  */
 
-//
-// LCD / Controller
-//
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
@@ -329,13 +331,10 @@
    */
   #define X_SERIAL_TX_PIN                  P1_22  // J8-2
   #define X_SERIAL_RX_PIN                  P2_12  // J8-4 Interrupt Capable
-
   #define Y_SERIAL_TX_PIN                  P1_23  // J8-3
   #define Y_SERIAL_RX_PIN                  P2_11  // J8-5 Interrupt Capable
-
   #define Z_SERIAL_TX_PIN                  P2_12  // J8-4
   #define Z_SERIAL_RX_PIN                  P0_25  // TH3
-
   #define E0_SERIAL_TX_PIN                 P4_28  // J8-6
   #define E0_SERIAL_RX_PIN                 P0_26  // TH4
 
@@ -344,8 +343,10 @@
 #endif
 
 // UNUSED
-//#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_27                          P0_27  // EXP2/Onboard SD
+#define PIN_P0_28                          P0_28  // EXP2
+#define PIN_P0_02                          P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_03                          P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
 
 /**
  *  PWMs
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index d6b1eea..0c3f44c 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Makerbase MKS SGEN-L pin assignments
+ * MKS SGEN-L pin assignments
  */
 
 #include "env_validate.h"
@@ -163,6 +163,10 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
+
   #define X_SERIAL_TX_PIN                  P1_04
   #define X_SERIAL_RX_PIN                  P1_01
 
@@ -214,10 +218,14 @@
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #define PS_ON_PIN                        P2_00  // SERVO1
-  #define KILL_PIN                         P1_24  // Z+
-  #define KILL_PIN_STATE                    HIGH
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                      P2_00  // SERVO
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                       P1_24  // Z+
+    #define KILL_PIN_STATE                  HIGH
+  #endif
 #endif
 
 //
@@ -228,78 +236,42 @@
 #define LED3_PIN                           P1_20
 #define LED4_PIN                           P1_21
 
-/**               ------                                        ------
- * (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)      (MISO)       0.8 |10  9 | 0.7  (SD_SCK)
- * (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)       (BTN_EN1)   3.25 | 8  7 | 0.28 (SD_CS2)
- * (LCD_D4) 0.15 | 6  5   0.17 (LCD_D5)       (BTN_EN2)   3.26 | 6  5   0.9  (SD_MOSI)
- * (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)       (SD_DETECT) 0.27 | 4  3 | RESET
- *           GND | 2  1 | 5V                               GND | 2  1 | NC
- *                ------                                        ------
- *                 EXP1                                          EXP2
+/**
+ *                _____                                            _____
+ * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC)          (MISO)       0.8 | · · | 0.7  (SD_SCK)
+ * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS)           (BTN_EN1)   3.25 | · · | 0.28 (SD_CS2)
+ * (LCD_D4) 0.15 | · ·   0.17 (LCD_D5)           (BTN_EN2)   3.26 | · ·   0.9  (SD_MOSI)
+ * (LCD_D6)  1.0 | · · | 1.22 (LCD_D7)           (SD_DETECT) 0.27 | · · | RST
+ *           GND | · · | 5V                                   GND | · · | NC
+ *                -----                                            -----
+ *                EXP1                                             EXP2
  */
-#define EXP1_03_PIN                        P1_22
-#define EXP1_04_PIN                        P1_00
-#define EXP1_05_PIN                        P0_17
-#define EXP1_06_PIN                        P0_15
-#define EXP1_07_PIN                        P0_16
-#define EXP1_08_PIN                        P0_18
-#define EXP1_09_PIN                        P1_30
-#define EXP1_10_PIN                        P1_31
-
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        P0_27
-#define EXP2_05_PIN                        P0_09
-#define EXP2_06_PIN                        P3_26
-#define EXP2_07_PIN                        P0_28
-#define EXP2_08_PIN                        P3_25
-#define EXP2_09_PIN                        P0_07
-#define EXP2_10_PIN                        P0_08
-
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
-#endif
-
-#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #if SD_CONNECTION_IS(ONBOARD)
-    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
-    #define SD_SS_PIN          ONBOARD_SD_CS_PIN
-  #else
-    #define SD_SS_PIN                EXP2_07_PIN
-  #endif
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
-  #error "No custom SD drive cable defined for this board."
-#endif
-
 #if HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                       P1_31
+  #define BTN_ENC                          P1_30
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS                    P1_00
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                        P0_18
+    #define BTN_EN2                        P0_15
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE                P1_22
+    #define LCD_PINS_D4                    P0_17
 
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
-    #define TFT_CS_PIN               EXP1_04_PIN
-    #define TFT_A0_PIN               EXP1_03_PIN
-    #define TFT_DC_PIN               EXP1_03_PIN
-    #define TFT_MISO_PIN             EXP2_10_PIN
-    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
-    #define TFT_RESET_PIN            EXP1_07_PIN
+    #define TFT_CS_PIN                     P1_00
+    #define TFT_A0_PIN                     P1_22
+    #define TFT_DC_PIN                     P1_22
+    #define TFT_MISO_PIN                   P0_08
+    #define TFT_BACKLIGHT_PIN              P0_18
+    #define TFT_RESET_PIN                  P0_16
 
     #define LCD_USE_DMA_SPI
 
-    #define TOUCH_INT_PIN            EXP1_05_PIN
-    #define TOUCH_CS_PIN             EXP1_06_PIN
+    #define TOUCH_INT_PIN                  P0_17
+    #define TOUCH_CS_PIN                   P0_15
     #define TOUCH_BUTTONS_HW_SPI
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        2
 
@@ -314,8 +286,8 @@
       #define TFT_QUEUE_SIZE                6144
     #endif
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
 
   #elif IS_TFTGLCD_PANEL
 
@@ -323,74 +295,74 @@
     #undef BTN_ENC
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS             EXP2_08_PIN
+      #define TFTGLCD_CS                   P3_25
     #endif
 
   #else
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
 
-    #define LCD_SDSS                 EXP2_07_PIN
+    #define LCD_SDSS                       P0_28
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC            EXP1_05_PIN
-      #define DOGLCD_CS              EXP1_07_PIN
+      #define LCD_PINS_DC                  P0_17
+      #define DOGLCD_CS                    P0_16
       #define DOGLCD_A0              LCD_PINS_DC
-      #define DOGLCD_SCK             EXP1_06_PIN
-      #define DOGLCD_MOSI            EXP1_08_PIN
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_PINS_RS            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_RS                  P1_00
+      #define LCD_PINS_D7                  P1_22
       #define KILL_PIN                     -1     // NC
 
     #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_RS                  P0_16
 
-      #define LCD_PINS_ENABLE        EXP1_08_PIN
-      #define LCD_PINS_D4            EXP1_06_PIN
+      #define LCD_PINS_ENABLE              P0_18
+      #define LCD_PINS_D4                  P0_15
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS            EXP1_08_PIN
-        #define DOGLCD_A0            EXP1_07_PIN
-        #define DOGLCD_SCK           EXP2_09_PIN
-        #define DOGLCD_MOSI          EXP2_05_PIN
+        #define DOGLCD_CS                  P0_18
+        #define DOGLCD_A0                  P0_16
+        #define DOGLCD_SCK                 P0_07
+        #define DOGLCD_MOSI                P0_09
 
         #define LCD_BACKLIGHT_PIN          -1
 
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-        #define LCD_RESET_PIN        EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN              P0_15  // Must be high or open for LCD to operate normally.
 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
           #ifndef RGB_LED_R_PIN
-            #define RGB_LED_R_PIN    EXP1_05_PIN
+            #define RGB_LED_R_PIN          P0_17
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN    EXP1_04_PIN
+            #define RGB_LED_G_PIN          P1_00
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN    EXP1_03_PIN
+            #define RGB_LED_B_PIN          P1_22
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN       EXP1_05_PIN
+          #define NEOPIXEL_PIN             P0_17
         #endif
 
       #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS          EXP1_05_PIN
-          #define DOGLCD_A0          EXP1_04_PIN
+          #define DOGLCD_CS                P0_17
+          #define DOGLCD_A0                P1_00
         #endif
 
         #if IS_ULTIPANEL
-          #define LCD_PINS_D5        EXP1_05_PIN
-          #define LCD_PINS_D6        EXP1_04_PIN
-          #define LCD_PINS_D7        EXP1_03_PIN
+          #define LCD_PINS_D5              P0_17
+          #define LCD_PINS_D6              P1_00
+          #define LCD_PINS_D7              P1_22
 
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
@@ -406,9 +378,29 @@
 
 #endif // HAS_WIRED_LCD
 
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
+#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
+  #define SD_DETECT_PIN                    P0_27
+  #define SD_SCK_PIN                       P0_07
+  #define SD_MISO_PIN                      P0_08
+  #define SD_MOSI_PIN                      P0_09
+  #if SD_CONNECTION_IS(ONBOARD)
+    #define SD_SS_PIN          ONBOARD_SD_CS_PIN
+  #else
+    #define SD_SS_PIN                      P0_28
+  #endif
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "No custom SD drive cable defined for this board."
+#endif
+
 //
 // Other Pins
 //
 //#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
 //#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PS_ON_PIN                        P1_23  // SERVO0 P1.23
+//#define PS_ON_PIN                        P1_23  // SERVO P1.23
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index ce5d5ad..fe7daa8 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -119,6 +119,9 @@
    * If undefined software serial is used according to the pins below
    */
 
+  //
+  // Software serial
+  //
 
   // P2_08 E1-Step
   // P2_13 E1-Dir
@@ -127,28 +130,28 @@
     #define X_SERIAL_TX_PIN                P0_01
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
+    #define X_SERIAL_RX_PIN                P0_01
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
     #define Y_SERIAL_TX_PIN                P0_00
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
+    #define Y_SERIAL_RX_PIN                P0_00
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                P2_13
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
+    #define Z_SERIAL_RX_PIN                P2_13
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
     #define E0_SERIAL_TX_PIN               P2_08
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
+    #define E0_SERIAL_RX_PIN               P2_08
   #endif
 
   // Reduce baud rate to improve software serial reliability
@@ -455,6 +458,8 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
 #if SD_CONNECTION_IS(LCD)
   #define SD_SCK_PIN                       P0_15  // (52)  system defined J3-9 & AUX-3
   #define SD_MISO_PIN                      P0_17  // (50)  system defined J3-10 & AUX-3
@@ -465,7 +470,6 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
-  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index f3ecebd..80a91d2 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -198,6 +198,8 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
 #if SD_CONNECTION_IS(LCD)
   #define SD_SCK_PIN                       P0_15
   #define SD_MISO_PIN                      P0_17
@@ -208,7 +210,6 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
-  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 9c514f8..8c3c2ae 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * BigTreeTech SKR E3 Turbo pin assignments
- */
-
 #include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
@@ -133,20 +129,23 @@
    * If undefined software serial is used according to the pins below
    */
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                  P1_01
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                  P1_01
 
   #define Y_SERIAL_TX_PIN                  P1_10
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                  P1_10
 
   #define Z_SERIAL_TX_PIN                  P1_17
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                  P1_17
 
   #define E0_SERIAL_TX_PIN                 P0_05
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                 P0_05
 
   #define E1_SERIAL_TX_PIN                 P0_22
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                 P0_22
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -166,8 +165,8 @@
 //
 #define TEMP_0_PIN                         P0_24
 #define TEMP_1_PIN                         P0_23
+//#define TEMP_2_PIN                       P1_30  // Onboard thermistor
 #define TEMP_BED_PIN                       P0_25
-#define TEMP_BOARD_PIN                     P1_30  // Onboard thermistor, NTC100K
 
 //
 // Heaters / Fans
@@ -183,7 +182,7 @@
 #endif
 
 /**
- *                  ------
+ *                  ______
  *              5V | 1  2 | GND
  *  (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)
  *  (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
@@ -192,6 +191,7 @@
  *                  ------
  *                   EXP
  */
+
 #define EXP1_03_PIN                        P0_18
 #define EXP1_04_PIN                        P0_17
 #define EXP1_05_PIN                        P0_15
@@ -201,12 +201,12 @@
 #define EXP1_09_PIN                        P0_16
 #define EXP1_10_PIN                        P2_08
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
+#if ENABLED(DWIN_CREALITY_LCD)
+  #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
 
  /**
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
-  *                ------                                     ------                                  RX  8 -->  5  P0_15
+  *                ______                                     ______                                  RX  8 -->  5  P0_15
   *            5V | 1  2 | GND                            5V | 1  2 | GND                             TX  7 -->  9  P0_16
   *   (BTN_E1)  A | 3  4 | B   (BTN_E2)       (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)              BEEPER  5 --> 10  P2_08
   *        BEEPER | 5  6   ENT (BTN_ENC)      (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
index 2b847d3..5af1dfe 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * BigTreeTech SKR 1.4 Turbo pin assignments
- */
-
 #define BOARD_INFO_NAME "BTT SKR V1.4 TURBO"
 
 //
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index ea2e0b7..57b4521 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -229,6 +229,8 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
   #define SD_SCK_PIN                       P0_07  // (52)  system defined J3-9 & AUX-3
   #define SD_MISO_PIN                      P0_08  // (50)  system defined J3-10 & AUX-3
@@ -237,7 +239,6 @@
     #define SD_SS_PIN                      P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
   #else
     #undef SD_DETECT_PIN
-    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
diff --git a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
index ec0b14a..b904434 100644
--- a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
+++ b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * FLYmaker FLY-CDY pin assignments
- */
-
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME   "FLY-CDY"
@@ -108,22 +104,22 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                  P1_04
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                  P1_04
 
   #define Y_SERIAL_TX_PIN                  P1_10
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                  P1_10
 
   #define Z_SERIAL_TX_PIN                  P1_16
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                  P1_16
 
   #define E0_SERIAL_TX_PIN                 P4_28
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                 P4_28
 
   #define E1_SERIAL_TX_PIN                 P2_12
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                 P2_12
 
   #define E2_SERIAL_TX_PIN                 P0_10
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                 P0_10
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index 23bcecc..ddfee63 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -24,7 +24,7 @@
 /**
  * MKS SGen pin assignments
  *
- * Pins diagram:
+ * The pins diagram can be found and the following URL:
  * https://github.com/makerbase-mks/MKS-SGen/blob/master/Hardware/MKS%20SGEN%20V1.0_001/MKS%20SGEN%20V1.0_001%20PIN.pdf
  */
 
@@ -38,20 +38,17 @@
   /**
    * TMC2208/TMC2209 stepper drivers
    */
+
   #define X_SERIAL_TX_PIN                  P1_22  // J8-2
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
-
+  #define X_SERIAL_RX_PIN                  P1_22  // J8-2
   #define Y_SERIAL_TX_PIN                  P1_23  // J8-3
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
-
+  #define Y_SERIAL_RX_PIN                  P1_23  // J8-3
   #define Z_SERIAL_TX_PIN                  P2_12  // J8-4
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
-
+  #define Z_SERIAL_RX_PIN                  P2_12  // J8-4
   #define E0_SERIAL_TX_PIN                 P2_11  // J8-5
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
-
+  #define E0_SERIAL_RX_PIN                 P2_11  // J8-5
   #define E1_SERIAL_TX_PIN                 P4_28  // J8-6
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                 P4_28  // J8-6
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index bb39009..4020ac2 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS SGen-L V2 pin assignments
+ * MKS SGen pin assignments
  */
 
 #include "env_validate.h"
@@ -173,20 +173,19 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                  P1_01
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
-
+  #define X_SERIAL_RX_PIN                  P1_01
   #define Y_SERIAL_TX_PIN                  P1_08
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
-
+  #define Y_SERIAL_RX_PIN                  P1_08
   #define Z_SERIAL_TX_PIN                  P1_10
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
-
+  #define Z_SERIAL_RX_PIN                  P1_10
   #define E0_SERIAL_TX_PIN                 P1_15
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
-
+  #define E0_SERIAL_RX_PIN                 P1_15
   #define E1_SERIAL_TX_PIN                 P1_17
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                 P1_17
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -230,10 +229,14 @@
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #define PS_ON_PIN                        P2_00  // SERVO1
-  #define KILL_PIN                         P1_24  // Z+
-  #define KILL_PIN_STATE                    HIGH
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                      P2_00  // Suggestion (SERVO)
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                       P1_24  // Suggestion (Z+)
+    #define KILL_PIN_STATE                  HIGH
+  #endif
 #endif
 
 //
@@ -255,87 +258,70 @@
   #define LED4_PIN                         P1_21
 #endif
 
-/**                ------                                     ------
- *  (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)        (MISO) 0.8  |10  9 | 0.7  (SD_SCK)
- *  (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 8  7 | 0.28 (SD_CS2)
- *  (LCD_D4) 0.15 | 6  5 | 0.17 (LCD_D5)      (BTN_EN2) 3.26 | 6  5 | 0.9  (SD_MOSI)
- *  (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 4  3 | RST
- *            GND | 2  1 | 5V                            GND | 2  1 | NC
- *                 ------                                     ------
- *                  EXP1                                       EXP2
+/**
+ *                _____                                            _____
+ * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC)               (MISO) 0.8  | · · | 0.7  (SD_SCK)
+ * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS)             (BTN_EN1) 3.25 | · · | 0.28 (SD_CS2)
+ * (LCD_D4) 0.15 | · · | 0.17 (LCD_D5)             (BTN_EN2) 3.26 | · · | 0.9  (SD_MOSI)
+ * (LCD_D6)  1.0 | · · | 1.22 (LCD_D7)           (SD_DETECT) 0.27 | · · | RST
+ *           GND | · · | 5V                                   GND | · · | NC
+ *                -----                                            -----
+ *                EXP1                                             EXP2
  */
-#define EXP1_03_PIN                        P1_22
-#define EXP1_04_PIN                        P1_00
-#define EXP1_05_PIN                        P0_17
-#define EXP1_06_PIN                        P0_15
-#define EXP1_07_PIN                        P0_16
-#define EXP1_08_PIN                        P0_18
-#define EXP1_09_PIN                        P1_30
-#define EXP1_10_PIN                        P1_31
-
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        P0_27
-#define EXP2_05_PIN                        P0_09
-#define EXP2_06_PIN                        P3_26
-#define EXP2_07_PIN                        P0_28
-#define EXP2_08_PIN                        P3_25
-#define EXP2_09_PIN                        P0_07
-#define EXP2_10_PIN                        P0_08
-
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
+    #define TFTGLCD_CS                     P3_25
   #endif
 
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_DETECT_PIN                    P0_27
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                       P1_31
+  #define BTN_ENC                          P1_30
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS                    P1_00
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                        P0_18
+    #define BTN_EN2                        P0_15
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE                P1_22
+    #define LCD_PINS_D4                    P0_17
 
   #else
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
 
-    #define LCD_SDSS                 EXP2_07_PIN
+    #define LCD_SDSS                       P0_28
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC            EXP1_05_PIN
-      #define DOGLCD_CS              EXP1_07_PIN
+      #define LCD_PINS_DC                  P0_17
+      #define DOGLCD_CS                    P0_16
       #define DOGLCD_A0              LCD_PINS_DC
-      #define DOGLCD_SCK             EXP1_06_PIN
-      #define DOGLCD_MOSI            EXP1_08_PIN
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_PINS_RS            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_RS                  P1_00
+      #define LCD_PINS_D7                  P1_22
       #define KILL_PIN                     -1     // NC
 
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
-      #define TFT_CS_PIN             EXP1_04_PIN
-      #define TFT_A0_PIN             EXP1_03_PIN
-      #define TFT_DC_PIN             EXP1_03_PIN
-      #define TFT_MISO_PIN           EXP2_10_PIN
-      #define TFT_BACKLIGHT_PIN      EXP1_08_PIN
-      #define TFT_RESET_PIN          EXP1_07_PIN
+      #define TFT_CS_PIN                   P1_00
+      #define TFT_A0_PIN                   P1_22
+      #define TFT_DC_PIN                   P1_22
+      #define TFT_MISO_PIN                 P0_08
+      #define TFT_BACKLIGHT_PIN            P0_18
+      #define TFT_RESET_PIN                P0_16
 
       #define LCD_USE_DMA_SPI
 
-      #define TOUCH_INT_PIN          EXP1_05_PIN
-      #define TOUCH_CS_PIN           EXP1_06_PIN
+      #define TOUCH_INT_PIN                P0_17
+      #define TOUCH_CS_PIN                 P0_15
       #define TOUCH_BUTTONS_HW_SPI
       #define TOUCH_BUTTONS_HW_SPI_DEVICE      2
 
@@ -352,50 +338,50 @@
 
     #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_RS                  P0_16
 
-      #define LCD_PINS_ENABLE        EXP1_08_PIN
-      #define LCD_PINS_D4            EXP1_06_PIN
+      #define LCD_PINS_ENABLE              P0_18
+      #define LCD_PINS_D4                  P0_15
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS            EXP1_08_PIN
-        #define DOGLCD_A0            EXP1_07_PIN
-        #define DOGLCD_SCK           EXP2_09_PIN
-        #define DOGLCD_MOSI          EXP2_05_PIN
+        #define DOGLCD_CS                  P0_18
+        #define DOGLCD_A0                  P0_16
+        #define DOGLCD_SCK                 P0_07
+        #define DOGLCD_MOSI                P0_09
 
         #define LCD_BACKLIGHT_PIN          -1
 
         #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-        #define LCD_RESET_PIN        EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN              P0_15  // Must be high or open for LCD to operate normally.
 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
           #ifndef RGB_LED_R_PIN
-            #define RGB_LED_R_PIN    EXP1_05_PIN
+            #define RGB_LED_R_PIN          P0_17
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN    EXP1_04_PIN
+            #define RGB_LED_G_PIN          P1_00
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN    EXP1_03_PIN
+            #define RGB_LED_B_PIN          P1_22
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN       EXP1_05_PIN
+          #define NEOPIXEL_PIN             P0_17
         #endif
 
       #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS          EXP1_05_PIN
-          #define DOGLCD_A0          EXP1_04_PIN
+          #define DOGLCD_CS                P0_17
+          #define DOGLCD_A0                P1_00
         #endif
 
         #if IS_ULTIPANEL
-          #define LCD_PINS_D5        EXP1_05_PIN
-          #define LCD_PINS_D6        EXP1_04_PIN
-          #define LCD_PINS_D7        EXP1_03_PIN
+          #define LCD_PINS_D5              P0_17
+          #define LCD_PINS_D6              P1_00
+          #define LCD_PINS_D7              P1_22
 
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
@@ -415,16 +401,17 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
+
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SD_SCK_PIN                       P0_07
+  #define SD_MISO_PIN                      P0_08
+  #define SD_MOSI_PIN                      P0_09
   #if SD_CONNECTION_IS(ONBOARD)
-    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #else
-    #define SD_SS_PIN                EXP2_07_PIN
+    #define SD_SS_PIN                      P0_28
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
@@ -435,4 +422,4 @@
 //
 //#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
 //#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PS_ON_PIN                        P1_23  // SERVO0 P1.23
+//#define PS_ON_PIN                        P1_23  // SERVO P1.23
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index e80116e..f7bc960 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Smoothieware Smoothieboard pin assignments
+ * Smoothieboard pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index dc7dcd6..4d725bc 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -27,30 +27,20 @@
 
 #include "env_validate.h"
 
-//#define V3_EZABL_ON_SERVO                       // As in TH3D Firmware Config
-
 #define BOARD_INFO_NAME   "TH3D EZBoard"
 #define BOARD_WEBSITE_URL "th3dstudio.com"
 
 //
 // Servos
 //
-#if ENABLED(V3_EZABL_ON_SERVO)
-  #define SERVO0_PIN                       -1
-#else
-  #define SERVO0_PIN                       P2_04
-#endif
+#define SERVO0_PIN                         P2_04
 
 //
 // Limit Switches
 //
 #define X_STOP_PIN                         P1_24
 #define Y_STOP_PIN                         P1_25
-#if ENABLED(V3_EZABL_ON_SERVO)
-  #define Z_STOP_PIN                       P2_04
-#else
-  #define Z_STOP_PIN                       P1_26
-#endif
+#define Z_STOP_PIN                         P1_26
 
 //
 // Filament Runout Sensor
@@ -85,16 +75,14 @@
 #if HAS_TMC_UART
   //
   // TMC220x stepper drivers
+  // Software serial
   //
   #define X_SERIAL_TX_PIN                  P0_04
   #define X_SERIAL_RX_PIN                  P0_05
-
   #define Y_SERIAL_TX_PIN                  P0_10
   #define Y_SERIAL_RX_PIN                  P0_11
-
   #define Z_SERIAL_TX_PIN                  P0_19
   #define Z_SERIAL_RX_PIN                  P0_20
-
   #define E0_SERIAL_TX_PIN                 P0_22
   #define E0_SERIAL_RX_PIN                 P0_21
 
@@ -113,6 +101,13 @@
 #endif
 
 #define TEMP_BED_PIN                    P0_24_A1  // Analog Input P0_24
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input P0_25
+
+#if ENABLED(FILAMENT_WIDTH_SENSOR)
+  #define FILWIDTH_PIN                  P0_26_A3  // Analog Input P0_26
+#else
+  #define TEMP_2_PIN                    P0_26_A3  // Analog Input P0_26
+#endif
 
 //
 // Heaters / Fans
@@ -144,7 +139,6 @@
 
 #define SDCARD_CONNECTION                ONBOARD
 
-//#define SD_DETECT_PIN                    P0_25  // SD_CD
 #define SD_SCK_PIN                         P0_07
 #define SD_MISO_PIN                        P0_08
 #define SD_MOSI_PIN                        P0_09
@@ -156,14 +150,14 @@
 //
 
 /**
- *         ------
- *     5V | 1  2 | GND
- *  P0_18 | 3  4 | P0_16
- *  P0_15 | 5  6   P3_25
- *  P2_11 | 7  8 | P3_26
- *  P1_30 | 9 10 | P1_31
- *         ------
- *          EXP1
+ *                  _____
+ *              5V | · · | GND
+ *  (LCD_EN) P0_18 | · · | P0_16 (LCD_RS)
+ *  (LCD_D4) P0_15 | · ·   P3_25 (BTN_EN2)
+ *   (RESET) P2_11 | · · | P3_26 (BTN_EN1)
+ * (BTN_ENC) P1_30 | · · | P1_31 (BEEPER)
+ *                  -----
+ *                  EXP1
  *
  * LCD_PINS_D5, D6, and D7 are not present in the EXP1 connector, and will need to be
  * defined to use the REPRAP_DISCOUNT_SMART_CONTROLLER.
@@ -171,57 +165,16 @@
  * A remote SD card is currently not supported because the pins routed to the EXP2
  * connector are shared with the onboard SD card.
  */
-#define EXP1_03_PIN                        P0_18
-#define EXP1_04_PIN                        P0_16
-#define EXP1_05_PIN                        P0_15
-#define EXP1_06_PIN                        P3_25
-#define EXP1_07_PIN                        P2_11
-#define EXP1_08_PIN                        P3_26
-#define EXP1_09_PIN                        P1_30
-#define EXP1_10_PIN                        P1_31
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  /**          ------
-   *       5V | 1  2 | GND
-   *   LCD_EN | 3  4 | LCD_RS
-   *   LCD_D4 | 5  6   EN2
-   *     KILL | 7  8 | EN1
-   *      ENC | 9 10 | BEEPER
-   *           ------
-   */
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
-  #define KILL_PIN                   EXP1_07_PIN
-
-#elif ENABLED(MKS_MINI_12864)
-  /**          ------
-   *       5V | 1  2 | GND
-   * SPI-MOSI | 3  4 | SPI-CS
-   *       A0 | 5  6   EN2
-   *       -- | 7  8 | EN1
-   *      ENC | 9 10 | SPI-SCK
-   *           ------
-   */
-  #define DOGLCD_CS                  EXP1_04_PIN
-  #define DOGLCD_A0                  EXP1_05_PIN
-  #define DOGLCD_SCK                 EXP1_10_PIN
-  #define DOGLCD_MOSI                EXP1_03_PIN
-  #define LCD_CONTRAST_INIT                  160
-  #define LCD_CONTRAST_MIN                   120
-  #define LCD_CONTRAST_MAX                   180
-  #define FORCE_SOFT_SPI
-  #define LCD_BACKLIGHT_PIN                -1
-
+  #define BEEPER_PIN                       P1_31
+  #define BTN_EN1                          P3_26
+  #define BTN_EN2                          P3_25
+  #define BTN_ENC                          P1_30
+  #define LCD_PINS_RS                      P0_16
+  #define LCD_PINS_ENABLE                  P0_18
+  #define LCD_PINS_D4                      P0_15
+  #define KILL_PIN                         P2_11
 #elif HAS_WIRED_LCD
-
-  #error "Only CR10_STOCKDISPLAY or MKS_MINI_12864 are supported with TH3D EZBoard."
-
-#endif
-
-#if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
 #endif
diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index dcf25da..27ec998 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -112,9 +112,9 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+#if ENABLED(SPINDLE_LASER_ENABLE)
   #define SPINDLE_DIR_PIN                     16
-  #define SPINDLE_LASER_ENA_PIN               17  // Pin should have a pullup!
+  #define SPINDLE_LASER_ENABLE_PIN            17  // Pin should have a pullup!
   #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
 #endif
 
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index 0884d8e..161820b 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -119,7 +119,7 @@
 //
 // LCD / Controller
 //
-#if HAS_WIRED_LCD
+#if HAS_MARLINUI_U8GLIB
   // OVERLORD OLED pins
   #define LCD_PINS_RS                         20
   #define LCD_PINS_D5                         21
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index 7b4f53a..41cbe5e 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -72,7 +72,7 @@
 #define HEATER_BED_PIN                         8
 #define TEMP_BED_PIN                           6
 
-#if HAS_WIRED_LCD
+#if HAS_MARLINUI_U8GLIB
   #if ENABLED(U8GLIB_ST7920)                      // SPI GLCD 12864 ST7920
     #define LCD_PINS_RS                       30
     #define LCD_PINS_ENABLE                   20
@@ -86,9 +86,6 @@
       #define KILL_PIN                        21
       #define HOME_PIN                        28
     #endif
-    #define BOARD_ST7920_DELAY_1               0
-    #define BOARD_ST7920_DELAY_2             250
-    #define BOARD_ST7920_DELAY_3               0
   #endif
 #endif
 
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 0293da1..28c7ed0 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -243,8 +243,6 @@
   #include "mega/pins_GT2560_REV_B.h"           // ATmega2560                             env:mega2560
 #elif MB(GT2560_V4)
   #include "mega/pins_GT2560_V4.h"              // ATmega2560                             env:mega2560
-  #elif MB(GT2560_V4_A20)
-  #include "mega/pins_GT2560_V4_A20.h"          // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_MC2)
   #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_A20)
@@ -269,8 +267,6 @@
   #include "mega/pins_INTAMSYS40.h"             // ATmega2560                             env:mega2560
 #elif MB(MALYAN_M180)
   #include "mega/pins_MALYAN_M180.h"            // ATmega2560                             env:mega2560
-#elif MB(PROTONEER_CNC_SHIELD_V3)
-  #include "mega/pins_PROTONEER_CNC_SHIELD_V3.h"// ATmega2560                             env:mega2560
 
 //
 // ATmega1281, ATmega2561
@@ -333,7 +329,7 @@
 #elif MB(OMCA)
   #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino644p
 #elif MB(ANET_10)
-  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p env:sanguino1284p_optimized env:melzi_optiboot
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p env:sanguino1284p_optimized
 #elif MB(SETHI)
   #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino1284p_optimized env:sanguino1284p env:sanguino644p
 
@@ -549,7 +545,7 @@
   #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V427)
   #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
-#elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D)
+#elif MB(CREALITY_V431)
   #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V452)
   #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
@@ -566,11 +562,11 @@
 #elif MB(MINGDA_MPX_ARM_MINI)
   #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:mingda_mpx_arm_mini
 #elif MB(ZONESTAR_ZM3E2)
-  #include "stm32f1/pins_ZM3E2_V1_0.h"          // STM32F1                                env:STM32F103RC_ZM3E2_USB env:STM32F103RC_ZM3E2_USB_maple
+  #include "stm32f1/pins_ZM3E2_V1_0.h"       	  // STM32F1                            	  env:STM32F103RC_ZM3E2_USB env:STM32F103RC_ZM3E2_USB_maple
 #elif MB(ZONESTAR_ZM3E4)
-  #include "stm32f1/pins_ZM3E4_V1_0.h"          // STM32F1                                env:STM32F103VC_ZM3E4_USB env:STM32F103VC_ZM3E4_USB_maple
+  #include "stm32f1/pins_ZM3E4_V1_0.h"      	  // STM32F1                           	    env:STM32F103VC_ZM3E4_USB env:STM32F103VC_ZM3E4_USB_maple
 #elif MB(ZONESTAR_ZM3E4V2)
-  #include "stm32f1/pins_ZM3E4_V2_0.h"          // STM32F1                                env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
+  #include "stm32f1/pins_ZM3E4_V2_0.h"      	  // STM32F1                           	    env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
 
 //
 // ARM Cortex-M4F
@@ -591,8 +587,6 @@
   #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32
 #elif MB(RUMBA32_MKS)
   #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32
-#elif MB(RUMBA32_BTT)
-  #include "stm32f4/pins_RUMBA32_BTT.h"         // STM32F4                                env:rumba32
 #elif MB(BLACK_STM32F407VE)
   #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
 #elif MB(STEVAL_3DP001V1)
@@ -645,12 +639,6 @@
   #include "stm32f4/pins_FYSETC_CHEETAH_V20.h"  // STM32F4                                env:FYSETC_CHEETAH_V20
 #elif MB(MKS_MONSTER8)
   #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
-#elif MB(TH3D_EZBOARD_LITE_V2)
-  #include "stm32f4/pins_TH3D_EZBOARD_LITE_V2.h" // STM32F4                               env:TH3D_EZBoard_Lite_V2
-#elif MB(INDEX_REV03)
-  #include "stm32f4/pins_INDEX_REV03.h"         // STM32F4                                env:Index_Mobo_Rev03
-#elif MB(MKS_ROBIN_NANO_V1_3_F4)
-  #include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4                             env:mks_robin_nano_v1_3_f4
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index b384342..0c55232 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -44,7 +41,7 @@
 #define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
 
 #include "pinsDebug_list.h"
-#line 48
+#line 45
 
 // manually add pins that have names that are macros which don't play well with these macros
 #if ANY(AVR_ATmega2560_FAMILY, AVR_ATmega1284_FAMILY, ARDUINO_ARCH_SAM, TARGET_LPC1768)
@@ -163,7 +160,7 @@ const PinInfo pin_array[] PROGMEM = {
   #endif
 
   #include "pinsDebug_list.h"
-  #line 167
+  #line 164
 
 };
 
@@ -206,8 +203,11 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
         SERIAL_ECHOPGM("PIN: ");
         PRINT_PIN(pin);
         PRINT_PORT(pin);
-        if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) PRINT_PIN_ANALOG(pin); // analog pin number
-        else SERIAL_ECHO_SP(8);                                                 // add padding if not an analog pin
+        if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
+          sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin));    // analog pin number
+          SERIAL_ECHO(buffer);
+        }
+        else SERIAL_ECHO_SP(8);   // add padding if not an analog pin
       }
       else {
         SERIAL_CHAR('.');
@@ -254,8 +254,12 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
     SERIAL_ECHOPGM("PIN: ");
     PRINT_PIN(pin);
     PRINT_PORT(pin);
-    if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) PRINT_PIN_ANALOG(pin); // analog pin number
-    else SERIAL_ECHO_SP(8);                                                 // add padding if not an analog pin
+    if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
+      sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin));    // analog pin number
+      SERIAL_ECHO(buffer);
+    }
+    else
+      SERIAL_ECHO_SP(8);   // add padding if not an analog pin
     SERIAL_ECHOPGM("<unused/unknown>");
     if (extended) {
 
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index fe670cc..8b1cad3 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -25,18 +22,16 @@
 // Following this pattern is a must.
 // If the new pin name is over 28 characters long then pinsDebug.h will need to be modified.
 
-#if TARGET_LPC1768
-  #define ANALOG_OK(PN) ((PN) == P0_02 || (PN) == P0_03 || (PN) == P0_23 || (PN) == P0_24 || (PN) == P0_25 || (PN) == P0_26 || (PN) == P1_30 || (PN) == P1_31)
-#else
-  #define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_INPUTS)
-#endif
+// Pin lists 1.1.x and 2.0.x synchronized 2018-02-17
 
-#line 35 // set __LINE__ to a known value for both passes
+#line 28 // set __LINE__ to a known value for both passes
 
 //
 // Analog Pin Assignments
 //
 
+#define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_INPUTS)
+
 #if defined(EXT_AUX_A0) && ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
 #endif
@@ -296,11 +291,11 @@
 #if PIN_EXISTS(DAC_DISABLE)
   REPORT_NAME_DIGITAL(__LINE__, DAC_DISABLE_PIN)
 #endif
-#if PIN_EXISTS(DAC0_SYNC)
-  REPORT_NAME_DIGITAL(__LINE__, DAC0_SYNC_PIN)
+#if defined(DAC0_SYNC) && DAC0_SYNC >= 0
+  REPORT_NAME_DIGITAL(__LINE__, DAC0_SYNC)
 #endif
-#if PIN_EXISTS(DAC1_SYNC)
-  REPORT_NAME_DIGITAL(__LINE__, DAC1_SYNC_PIN)
+#if defined(DAC1_SYNC) && DAC1_SYNC >= 0
+  REPORT_NAME_DIGITAL(__LINE__, DAC1_SYNC)
 #endif
 #if PIN_EXISTS(DEBUG)
   REPORT_NAME_DIGITAL(__LINE__, DEBUG_PIN)
@@ -979,14 +974,14 @@
 #if defined(SPARE_IO) && SPARE_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
 #endif
-#if PIN_EXISTS(SPI_EEPROM1_CS)
-  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM1_CS_PIN)
+#if defined(SPI_EEPROM1_CS) && SPI_EEPROM1_CS >= 0
+  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM1_CS)
 #endif
-#if PIN_EXISTS(SPI_EEPROM2_CS)
-  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM2_CS_PIN)
+#if defined(SPI_EEPROM2_CS) && SPI_EEPROM2_CS >= 0
+  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM2_CS)
 #endif
-#if PIN_EXISTS(SPI_FLASH_CS)
-  REPORT_NAME_DIGITAL(__LINE__, SPI_FLASH_CS_PIN)
+#if defined(SPI_FLASH_CS) && SPI_FLASH_CS >= 0
+  REPORT_NAME_DIGITAL(__LINE__, SPI_FLASH_CS)
 #endif
 #if PIN_EXISTS(SPINDLE_DIR)
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_DIR_PIN)
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 72313cf..f715277 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -391,8 +391,8 @@
 #ifndef SUICIDE_PIN
   #define SUICIDE_PIN -1
 #endif
-#ifndef SUICIDE_PIN_STATE
-  #define SUICIDE_PIN_STATE LOW
+#ifndef SUICIDE_PIN_INVERTING
+  #define SUICIDE_PIN_INVERTING false
 #endif
 
 #ifndef NUM_SERVO_PLUGS
@@ -542,7 +542,6 @@
 #define __EPIN(p,q) E##p##_##q##_PIN
 #define _EPIN(p,q) __EPIN(p,q)
 #define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
-#define _En_DIAG_(p) _E##p##_DIAG_
 
 // The E0/E1 steppers are always used for Dual E
 #if ENABLED(E_DUAL_STEPPER_DRIVERS)
@@ -555,11 +554,6 @@
 #endif
 
 // The X2 axis, if any, should be the next open extruder port
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && !defined(X2_DIAG_PIN) && !defined(X2_STEP_PIN) && !PIN_EXISTS(X2_CS_PIN)
-  #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
-#else
-  #define Y2_E_INDEX X2_E_INDEX
-#endif
 #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
   #ifndef X2_STEP_PIN
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
@@ -567,33 +561,19 @@
     #define X2_ENABLE_PIN _EPIN(X2_E_INDEX, ENABLE)
     #if X2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(X2_STEP)
       #error "No E stepper plug left for X2!"
-    #else
-      #define AUTO_ASSIGNED_X2_STEPPER 1
     #endif
   #endif
   #ifndef X2_MS1_PIN
     #define X2_MS1_PIN    _EPIN(X2_E_INDEX, MS1)
-    #if PIN_EXISTS(X2_MS1)
-      #define AUTO_ASSIGNED_X2_MS1 1
-    #endif
   #endif
   #ifndef X2_MS2_PIN
     #define X2_MS2_PIN    _EPIN(X2_E_INDEX, MS2)
-    #if PIN_EXISTS(X2_MS2)
-      #define AUTO_ASSIGNED_X2_MS2 1
-    #endif
   #endif
   #ifndef X2_MS3_PIN
     #define X2_MS3_PIN    _EPIN(X2_E_INDEX, MS3)
-    #if PIN_EXISTS(X2_MS3)
-      #define AUTO_ASSIGNED_X2_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
     #define X2_CS_PIN     _EPIN(X2_E_INDEX, CS)
-    #if PIN_EXISTS(X2_CS)
-      #define AUTO_ASSIGNED_X2_CS 1
-    #endif
   #endif
   #if AXIS_HAS_UART(X2)
     #ifndef X2_SERIAL_TX_PIN
@@ -607,7 +587,7 @@
   //
   // Auto-assign pins for stallGuard sensorless homing
   //
-  #if !defined(X2_DIAG_PIN) && !defined(X2_USE_ENDSTOP) && defined(X2_STALL_SENSITIVITY) && ENABLED(X_DUAL_ENDSTOPS) && _PEXI(X2_E_INDEX, DIAG)
+  #if !defined(X2_USE_ENDSTOP) && defined(X2_STALL_SENSITIVITY) && ENABLED(X_DUAL_ENDSTOPS) && _PEXI(X2_E_INDEX, DIAG)
     #define X2_DIAG_PIN _EPIN(X2_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(X2, X_MIN)      // If already remapped in the pins file...
       #define X2_USE_ENDSTOP _XMIN_
@@ -621,12 +601,16 @@
       #define X2_USE_ENDSTOP _YMAX_
     #elif DIAG_REMAPPED(X2, Z_MAX)
       #define X2_USE_ENDSTOP _ZMAX_
-    #else                               // Otherwise pick the next free En_DIAG_PIN directly
-      #define X2_USE_ENDSTOP _En_DIAG_(X2_E_INDEX)
+    #else                               // Otherwise use the driver DIAG_PIN directly
+      #define _X2_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define X2_USE_ENDSTOP _X2_USE_ENDSTOP(X2_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_X2_DIAG 1
-    #undef X2_DIAG_PIN // Defined in Conditionals_post.h based on X2_USE_ENDSTOP
+    #undef X2_DIAG_PIN
   #endif
+
+  #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
+#else
+  #define Y2_E_INDEX X2_E_INDEX
 #endif
 
 #ifndef X2_CS_PIN
@@ -643,11 +627,6 @@
 #endif
 
 // The Y2 axis, if any, should be the next open extruder port
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS) && !defined(Y2_DIAG_PIN) && !defined(Y2_STEP_PIN) && !PIN_EXISTS(Y2_CS_PIN)
-  #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
-#else
-  #define Z2_E_INDEX Y2_E_INDEX
-#endif
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
   #ifndef Y2_STEP_PIN
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
@@ -655,33 +634,19 @@
     #define Y2_ENABLE_PIN _EPIN(Y2_E_INDEX, ENABLE)
     #if Y2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Y2_STEP)
       #error "No E stepper plug left for Y2!"
-    #else
-      #define AUTO_ASSIGNED_Y2_STEPPER 1
     #endif
   #endif
   #ifndef Y2_MS1_PIN
     #define Y2_MS1_PIN    _EPIN(Y2_E_INDEX, MS1)
-    #if PIN_EXISTS(Y2_MS1)
-      #define AUTO_ASSIGNED_Y2_MS1 1
-    #endif
   #endif
   #ifndef Y2_MS2_PIN
     #define Y2_MS2_PIN    _EPIN(Y2_E_INDEX, MS2)
-    #if PIN_EXISTS(Y2_MS2)
-      #define AUTO_ASSIGNED_Y2_MS2 1
-    #endif
   #endif
   #ifndef Y2_MS3_PIN
     #define Y2_MS3_PIN    _EPIN(Y2_E_INDEX, MS3)
-    #if PIN_EXISTS(Y2_MS3)
-      #define AUTO_ASSIGNED_Y2_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_SPI(Y2) && !defined(Y2_CS_PIN)
     #define Y2_CS_PIN     _EPIN(Y2_E_INDEX, CS)
-    #if PIN_EXISTS(Y2_CS)
-      #define AUTO_ASSIGNED_Y2_CS 1
-    #endif
   #endif
   #if AXIS_HAS_UART(Y2)
     #ifndef Y2_SERIAL_TX_PIN
@@ -692,7 +657,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Y2_DIAG_PIN) && !defined(Y2_USE_ENDSTOP) && defined(Y2_STALL_SENSITIVITY) && ENABLED(Y_DUAL_ENDSTOPS) && _PEXI(Y2_E_INDEX, DIAG)
+  #if !defined(Y2_USE_ENDSTOP) && defined(Y2_STALL_SENSITIVITY) && ENABLED(Y_DUAL_ENDSTOPS) && _PEXI(Y2_E_INDEX, DIAG)
     #define Y2_DIAG_PIN _EPIN(Y2_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Y2, X_MIN)
       #define Y2_USE_ENDSTOP _XMIN_
@@ -707,11 +672,14 @@
     #elif DIAG_REMAPPED(Y2, Z_MAX)
       #define Y2_USE_ENDSTOP _ZMAX_
     #else
-      #define Y2_USE_ENDSTOP _En_DIAG_(Y2_E_INDEX)
+      #define _Y2_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Y2_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_Y2_DIAG 1
-    #undef Y2_DIAG_PIN // Defined in Conditionals_post.h based on Y2_USE_ENDSTOP
+    #undef Y2_DIAG_PIN
   #endif
+  #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
+#else
+  #define Z2_E_INDEX Y2_E_INDEX
 #endif
 
 #ifndef Y2_CS_PIN
@@ -728,11 +696,6 @@
 #endif
 
 // The Z2 axis, if any, should be the next open extruder port
-#if NUM_Z_STEPPER_DRIVERS >= 2 && !defined(Z2_DIAG_PIN) && !defined(Z2_STEP_PIN) && !PIN_EXISTS(Z2_CS_PIN)
-  #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
-#else
-  #define Z3_E_INDEX Z2_E_INDEX
-#endif
 #if NUM_Z_STEPPER_DRIVERS >= 2
   #ifndef Z2_STEP_PIN
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
@@ -740,33 +703,19 @@
     #define Z2_ENABLE_PIN _EPIN(Z2_E_INDEX, ENABLE)
     #if Z2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z2_STEP)
       #error "No E stepper plug left for Z2!"
-    #else
-      #define AUTO_ASSIGNED_Z2_STEPPER 1
     #endif
   #endif
   #ifndef Z2_MS1_PIN
     #define Z2_MS1_PIN    _EPIN(Z2_E_INDEX, MS1)
-    #if PIN_EXISTS(Z2_MS1)
-      #define AUTO_ASSIGNED_Z2_MS1 1
-    #endif
   #endif
   #ifndef Z2_MS2_PIN
     #define Z2_MS2_PIN    _EPIN(Z2_E_INDEX, MS2)
-    #if PIN_EXISTS(Z2_MS2)
-      #define AUTO_ASSIGNED_Z2_MS2 1
-    #endif
   #endif
   #ifndef Z2_MS3_PIN
     #define Z2_MS3_PIN    _EPIN(Z2_E_INDEX, MS3)
-    #if PIN_EXISTS(Z2_MS3)
-      #define AUTO_ASSIGNED_Z2_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_SPI(Z2) && !defined(Z2_CS_PIN)
     #define Z2_CS_PIN     _EPIN(Z2_E_INDEX, CS)
-    #if PIN_EXISTS(Z2_CS)
-      #define AUTO_ASSIGNED_Z2_CS 1
-    #endif
   #endif
   #if AXIS_HAS_UART(Z2)
     #ifndef Z2_SERIAL_TX_PIN
@@ -777,7 +726,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z2_DIAG_PIN) && !defined(Z2_USE_ENDSTOP) && defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
+  #if !defined(Z2_USE_ENDSTOP) && defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
     #define Z2_DIAG_PIN _EPIN(Z2_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Z2, X_MIN)
       #define Z2_USE_ENDSTOP _XMIN_
@@ -792,11 +741,14 @@
     #elif DIAG_REMAPPED(Z2, Z_MAX)
       #define Z2_USE_ENDSTOP _ZMAX_
     #else
-      #define Z2_USE_ENDSTOP _En_DIAG_(Z2_E_INDEX)
+      #define _Z2_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Z2_USE_ENDSTOP _Z2_USE_ENDSTOP(Z2_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_Z2_DIAG 1
-    #undef Z2_DIAG_PIN // Defined in Conditionals_post.h based on Z2_USE_ENDSTOP
+    #undef Z2_DIAG_PIN
   #endif
+  #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
+#else
+  #define Z3_E_INDEX Z2_E_INDEX
 #endif
 
 #ifndef Z2_CS_PIN
@@ -812,12 +764,6 @@
   #define Z2_MS3_PIN -1
 #endif
 
-// The Z3 axis, if any, should be the next open extruder port
-#if NUM_Z_STEPPER_DRIVERS >= 3 && !defined(Z3_DIAG_PIN) && !defined(Z3_STEP_PIN) && !PIN_EXISTS(Z3_CS_PIN)
-  #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
-#else
-  #define Z4_E_INDEX Z3_E_INDEX
-#endif
 #if NUM_Z_STEPPER_DRIVERS >= 3
   #ifndef Z3_STEP_PIN
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
@@ -825,33 +771,21 @@
     #define Z3_ENABLE_PIN _EPIN(Z3_E_INDEX, ENABLE)
     #if Z3_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z3_STEP)
       #error "No E stepper plug left for Z3!"
-    #else
-      #define AUTO_ASSIGNED_Z3_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(Z3) && !defined(Z3_CS_PIN)
-    #define Z3_CS_PIN     _EPIN(Z3_E_INDEX, CS)
-    #if PIN_EXISTS(Z3_CS)
-      #define AUTO_ASSIGNED_Z3_CS 1
+  #if AXIS_HAS_SPI(Z3)
+    #ifndef Z3_CS_PIN
+      #define Z3_CS_PIN   _EPIN(Z3_E_INDEX, CS)
     #endif
   #endif
   #ifndef Z3_MS1_PIN
     #define Z3_MS1_PIN    _EPIN(Z3_E_INDEX, MS1)
-    #if PIN_EXISTS(Z3_MS1)
-      #define AUTO_ASSIGNED_Z3_MS1 1
-    #endif
   #endif
   #ifndef Z3_MS2_PIN
     #define Z3_MS2_PIN    _EPIN(Z3_E_INDEX, MS2)
-    #if PIN_EXISTS(Z3_MS2)
-      #define AUTO_ASSIGNED_Z3_MS2 1
-    #endif
   #endif
   #ifndef Z3_MS3_PIN
     #define Z3_MS3_PIN    _EPIN(Z3_E_INDEX, MS3)
-    #if PIN_EXISTS(Z3_MS3)
-      #define AUTO_ASSIGNED_Z3_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_UART(Z3)
     #ifndef Z3_SERIAL_TX_PIN
@@ -862,7 +796,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z3_DIAG_PIN) && !defined(Z3_USE_ENDSTOP) && defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
+  #if !defined(Z3_USE_ENDSTOP) && defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
     #define Z3_DIAG_PIN _EPIN(Z3_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Z3, X_MIN)
       #define Z3_USE_ENDSTOP _XMIN_
@@ -877,11 +811,14 @@
     #elif DIAG_REMAPPED(Z3, Z_MAX)
       #define Z3_USE_ENDSTOP _ZMAX_
     #else
-      #define Z3_USE_ENDSTOP _En_DIAG_(Z3_E_INDEX)
+      #define _Z3_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Z3_USE_ENDSTOP _Z3_USE_ENDSTOP(Z3_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_Z3_DIAG 1
-    #undef Z3_DIAG_PIN // Defined in Conditionals_post.h based on Z3_USE_ENDSTOP
+    #undef Z3_DIAG_PIN
   #endif
+  #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
+#else
+  #define Z4_E_INDEX Z3_E_INDEX
 #endif
 
 #ifndef Z3_CS_PIN
@@ -897,12 +834,6 @@
   #define Z3_MS3_PIN -1
 #endif
 
-// The Z4 axis, if any, should be the next open extruder port
-#if NUM_Z_STEPPER_DRIVERS >= 4 && !defined(Z4_DIAG_PIN) && !defined(Z4_STEP_PIN) && !PIN_EXISTS(Z4_CS_PIN)
-  #define I_E_INDEX INCREMENT(Z4_E_INDEX)
-#else
-  #define I_E_INDEX Z4_E_INDEX
-#endif
 #if NUM_Z_STEPPER_DRIVERS >= 4
   #ifndef Z4_STEP_PIN
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
@@ -910,33 +841,21 @@
     #define Z4_ENABLE_PIN _EPIN(Z4_E_INDEX, ENABLE)
     #if Z4_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z4_STEP)
       #error "No E stepper plug left for Z4!"
-    #else
-      #define AUTO_ASSIGNED_Z4_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(Z4) && !defined(Z4_CS_PIN)
-    #define Z4_CS_PIN     _EPIN(Z4_E_INDEX, CS)
-    #if PIN_EXISTS(Z4_CS)
-      #define AUTO_ASSIGNED_Z4_CS 1
+  #if AXIS_HAS_SPI(Z4)
+    #ifndef Z4_CS_PIN
+      #define Z4_CS_PIN     _EPIN(Z4_E_INDEX, CS)
     #endif
   #endif
   #ifndef Z4_MS1_PIN
     #define Z4_MS1_PIN    _EPIN(Z4_E_INDEX, MS1)
-    #if PIN_EXISTS(Z4_MS1)
-      #define AUTO_ASSIGNED_Z4_MS1 1
-    #endif
   #endif
   #ifndef Z4_MS2_PIN
     #define Z4_MS2_PIN    _EPIN(Z4_E_INDEX, MS2)
-    #if PIN_EXISTS(Z4_MS2)
-      #define AUTO_ASSIGNED_Z4_MS2 1
-    #endif
   #endif
   #ifndef Z4_MS3_PIN
     #define Z4_MS3_PIN    _EPIN(Z4_E_INDEX, MS3)
-    #if PIN_EXISTS(Z4_MS3)
-      #define AUTO_ASSIGNED_Z4_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_UART(Z4)
     #ifndef Z4_SERIAL_TX_PIN
@@ -947,7 +866,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z4_DIAG_PIN) && !defined(Z4_USE_ENDSTOP) && defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
+  #if !defined(Z4_USE_ENDSTOP) && defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
     #define Z4_DIAG_PIN _EPIN(Z4_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(Z4, X_MIN)
       #define Z4_USE_ENDSTOP _XMIN_
@@ -962,11 +881,14 @@
     #elif DIAG_REMAPPED(Z4, Z_MAX)
       #define Z4_USE_ENDSTOP _ZMAX_
     #else
-      #define Z4_USE_ENDSTOP _En_DIAG_(Z4_E_INDEX)
+      #define _Z4_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define Z4_USE_ENDSTOP _Z4_USE_ENDSTOP(Z4_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_Z4_DIAG 1
-    #undef Z4_DIAG_PIN // Defined in Conditionals_post.h based on Z4_USE_ENDSTOP
+    #undef Z4_DIAG_PIN
   #endif
+  #define I_E_INDEX INCREMENT(Z4_E_INDEX)
+#else
+  #define I_E_INDEX Z4_E_INDEX
 #endif
 
 #ifndef Z4_CS_PIN
@@ -982,12 +904,6 @@
   #define Z4_MS3_PIN -1
 #endif
 
-// The I axis, if any, should be the next open extruder port
-#if LINEAR_AXES >= 4 && !defined(I_DIAG_PIN) && !defined(I_STEP_PIN) && !PIN_EXISTS(I_CS_PIN)
-  #define J_E_INDEX INCREMENT(I_E_INDEX)
-#else
-  #define J_E_INDEX I_E_INDEX
-#endif
 #if LINEAR_AXES >= 4
   #ifndef I_STEP_PIN
     #define I_STEP_PIN   _EPIN(I_E_INDEX, STEP)
@@ -995,33 +911,21 @@
     #define I_ENABLE_PIN _EPIN(I_E_INDEX, ENABLE)
     #if I_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(I_STEP)
       #error "No E stepper plug left for I!"
-    #else
-      #define AUTO_ASSIGNED_I_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(I) && !defined(I_CS_PIN)
-    #define I_CS_PIN     _EPIN(I_E_INDEX, CS)
-    #if PIN_EXISTS(I_CS)
-      #define AUTO_ASSIGNED_I_CS 1
+  #if AXIS_HAS_SPI(I)
+    #ifndef I_CS_PIN
+      #define I_CS_PIN   _EPIN(I_E_INDEX, CS)
     #endif
   #endif
   #ifndef I_MS1_PIN
     #define I_MS1_PIN    _EPIN(I_E_INDEX, MS1)
-    #if PIN_EXISTS(I_MS1)
-      #define AUTO_ASSIGNED_I_MS1 1
-    #endif
   #endif
   #ifndef I_MS2_PIN
     #define I_MS2_PIN    _EPIN(I_E_INDEX, MS2)
-    #if PIN_EXISTS(I_MS2)
-      #define AUTO_ASSIGNED_I_MS2 1
-    #endif
   #endif
   #ifndef I_MS3_PIN
     #define I_MS3_PIN    _EPIN(I_E_INDEX, MS3)
-    #if PIN_EXISTS(I_MS3)
-      #define AUTO_ASSIGNED_I_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_UART(I)
     #ifndef I_SERIAL_TX_PIN
@@ -1032,7 +936,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(I_DIAG_PIN) && !defined(I_USE_ENDSTOP) && defined(I_STALL_SENSITIVITY) && _PEXI(I_E_INDEX, DIAG)
+  #if !defined(I_USE_ENDSTOP) && defined(I_STALL_SENSITIVITY) && _PEXI(I_E_INDEX, DIAG)
     #define I_DIAG_PIN _EPIN(I_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(I, X_MIN)
       #define I_USE_ENDSTOP _XMIN_
@@ -1047,11 +951,14 @@
     #elif DIAG_REMAPPED(I, Z_MAX)
       #define I_USE_ENDSTOP _ZMAX_
     #else
-      #define I_USE_ENDSTOP _En_DIAG_(I_E_INDEX)
+      #define _I_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define I_USE_ENDSTOP _I_USE_ENDSTOP(I_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_I_DIAG 1
-    #undef I_DIAG_PIN // Defined in Conditionals_post.h based on I_USE_ENDSTOP
+    #undef I_DIAG_PIN
   #endif
+  #define J_E_INDEX INCREMENT(I_E_INDEX)
+#else
+  #define J_E_INDEX I_E_INDEX
 #endif
 
 #ifndef I_CS_PIN
@@ -1067,12 +974,6 @@
   #define I_MS3_PIN -1
 #endif
 
-// The J axis, if any, should be the next open extruder port
-#if LINEAR_AXES >= 5 && !defined(J_DIAG_PIN) && !defined(J_STEP_PIN) && !PIN_EXISTS(J_CS_PIN)
-  #define K_E_INDEX INCREMENT(J_E_INDEX)
-#else
-  #define K_E_INDEX J_E_INDEX
-#endif
 #if LINEAR_AXES >= 5
   #ifndef J_STEP_PIN
     #define J_STEP_PIN   _EPIN(J_E_INDEX, STEP)
@@ -1080,33 +981,21 @@
     #define J_ENABLE_PIN _EPIN(J_E_INDEX, ENABLE)
     #if I_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(J_STEP)
       #error "No E stepper plug left for J!"
-    #else
-      #define AUTO_ASSIGNED_J_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(J) && !defined(J_CS_PIN)
-    #define J_CS_PIN     _EPIN(J_E_INDEX, CS)
-    #if PIN_EXISTS(J_CS)
-      #define AUTO_ASSIGNED_J_CS 1
+  #if AXIS_HAS_SPI(J)
+    #ifndef J_CS_PIN
+      #define J_CS_PIN   _EPIN(J_E_INDEX, CS)
     #endif
   #endif
   #ifndef J_MS1_PIN
     #define J_MS1_PIN    _EPIN(J_E_INDEX, MS1)
-    #if PIN_EXISTS(J_MS1)
-      #define AUTO_ASSIGNED_J_MS1 1
-    #endif
   #endif
   #ifndef J_MS2_PIN
     #define J_MS2_PIN    _EPIN(J_E_INDEX, MS2)
-    #if PIN_EXISTS(J_MS2)
-      #define AUTO_ASSIGNED_J_MS2 1
-    #endif
   #endif
   #ifndef J_MS3_PIN
     #define J_MS3_PIN    _EPIN(J_E_INDEX, MS3)
-    #if PIN_EXISTS(J_MS3)
-      #define AUTO_ASSIGNED_J_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_UART(J)
     #ifndef J_SERIAL_TX_PIN
@@ -1117,7 +1006,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(J_DIAG_PIN) && !defined(J_USE_ENDSTOP) && defined(J_STALL_SENSITIVITY) && _PEXI(J_E_INDEX, DIAG)
+  #if !defined(J_USE_ENDSTOP) && defined(J_STALL_SENSITIVITY) && _PEXI(J_E_INDEX, DIAG)
     #define J_DIAG_PIN _EPIN(J_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(J, X_MIN)
       #define J_USE_ENDSTOP _XMIN_
@@ -1132,11 +1021,14 @@
     #elif DIAG_REMAPPED(I, Z_MAX)
       #define J_USE_ENDSTOP _ZMAX_
     #else
-      #define J_USE_ENDSTOP _En_DIAG_(J_E_INDEX)
+      #define _J_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define J_USE_ENDSTOP _J_USE_ENDSTOP(J_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_J_DIAG 1
-    #undef J_DIAG_PIN // Defined in Conditionals_post.h based on J_USE_ENDSTOP
+    #undef J_DIAG_PIN
   #endif
+  #define K_E_INDEX INCREMENT(J_E_INDEX)
+#else
+  #define K_E_INDEX J_E_INDEX
 #endif
 
 #ifndef J_CS_PIN
@@ -1152,7 +1044,6 @@
   #define J_MS3_PIN -1
 #endif
 
-// The K axis, if any, should be the next open extruder port
 #if LINEAR_AXES >= 6
   #ifndef K_STEP_PIN
     #define K_STEP_PIN   _EPIN(K_E_INDEX, STEP)
@@ -1160,33 +1051,21 @@
     #define K_ENABLE_PIN _EPIN(K_E_INDEX, ENABLE)
     #if K_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(K_STEP)
       #error "No E stepper plug left for K!"
-    #else
-      #define AUTO_ASSIGNED_K_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(K) && !defined(K_CS_PIN)
-    #define K_CS_PIN     _EPIN(K_E_INDEX, CS)
-    #if PIN_EXISTS(K_CS)
-      #define AUTO_ASSIGNED_K_CS 1
+  #if AXIS_HAS_SPI(K)
+    #ifndef K_CS_PIN
+      #define K_CS_PIN   _EPIN(K_E_INDEX, CS)
     #endif
   #endif
   #ifndef K_MS1_PIN
     #define K_MS1_PIN    _EPIN(K_E_INDEX, MS1)
-    #if PIN_EXISTS(K_MS1)
-      #define AUTO_ASSIGNED_K_MS1 1
-    #endif
   #endif
   #ifndef K_MS2_PIN
     #define K_MS2_PIN    _EPIN(K_E_INDEX, MS2)
-    #if PIN_EXISTS(K_MS2)
-      #define AUTO_ASSIGNED_K_MS2 1
-    #endif
   #endif
   #ifndef K_MS3_PIN
     #define K_MS3_PIN    _EPIN(K_E_INDEX, MS3)
-    #if PIN_EXISTS(K_MS3)
-      #define AUTO_ASSIGNED_K_MS3 1
-    #endif
   #endif
   #if AXIS_HAS_UART(K)
     #ifndef K_SERIAL_TX_PIN
@@ -1197,7 +1076,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(K_DIAG_PIN) && !defined(K_USE_ENDSTOP) && defined(K_STALL_SENSITIVITY) && _PEXI(K_E_INDEX, DIAG)
+  #if !defined(K_USE_ENDSTOP) && defined(K_STALL_SENSITIVITY) && _PEXI(K_E_INDEX, DIAG)
     #define K_DIAG_PIN _EPIN(K_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(K, X_MIN)
       #define K_USE_ENDSTOP _XMIN_
@@ -1212,10 +1091,10 @@
     #elif DIAG_REMAPPED(K, Z_MAX)
       #define K_USE_ENDSTOP _ZMAX_
     #else
-      #define K_USE_ENDSTOP _En_DIAG_(K_E_INDEX)
+      #define _K_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define K_USE_ENDSTOP _K_USE_ENDSTOP(K_E_INDEX)
     #endif
-    #define AUTO_ASSIGNED_K_DIAG 1
-    #undef K_DIAG_PIN // Defined in Conditionals_post.h based on K_USE_ENDSTOP
+    #undef K_DIAG_PIN
   #endif
 #endif
 
@@ -1342,19 +1221,23 @@
 //
 // Default DOGLCD SPI delays
 //
-#if DISABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB
+  #if !defined(ST7920_DELAY_1) && defined(BOARD_ST7920_DELAY_1)
+    #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
+  #endif
+  #if !defined(ST7920_DELAY_2) && defined(BOARD_ST7920_DELAY_2)
+    #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
+  #endif
+  #if !defined(ST7920_DELAY_3) && defined(BOARD_ST7920_DELAY_3)
+    #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
+  #endif
+#else
   #undef ST7920_DELAY_1
   #undef ST7920_DELAY_2
   #undef ST7920_DELAY_3
-  #undef LCD_ST7920_DELAY_1
-  #undef LCD_ST7920_DELAY_2
-  #undef LCD_ST7920_DELAY_3
   #undef BOARD_ST7920_DELAY_1
   #undef BOARD_ST7920_DELAY_2
   #undef BOARD_ST7920_DELAY_3
-  #undef CPU_ST7920_DELAY_1
-  #undef CPU_ST7920_DELAY_2
-  #undef CPU_ST7920_DELAY_3
 #endif
 
 #if !NEED_CASE_LIGHT_PIN
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 25decbf..de50657 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -114,11 +114,10 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN                             0  // Analog Input, Header J2
-#define TEMP_1_PIN                             1  // Analog Input, Header J3
-#define TEMP_BOARD_PIN                        91  // Onboard thermistor, 100k TDK NTCG104LH104JT1
-#define TEMP_BED_PIN                           2  // Analog Input, Header J6
-#define TEMP_PROBE_PIN                         3  // Analog Input, Header J15
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
+#define TEMP_PROBE_PIN                         3  // Analog Input
 
 //
 // Heaters / Fans
@@ -205,10 +204,4 @@
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_WIRED_LCD
 
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2               250
-  #define BOARD_ST7920_DELAY_3                 0
-#endif
-
 #undef MK3_FAN_PINS
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 48c68d5..0c07274 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -199,10 +199,3 @@
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
 
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
-
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2               250
-  #define BOARD_ST7920_DELAY_3                 0
-#endif
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index c496878..ec44cc3 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -69,7 +69,7 @@
 #define E0_DIR_PIN                            43
 #define E0_ENABLE_PIN                         26
 
-// Microstepping pins
+// Microstepping pins - Mapping not from fastio.h (?)
 #define X_MS1_PIN                             40
 #define X_MS2_PIN                             41
 #define Y_MS1_PIN                             69
@@ -192,9 +192,3 @@
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
 
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
-
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2               250
-  #define BOARD_ST7920_DELAY_3                 0
-#endif
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 8153103..f2d34dc 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -268,10 +268,3 @@
   #endif // !IS_NEWPANEL
 
 #endif // HAS_WIRED_LCD
-
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2                 0
-  #define BOARD_ST7920_DELAY_3                 0
-#endif
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 316323e..e78f768 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -80,7 +80,6 @@
 #if IS_ULTRA_LCD && IS_NEWPANEL
   #undef BEEPER_PIN
 
-  // TODO: Remap EXP1/2 based on adapter
   #undef LCD_PINS_RS
   #undef LCD_PINS_ENABLE
   #undef LCD_PINS_D4
@@ -108,12 +107,6 @@
 
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
 
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2               188
-  #define BOARD_ST7920_DELAY_3                 0
-#endif
-
 /**
  *  M3/M4/M5 - Spindle/Laser Control
  *
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index 4d7a792..97ef1b4 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -38,10 +38,12 @@
 #define SPINDLE_DIR_PIN                       67
 #define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
 
+#include "pins_RAMPS.h"
+
 //
 // Temperature Sensors
 //
+#undef TEMP_0_PIN
+#undef TEMP_1_PIN
 #define TEMP_0_PIN                             9  // Analog Input
 #define TEMP_1_PIN                            11  // Analog Input
-
-#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
index 14f54cd..99cf484 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -123,10 +123,3 @@
   #undef HEATER_BED_PIN
   #define HEATER_BED_PIN                       8
 #endif
-
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2                 0
-  #define BOARD_ST7920_DELAY_3               189
-#endif
diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
index 4bebd6d..8dc93c8 100644
--- a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
+++ b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
@@ -39,11 +39,13 @@
   #define FIL_RUNOUT2_PIN                     14
 #endif
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2               250
-  #define BOARD_ST7920_DELAY_3               250
+//
+// LCD delays
+//
+#if HAS_MARLINUI_U8GLIB
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 94c4551..5f645e5 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -198,9 +198,14 @@
   #define LCD_PINS_D7                         29
 #endif
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1               200
-  #define BOARD_ST7920_DELAY_2               200
-  #define BOARD_ST7920_DELAY_3               200
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(200)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(200)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(200)
+  #endif
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 9c6b74f..6133a64 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -34,7 +34,7 @@
 #endif
 
 #define RESET_PIN                             30
-#define SPI_FLASH_CS_PIN                      83
+#define SPI_FLASH_CS                          83
 
 //
 // Servos
@@ -124,42 +124,42 @@
    * Software serial communication pins.
    * At the moment, F6 rx pins are not pc interrupt pins
    */
-  #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN                   72
-  #endif
   #ifndef X_SERIAL_RX_PIN
     #define X_SERIAL_RX_PIN                   -1  // 71
   #endif
-  #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN                   75
+  #ifndef X_SERIAL_TX_PIN
+    #define X_SERIAL_TX_PIN                   72
   #endif
   #ifndef Y_SERIAL_RX_PIN
     #define Y_SERIAL_RX_PIN                   -1  // 73
   #endif
-  #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN                   79
+  #ifndef Y_SERIAL_TX_PIN
+    #define Y_SERIAL_TX_PIN                   75
   #endif
   #ifndef Z_SERIAL_RX_PIN
     #define Z_SERIAL_RX_PIN                   -1  // 78
   #endif
-  #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN                  77
+  #ifndef Z_SERIAL_TX_PIN
+    #define Z_SERIAL_TX_PIN                   79
   #endif
   #ifndef E0_SERIAL_RX_PIN
     #define E0_SERIAL_RX_PIN                  -1  // 76
   #endif
-  #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN                  81
+  #ifndef E0_SERIAL_TX_PIN
+    #define E0_SERIAL_TX_PIN                  77
   #endif
   #ifndef E1_SERIAL_RX_PIN
     #define E1_SERIAL_RX_PIN                  -1  // 80
   #endif
-  #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN                  82
+  #ifndef E1_SERIAL_TX_PIN
+    #define E1_SERIAL_TX_PIN                  81
   #endif
   #ifndef E2_SERIAL_RX_PIN
     #define E2_SERIAL_RX_PIN                  -1  // 22
   #endif
+  #ifndef E2_SERIAL_TX_PIN
+    #define E2_SERIAL_TX_PIN                  82
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index 1fc2415..4280204 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -33,23 +33,18 @@
   /**
    * TMC2208/TMC2209 stepper drivers
    */
-  #define X_SERIAL_TX_PIN                     71
   #define X_SERIAL_RX_PIN                     72
-
-  #define Y_SERIAL_TX_PIN                     78
+  #define X_SERIAL_TX_PIN                     71
   #define Y_SERIAL_RX_PIN                     73
-
-  #define Z_SERIAL_TX_PIN                     79
+  #define Y_SERIAL_TX_PIN                     78
   #define Z_SERIAL_RX_PIN                     75
-
-  #define E0_SERIAL_TX_PIN                    81
+  #define Z_SERIAL_TX_PIN                     79
   #define E0_SERIAL_RX_PIN                    77
-
-  #define E1_SERIAL_TX_PIN                    80
+  #define E0_SERIAL_TX_PIN                    81
   #define E1_SERIAL_RX_PIN                    76
-
-  #define E2_SERIAL_TX_PIN                    82
+  #define E1_SERIAL_TX_PIN                    80
   #define E2_SERIAL_RX_PIN                    62
+  #define E2_SERIAL_TX_PIN                    82
 #endif
 
 #include "pins_FYSETC_F6_13.h"
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index 9049308..47b52e7 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -60,9 +60,30 @@
 //
 // Steppers
 //
+#undef X_STEP_PIN
+#undef X_DIR_PIN
+#undef X_ENABLE_PIN
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
+
+#undef Y_STEP_PIN
+#undef Y_DIR_PIN
+#undef Y_ENABLE_PIN
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
+
 #undef Z_ENABLE_PIN
 #define Z_ENABLE_PIN                          63
 
+#undef E0_STEP_PIN
+#undef E0_DIR_PIN
+#undef E0_ENABLE_PIN
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
+
 //
 // Heaters / Fans
 //
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 4742ac9..08dd0f4 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -54,9 +54,6 @@
 
 #include "pins_RAMPS.h"
 
-#undef EXP2_03_PIN
-#define EXP2_03_PIN                           -1  // RESET
-
 //
 // LCD / Controller
 //
@@ -84,21 +81,19 @@
    *
    * This configuration uses the following arrangement:
    *
-   *             ------                       ------
-   *       ENCB |10  9 |  ENCA          MISO |10  9 | SCK
-   *   BLUE_LED | 8  7 |  RED_LED     ENCBTN | 8  7 | SDCS
-   *       KILL   6  5 |  BEEPER               6  5 | MOSI
-   *         A0 | 4  3 |  LCD_CS        SDCD | 4  3 |
-   *        GND | 2  1 | 5V              GND | 2  1 | NC
-   *             ------                       ------
-   *              EXP1                         EXP2
+   * EXP1 D37 = EN2   D35 = EN1     EXP2 D50 = MISO  D52 = SCK
+   *      D17 = BLUE  D16 = RED          D31 = ENC   D53 = SDCS
+   *      D23 = KILL  D25 = BUZZ         D33 = ---   D51 = MOSI
+   *      D27 = A0    D29 = LCS          D49 = SDCD  RST = ---
+   *      GND = GND   5V  = 5V           GND = ---   D41 = ---
    */
-  #undef SD_DETECT_PIN
+
   #undef BTN_EN1
   #undef BTN_EN2
   #undef BTN_ENC
   #undef DOGLCD_A0
   #undef DOGLCD_CS
+  #undef SD_DETECT_PIN
   #undef BEEPER_PIN
   #undef KILL_PIN
   #undef STAT_LED_RED_PIN
@@ -107,24 +102,46 @@
   //
   // VIKI2 12-wire lead
   //
-  #define SD_DETECT_PIN              EXP2_04_PIN  // SDCD     orange/white
-  #define BTN_EN1                    EXP1_09_PIN  // ENCA     white
-  #define BTN_EN2                    EXP1_10_PIN  // ENCB     green
-  #define BTN_ENC                    EXP2_08_PIN  // ENCBTN   purple
-  #define DOGLCD_A0                  EXP1_04_PIN  // A0       brown
-  #define DOGLCD_CS                  EXP1_03_PIN  // LCS      green/white
 
-  // EXP2_10_PIN  gray   MISO
-  // EXP2_05_PIN  yellow MOSI
-  // EXP2_09_PIN  orange SCK
+  // orange/white          SDCD
+  #define SD_DETECT_PIN                       49
 
-  //#define SDSS                     EXP2_07_PIN  // SDCS     blue
+  // white                 ENCA
+  #define BTN_EN1                             35
+
+  // green                 ENCB
+  #define BTN_EN2                             37
+
+  // purple                ENCBTN
+  #define BTN_ENC                             31
+
+  // brown                 A0
+  #define DOGLCD_A0                           27
+
+  // green/white           LCS
+  #define DOGLCD_CS                           29
+
+                        // 50    gray   MISO
+                        // 51    yellow MOSI
+                        // 52    orange SCK
+
+  // blue                  SDCS
+  //#define SDSS                              53
 
   //
   // VIKI2 4-wire lead
   //
-  #define KILL_PIN                   EXP1_06_PIN  // BTN      blue
-  #define BEEPER_PIN                 EXP1_05_PIN  // BUZZER   green
-  #define STAT_LED_RED_PIN           EXP1_07_PIN  // RED-LED  yellow
-  #define STAT_LED_BLUE_PIN          EXP1_08_PIN  // BLUE-LED white
+
+  // blue                  BTN
+  #define KILL_PIN                            23
+
+  // green                 BUZZER
+  #define BEEPER_PIN                          25
+
+  // yellow                RED-LED
+  #define STAT_LED_RED_PIN                    16
+
+  // white                 BLUE-LED
+  #define STAT_LED_BLUE_PIN                   17
+
 #endif
diff --git a/Marlin/src/pins/ramps/pins_ORTUR_4.h b/Marlin/src/pins/ramps/pins_ORTUR_4.h
index 428279c..e79973e 100644
--- a/Marlin/src/pins/ramps/pins_ORTUR_4.h
+++ b/Marlin/src/pins/ramps/pins_ORTUR_4.h
@@ -54,19 +54,20 @@
 #define TEMP_0_PIN                            15  // Analog Input
 #define TEMP_1_PIN                            13  // Analog Input
 
-#if HAS_TMC_UART
-  #define X_SERIAL_TX_PIN                     59
-  #define X_SERIAL_RX_PIN                     63
+//
+// Software serial
+//
+#define X_SERIAL_TX_PIN                       59
+#define X_SERIAL_RX_PIN                       63
 
-  #define Y_SERIAL_TX_PIN                     64
-  #define Y_SERIAL_RX_PIN                     40
+#define Y_SERIAL_TX_PIN                       64
+#define Y_SERIAL_RX_PIN                       40
 
-  #define Z_SERIAL_TX_PIN                     44
-  #define Z_SERIAL_RX_PIN                     42
+#define Z_SERIAL_TX_PIN                       44
+#define Z_SERIAL_RX_PIN                       42
 
-  #define E0_SERIAL_TX_PIN                    66
-  #define E0_SERIAL_RX_PIN                    65
-#endif
+#define E0_SERIAL_TX_PIN                      66
+#define E0_SERIAL_RX_PIN                      65
 
 #include "pins_RAMPS.h"
 
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index b51d212..2c27140 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -120,14 +120,14 @@
 #define X_DIR_PIN                             55
 #define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN                   AUX3_03_PIN
+  #define X_CS_PIN                   EXP2_07_PIN
 #endif
 
 #define Y_STEP_PIN                            60
 #define Y_DIR_PIN                             61
 #define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN                   AUX3_07_PIN
+  #define Y_CS_PIN                   EXP2_04_PIN
 #endif
 
 #ifndef Z_STEP_PIN
@@ -242,7 +242,7 @@
 // Misc. Functions
 //
 #ifndef SDSS
-  #define SDSS                       AUX3_03_PIN
+  #define SDSS                       EXP2_07_PIN
 #endif
 #define LED_PIN                               13
 
@@ -321,6 +321,10 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
+
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                   40
   #endif
@@ -424,78 +428,57 @@
 #endif
 
 //
-// AUX3 : GND D52 D50 5V
-//        NC  D53 D51 D49
-
-#define AUX3_03_PIN                           53
-#define AUX3_04_PIN                           52
-#define AUX3_05_PIN                           51
-#define AUX3_06_PIN                           50
-#define AUX3_07_PIN                           49
+// Aux 3 GND D52 D50 5V
+//       NC  D53 D51 D49
 
 //
-// AUX4 : D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
+// Aux 4 D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
 //
 
-#define AUX4_03_PIN                           32
-#define AUX4_04_PIN                           47
-#define AUX4_05_PIN                           45
-#define AUX4_06_PIN                           43
-#define AUX4_07_PIN                           41
-#define AUX4_08_PIN                           39
-#define AUX4_09_PIN                           37
-#define AUX4_10_PIN                           35
-#define AUX4_11_PIN                           33
-#define AUX4_12_PIN                           31
-#define AUX4_13_PIN                           29
-#define AUX4_14_PIN                           27
-#define AUX4_15_PIN                           25
-#define AUX4_16_PIN                           23
-#define AUX4_17_PIN                           17
-#define AUX4_18_PIN                           16
-
 /**
- * LCD adapter. NOTE: These come in two variants. The socket keys can be
+ * LCD adapter. Please note: These comes in two variants. The socket keys can be
  * on either side, and may be backwards on some boards / displays.
- *         ------                     ------
- *    D37 |10  9 | D35    (MISO) D50 |10  9 | D52 (SCK)
- *    D17 | 8  7 | D16           D31 | 8  7 | D53
- *    D23   6  5   D25           D33   6  5   D51 (MOSI)
- *    D27 | 4  3 | D29           D49 | 4  3 | D41
- *    GND | 2  1 | 5V            GND | 2  1 | NC
- *         ------                     ------
- *          EXP1                       EXP2
+ *         _____                           _____
+ *    D37 |10 9 | D35          (MISO) D50 |10 9 | D52 (SCK)
+ *    D17 | 8 7 | D16                 D31 | 8 7 | D53
+ *    D23   6 5   D25                 D33   6 5   D51 (MOSI)
+ *    D27 | 4 3 | D29                 D49 | 4 3 | D41
+ *    GND | 2 1 | 5V                  GND | 2 1 | NC
+ *         -----                           -----
+ *         EXP1                            EXP2
  */
-#ifndef EXP1_03_PIN
-  #define EXP1_03_PIN                AUX4_13_PIN
-  #define EXP1_04_PIN                AUX4_14_PIN
-  #define EXP1_05_PIN                AUX4_15_PIN
-  #define EXP1_06_PIN                AUX4_16_PIN
-  #define EXP1_07_PIN                AUX4_18_PIN
-  #define EXP1_08_PIN                AUX4_17_PIN
-  #define EXP1_09_PIN                AUX4_10_PIN
-  #define EXP1_10_PIN                AUX4_09_PIN
 
-  #define EXP2_03_PIN                AUX4_07_PIN
-  #define EXP2_04_PIN                AUX3_07_PIN
-  #define EXP2_05_PIN                AUX3_05_PIN
-  #define EXP2_06_PIN                AUX4_11_PIN
-  #define EXP2_07_PIN                AUX3_03_PIN
-  #define EXP2_08_PIN                AUX4_12_PIN
-  #define EXP2_09_PIN                AUX3_04_PIN
-  #define EXP2_10_PIN                AUX3_06_PIN
+#ifndef EXP1_03_PIN
+  #define EXP1_03_PIN                         29
+  #define EXP1_04_PIN                         27
+  #define EXP1_05_PIN                         25
+  #define EXP1_06_PIN                         23
+  #define EXP1_07_PIN                         16
+  #define EXP1_08_PIN                         17
+  #define EXP1_09_PIN                         35
+  #define EXP1_10_PIN                         37
+
+  #define EXP2_03_PIN                         41
+  #define EXP2_04_PIN                         49
+  #define EXP2_05_PIN                         51
+  #define EXP2_06_PIN                         33
+  #define EXP2_07_PIN                         53
+  #define EXP2_08_PIN                         31
+  #define EXP2_09_PIN                         52
+  #define EXP2_10_PIN                         50
 #endif
 
 //////////////////////////
 // LCDs and Controllers //
 //////////////////////////
 
-#if HAS_WIRED_LCD
+// GLCD features
+// Uncomment screen orientation
+//#define LCD_SCREEN_ROT_90
+//#define LCD_SCREEN_ROT_180
+//#define LCD_SCREEN_ROT_270
 
-  // Uncomment screen orientation
-  //#define LCD_SCREEN_ROT_90
-  //#define LCD_SCREEN_ROT_180
-  //#define LCD_SCREEN_ROT_270
+#if HAS_WIRED_LCD
 
   //
   // LCD Display output pins
@@ -608,7 +591,7 @@
       #endif
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN    AUX4_08_PIN
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -620,9 +603,9 @@
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1                AUX4_04_PIN
-      #define BTN_EN2                AUX4_06_PIN
-      #define BTN_ENC                AUX4_03_PIN
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
       #define LCD_SDSS                      SDSS
       #define KILL_PIN               EXP2_03_PIN
 
@@ -746,23 +729,13 @@
 
       // Pins only defined for RAMPS_SMART currently
 
-    #elif ENABLED(G3D_PANEL)
-
-      #define BEEPER_PIN             EXP2_06_PIN
-
-      #define SD_DETECT_PIN          EXP2_04_PIN
-      #define KILL_PIN               EXP2_03_PIN
-
-      #define BTN_EN1                EXP1_10_PIN
-      #define BTN_EN2                EXP1_09_PIN
-      #define BTN_ENC                EXP2_08_PIN
-
     #elif IS_TFTGLCD_PANEL
 
       #define SD_DETECT_PIN          EXP2_04_PIN
 
     #else
 
+      // Beeper on AUX-4
       #define BEEPER_PIN             EXP2_06_PIN
 
       // Buttons are directly attached to AUX-2
@@ -776,6 +749,11 @@
         #define BTN_ENC              EXP2_08_PIN
       #endif
 
+      #if ENABLED(G3D_PANEL)
+        #define SD_DETECT_PIN        EXP2_04_PIN
+        #define KILL_PIN             EXP2_03_PIN
+      #endif
+
     #endif
   #endif // IS_NEWPANEL
 
@@ -804,7 +782,7 @@
    * FYSETC TFT-81050 display pinout
    *
    *               Board                                     Display
-   *               -----                                     -----
+   *               _____                                     _____
    *  (SCK)   D52 | 1 2 | D50    (MISO)                MISO | 1 2 | SCK
    *  (SD_CS) D53 | 3 4 | D33 (BNT_EN2) (BNT_EN2) MOD_RESET | 3 4 | SD_CS
    *  (MOSI)  D51 | 5 6   D31 (BNT_EN1) (BNT_EN1)    LCD_CS | 5 6   MOSI
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index def71fe..05de208 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -63,6 +63,6 @@
 #define EXP4_PIN                              12  // PS_ON_PIN
 
 #define SUICIDE_PIN                           12  // Used by CR2020 Industrial series
-#ifndef SUICIDE_PIN_STATE
-  #define SUICIDE_PIN_STATE                 HIGH
+#ifndef SUICIDE_PIN_INVERTING
+  #define SUICIDE_PIN_INVERTING             true
 #endif
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 01769fb..57a9a56 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -117,6 +117,10 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E3_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
+
   #define X_SERIAL_TX_PIN                     -1  // 59
   #define X_SERIAL_RX_PIN                     -1  // 63
   #define X2_SERIAL_TX_PIN                    -1
@@ -223,25 +227,10 @@
   #define PS_ON_PIN                           12
 #endif
 
-//
-// M3/M4/M5 - Spindle/Laser Control
-//
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !NUM_SERVOS                                 // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
-    #define SPINDLE_DIR_PIN                    5
-  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
-    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
-    #define SPINDLE_DIR_PIN                   65
-  #endif
-#endif
-
 //
 // Case Light
 //
-#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
+#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
   #if !NUM_SERVOS                                 // Prefer the servo connector
     #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
@@ -249,6 +238,21 @@
   #endif
 #endif
 
+//
+// M3/M4/M5 - Spindle/Laser Control
+//
+#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
+  #if !NUM_SERVOS                                 // Prefer the servo connector
+    #define SPINDLE_LASER_ENABLE_PIN           4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
+    #define SPINDLE_LASER_ENABLE_PIN          40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
+  #endif
+#endif
+
 //
 // Průša i3 MK2 Multiplexer Support
 //
diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
index feaa4ba..26ad5fd 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -213,6 +213,10 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
+
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                   40
   #endif
diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
index 70c3853..c273edf 100644
--- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
+++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
@@ -123,20 +123,20 @@
 
 #define SPI_CHAN_DAC                           1
 
-#define DAC0_SYNC_PIN                         53  // PB14
-#define DAC1_SYNC_PIN                          6  // PC24
+#define DAC0_SYNC                             53  // PB14
+#define DAC1_SYNC                              6  // PC24
 
 // 64K SPI EEPROM
 #define SPI_EEPROM
 #define SPI_CHAN_EEPROM1                       2
-#define SPI_EEPROM1_CS_PIN                    25  // PD0
+#define SPI_EEPROM1_CS                        25  // PD0
 
 // 2K SPI EEPROM
-#define SPI_EEPROM2_CS_PIN                    26  // PD1
+#define SPI_EEPROM2_CS                        26  // PD1
 
 // FLASH SPI
 // 32Mb
-#define SPI_FLASH_CS_PIN                      23  // PA14
+#define SPI_FLASH_CS                          23  // PA14
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index 7754fa9..bc0d29b 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -68,8 +68,8 @@
 //
 #define TEMP_0_PIN                             0  // Analog Input (HOTEND0 thermistor)
 #define TEMP_1_PIN                             2  // Analog Input (unused)
+#define TEMP_2_PIN                             5  // Analog Input (OnBoard thermistor beta 3950)
 #define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
-#define TEMP_BOARD_PIN                         5  // Analog Input (OnBoard thermistor beta 3950)
 
 // SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 5e612d3..b5569c8 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -190,11 +190,11 @@
 //#define EEPROM_SD                               // EEPROM on SDCARD
 //#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
-//#define SPI_EEPROM1_CS_PIN      ?
+//#define SPI_EEPROM1_CS          ?
 // 2K EEPROM
-//#define SPI_EEPROM2_CS_PIN      ?
+//#define SPI_EEPROM2_CS          ?
 // 32Mb FLASH
-//#define SPI_FLASH_CS_PIN        ?
+//#define SPI_FLASH_CS            ?
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 37a76c5..b06de1b 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -176,11 +176,11 @@
 //#define EEPROM_SD                               // EEPROM on SDCARD
 //#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
-//#define SPI_EEPROM1_CS_PIN      ?
+//#define SPI_EEPROM1_CS          ?
 // 2K EEPROM
-//#define SPI_EEPROM2_CS_PIN      ?
+//#define SPI_EEPROM2_CS          ?
 // 32Mb FLASH
-//#define SPI_FLASH_CS_PIN        ?
+//#define SPI_FLASH_CS            ?
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
index fd30c2b..a655d01 100644
--- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
+++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
@@ -137,13 +137,13 @@
 // SPI Buses
 //
 
-#define DAC0_SYNC_PIN                         53  // PB14
+#define DAC0_SYNC                             53  // PB14
 #define SPI_CHAN_DAC                           1
 
 #define SPI_CHAN_EEPROM1                      -1
-#define SPI_EEPROM1_CS_PIN                    -1
-#define SPI_EEPROM2_CS_PIN                    -1
-#define SPI_FLASH_CS_PIN                      -1
+#define SPI_EEPROM1_CS                        -1
+#define SPI_EEPROM2_CS                        -1
+#define SPI_FLASH_CS                          -1
 
 #define SD_SCK_PIN                            76
 #define SD_MISO_PIN                           74
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 449ae02..fbd9d7c 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -194,56 +194,60 @@
   //#define E0_HARDWARE_SERIAL Serial1
   //#define E1_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
+
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                   47
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
+    #define X_SERIAL_RX_PIN                   47
   #endif
   #ifndef X2_SERIAL_TX_PIN
     #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN    X2_SERIAL_TX_PIN
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
     #define Y_SERIAL_TX_PIN                   45
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
+    #define Y_SERIAL_RX_PIN                   45
   #endif
   #ifndef Y2_SERIAL_TX_PIN
     #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN    Y2_SERIAL_TX_PIN
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                   32
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
+    #define Z_SERIAL_RX_PIN                   32
   #endif
   #ifndef Z2_SERIAL_TX_PIN
     #define Z2_SERIAL_TX_PIN                  22
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN    Z2_SERIAL_TX_PIN
+    #define Z2_SERIAL_RX_PIN                  22
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
     #define E0_SERIAL_TX_PIN                  43
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
+    #define E0_SERIAL_RX_PIN                  43
   #endif
   #ifndef E1_SERIAL_TX_PIN
     #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN    E1_SERIAL_TX_PIN
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index bd69e16..ac8fa80 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -86,24 +86,8 @@
  *   Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community.
  */
 
-/**
- * OptiBoot Bootloader:
- *   Optiboot is an alternative bootloader that can be flashed on the board to free up space for a larger firmware build.
- *   See https://github.com/Optiboot/optiboot for more information.
- *
- * Install Marlin with Arduino IDE:
- *   For a board with the stock bootloader, select 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.'
- *   For a board with OptiBoot, select 'Sanguino (Optiboot)' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.'
- *
- * Install Marlin with PlatformIO IDE:
- *   (NOTE: You can set a default build environment by editing the value of 'default_env' in 'platformio.ini'.
- *          For the best user experience install the "Auto Build Marlin" extension.)
- *   For a board with the stock bootloader use Build / Upload under the 'sanguino1284p' or 'sanguino1284p_optimized' target.
- *   For a board with OptiBoot, use Build / Upload under the 'melzi_optiboot' target.
- */
-
 #if NOT_TARGET(__AVR_ATmega1284P__)
-  #error "Oops! Select 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.' (For PlatformIO, use 'sanguino1284p' or 'sanguino1284p_optimized'. With optiboot, use 'melzi_optiboot.')"
+  #error "Oops! Select 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.' (For PlatformIO, use 'melzi' or 'melzi_optiboot.')"
 #endif
 
 #define BOARD_INFO_NAME "Anet 1.0"
@@ -195,9 +179,9 @@
       #define BTN_EN1                         28
       #define BTN_EN2                         10
       #define BTN_ENC                         17
-      #define BOARD_ST7920_DELAY_1           250
-      #define BOARD_ST7920_DELAY_2           250
-      #define BOARD_ST7920_DELAY_3           250
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(250)
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
     #else
       #define SERVO0_PIN                      29  // free for BLTouch/3D-Touch
       #define BEEPER_PIN                      17
@@ -207,9 +191,9 @@
       #define BTN_EN1                         11
       #define BTN_EN2                         10
       #define BTN_ENC                         16
-      #define BOARD_ST7920_DELAY_1           125
-      #define BOARD_ST7920_DELAY_2            63
-      #define BOARD_ST7920_DELAY_3           125
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
     #endif
 
   #endif
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index 31583fd..de4dd1b 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -31,17 +31,4 @@
 
 #define IS_MELZI 1
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1               0
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2             188
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3               0
-  #endif
-#endif
-
 #include "pins_SANGUINOLOLU_12.h"
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 3c6dd90..225392d 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -36,10 +36,16 @@
 #define BOARD_INFO_NAME "Melzi (Creality)"
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1               125
-  #define BOARD_ST7920_DELAY_2               125
-  #define BOARD_ST7920_DELAY_3               125
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+  #endif
 #endif
 
 #include "pins_MELZI.h"
@@ -131,11 +137,11 @@
 
 /**
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
- *        ------                                      ------
- *   PA4 |10  9 | PC0                     BEEPER_PIN |10  9 | BTN_ENC
- *   PD3 | 8  7 | RESET                      BTN_EN1 | 8  7 | RESET
- *   PD2   6  5 | PA1                        BTN_EN2   6  5 | LCD_PINS_D4     (ST9720 CLK)
- *   PA3 | 4  3 | PC1        (ST9720 CS) LCD_PINS_RS | 4  3 | LCD_PINS_ENABLE (ST9720 DAT)
- *   GND | 2  1 | 5V                             GND | 2  1 | 5V
- *        ------                                      ------
+ *        _____                                      _____
+ *   PA4 | 6 5 | PC0                     BEEPER_PIN | 6 5 | BTN_ENC
+ *   PD3 | 7 4 | RESET                      BTN_EN1 | 7 4 | RESET
+ *   PD2   8 3 | PA1                        BTN_EN2   8 3 | LCD_PINS_D4 (ST9720 CLK)
+ *   PA3 | 9 2 | PC1        (ST9720 CS) LCD_PINS_RS | 9 2 | LCD_PINS_ENABLE (ST9720 DAT)
+ *   GND |10 1 | 5V                             GND |10 1 | 5V
+ *        -----                                   -----
  */
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index 3bf8f80..8b4faee 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -27,6 +27,19 @@
 
 #define BOARD_INFO_NAME "Melzi (Malyan)"
 
+// Alter timing for graphical display
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+  #endif
+#endif
+
 #include "pins_MELZI.h"
 
 #undef LCD_SDSS
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index 8abed5c..f878941 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -27,11 +27,16 @@
 
 #define BOARD_INFO_NAME "Melzi (Tronxy)"
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2               125
-  #define BOARD_ST7920_DELAY_3                 0
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
+  #endif
 #endif
 
 #include "pins_MELZI.h"
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_V2.h b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
index c313343..e036992 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_V2.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -27,11 +24,16 @@
 
 #define BOARD_INFO_NAME "Melzi V2"
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                 0
-  #define BOARD_ST7920_DELAY_2               400
-  #define BOARD_ST7920_DELAY_3                 0
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(400)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
+  #endif
 #endif
 
 #include "pins_MELZI.h"
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index 8dd6171..d79ad7a 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -165,6 +165,16 @@
       #define KILL_PIN                        10
       #define BEEPER_PIN                      27
 
+      #ifndef BOARD_ST7920_DELAY_1
+        #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
+      #endif
+      #ifndef BOARD_ST7920_DELAY_2
+        #define BOARD_ST7920_DELAY_2 DELAY_NS(188)
+      #endif
+      #ifndef BOARD_ST7920_DELAY_3
+        #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
+      #endif
+
     #elif ENABLED(U8GLIB_ST7920)                  // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
 
       #if IS_MELZI
@@ -175,6 +185,19 @@
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
         // with M42 instead of BEEPER_PIN.
         #define BEEPER_PIN                    27
+
+        #if IS_RRD_FG_SC
+          #ifndef BOARD_ST7920_DELAY_1
+            #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
+          #endif
+          #ifndef BOARD_ST7920_DELAY_2
+            #define BOARD_ST7920_DELAY_2 DELAY_NS(188)
+          #endif
+          #ifndef BOARD_ST7920_DELAY_3
+            #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
+          #endif
+        #endif
+
       #else                                       // Sanguinololu >=1.3
         #define LCD_PINS_RS                    4
         #define LCD_PINS_ENABLE               17
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index cb2dec1..0265ae0 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -189,9 +189,10 @@
   #endif
   #define LCD_PINS_D4                         10  // ST7920_CLK_PIN LCD_PIN_ENABLE (PIN6 of LCD module)
 
-  #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
-  #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
-  #define BOARD_ST7920_DELAY_3       DELAY_2_NOP
+  // Alter timing for graphical display
+  #define ST7920_DELAY_1             DELAY_2_NOP
+  #define ST7920_DELAY_2             DELAY_2_NOP
+  #define ST7920_DELAY_3             DELAY_2_NOP
 
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
   //
diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
index 178c873..abdd088 100644
--- a/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
+++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #pragma once
 
 #if NOT_TARGET(STM32F0xx)
diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
index 299b9ff..2717439 100644
--- a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
+++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #pragma once
 
 #if NOT_TARGET(__STM32F1__, STM32F1xx, STM32F0xx)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index 8bae916..63ad06d 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -49,21 +49,25 @@
   #define I2C_EEPROM
 #endif
 
+/* I2C */
 #if ENABLED(I2C_EEPROM)
   #define IIC_EEPROM_SDA                    PB7
   #define IIC_EEPROM_SCL                    PB6
+
   #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
   #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
 #endif
 
+#define E2END           (MARLIN_EEPROM_SIZE - 1)  // 2KB
+
 //
 // Limit Switches
 //
 
 #define X_STOP_PIN                          PC0
 #define Y_STOP_PIN                          PC1
-#define Z_STOP_PIN                          PC14  // Endstop or Probe
+#define Z_STOP_PIN                          PC14  // Endtop or Probe
 
 #define FIL_RUNOUT_PIN                      PC15
 
@@ -154,6 +158,8 @@
 // SD Card
 //
 
+#define HAS_ONBOARD_SD
+
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
@@ -161,7 +167,6 @@
 #if SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PC4
   #define ONBOARD_SD_CS_PIN                 PA4   // Chip select for "System" SD card
-  #define SDSS                 ONBOARD_SD_CS_PIN
 #endif
 
 //
@@ -174,6 +179,6 @@
 #endif
 
 #define SUICIDE_PIN                         PC13
-#ifndef SUICIDE_PIN_STATE
-  #define SUICIDE_PIN_STATE                  LOW
+#ifndef SUICIDE_PIN_INVERTING
+  #define SUICIDE_PIN_INVERTING             false
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
index dae43d3..9b71570 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -120,17 +120,20 @@
   //#define Z_HARDWARE_SERIAL  MSerial1
   //#define E0_HARDWARE_SERIAL MSerial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PC10
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PC10
 
   #define Y_SERIAL_TX_PIN                   PC11
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PC11
 
   #define Z_SERIAL_TX_PIN                   PC12
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PC12
 
   #define E0_SERIAL_TX_PIN                  PD2
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PD2
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -156,7 +159,7 @@
 #define USB_CONNECT_INVERTING              false
 
 /**
- *                 -----
+ *                 _____
  *             5V | 1 2 | GND
  *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
  *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
@@ -195,7 +198,7 @@
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
-     *                   -----
+     *                   _____
      *               5V | 1 2 | GND
      *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
      *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
@@ -229,7 +232,7 @@
   /** FYSETC TFT TFT81050 display pinout
    *
    *               Board                                     Display
-   *               -----                                      -----
+   *               _____                                      _____
    *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
    * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
    * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
index 44d4f23..4951d69 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -33,17 +33,20 @@
  * TMC2208/TMC2209 stepper drivers
  */
 #if HAS_TMC_UART
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PB15
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PB15
 
   #define Y_SERIAL_TX_PIN                   PC6
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PC6
 
   #define Z_SERIAL_TX_PIN                   PC10
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PC10
 
   #define E0_SERIAL_TX_PIN                  PC11
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PC11
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 48d38e2..8f30554 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -117,7 +117,7 @@
 
 /**
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
- *                ------                                    ------
+ *                ______                                    ______
  *            5V | 1  2 | GND                           5V | 1  2 | GND
  *  (LCD_EN) PB7 | 3  4 | PB8  (LCD_RS)      (LCD_EN) PB15 | 3  4 | PB8  (LCD_RS)
  *  (LCD_D4) PB9 | 5  6   PA10 (BTN_EN2)     (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
@@ -134,7 +134,7 @@
   #define EXP1_3                            PB7
 #endif
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if ENABLED(DWIN_CREALITY_LCD)
   /**
    *        ------              ------              ------
    *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
@@ -148,7 +148,7 @@
    * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
    */
 
-  #error "Ender-3 V2 display requires a custom cable, see diagram above this line. Comment out this line to continue."
+  #error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
 
   #define BEEPER_PIN                      EXP1_9
   #define BTN_EN1                         EXP1_3
@@ -205,7 +205,7 @@
        * TFTGLCD_PANEL_SPI display pinout
        *
        *               Board                                      Display
-       *               ------                                       ------
+       *               ______                                       ______
        *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
        * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
        * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
@@ -248,7 +248,7 @@
    * FYSETC TFT TFT81050 display pinout
    *
    *               Board                                      Display
-   *               ------                                       ------
+   *               ______                                       ______
    *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
    * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
    * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
index 650357e..6b3d283 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
@@ -68,7 +68,7 @@
 #define E0_DIR_PIN                          PB0
 #define E0_ENABLE_PIN                       PC4
 
-#if ENABLED(TMC_USE_SW_SPI)                       // Shared with EXP2
+#if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_SCK
     #define TMC_SW_SCK                      PB3
   #endif
@@ -93,48 +93,33 @@
 #define TEMP_BED_PIN                        PB1   // Analog Input
 #define TEMP_0_PIN                          PA0   // Analog Input
 
-/**                ------                                    ------
- *  (BEEPER) PC10 |10  9 | PC11 (BTN_ENC)        (MISO) PB4 |10  9 | PB3   (SCK)
- *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
- *  (LCD_D4) PC13   6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8   6  5 | PB5   (MOSI)
- *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
- *           GND  | 2  1 | 5V                           GND | 2  1 | NC
- *                 ------                                    ------
- *                  EXP1                                      EXP2
+//
+// LCD Pins
+//
+
+/**
+ *                _____                                             _____
+ *            NC | · · | GND                                    5V | · · | GND
+ *         RESET | · · | PB9 (SD_DETECT)             (LCD_D7) PC14 | · · | PC15 (LCD_D6)
+ *  (MOSI)   PB5 | · · | PB8 (BTN_EN2)               (LCD_D5)  PB7 | · · | PC13 (LCD_D4)
+ * (SD_SS)  PA15 | · · | PD2 (BTN_EN1)               (LCD_RS) PC12 | · · | PB6  (LCD_EN)
+ *   (SCK)   PB3 | · · | PB4 (MISO)                 (BTN_ENC) PC11 | · · | PC10 (BEEPER)
+ *                -----                                             -----
+ *                EXP2                                              EXP1
  */
-#define EXP1_03_PIN                         PC14
-#define EXP1_04_PIN                         PC15
-#define EXP1_05_PIN                         PB7
-#define EXP1_06_PIN                         PC13
-#define EXP1_07_PIN                         PC12
-#define EXP1_08_PIN                         PB6
-#define EXP1_09_PIN                         PC11
-#define EXP1_10_PIN                         PC10
 
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB9
-#define EXP2_05_PIN                         PB5
-#define EXP2_06_PIN                         PB8
-#define EXP2_07_PIN                         PA15
-#define EXP2_08_PIN                         PD2
-#define EXP2_09_PIN                         PB3
-#define EXP2_10_PIN                         PB4
-
-//
-// LCD / Controller
-//
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                        PC10
+  #define BTN_ENC                           PC11
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS                     PC15
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                         PB6
+    #define BTN_EN2                         PC13
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE                 PC14
+    #define LCD_PINS_D4                     PB7
 
   #elif IS_TFTGLCD_PANEL
 
@@ -142,56 +127,56 @@
     #undef BTN_ENC
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS             EXP2_08_PIN
+      #define TFTGLCD_CS                    PD2
     #endif
 
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define SD_DETECT_PIN                   PB9
 
   #else
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS                     PC12
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                         PD2
+    #define BTN_EN2                         PB8
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_ENABLE                 PB6
 
     #if ENABLED(FYSETC_MINI_12864)
 
       #define LCD_BACKLIGHT_PIN             -1
-      #define LCD_RESET_PIN          EXP1_06_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_SCK             EXP2_09_PIN
-      #define DOGLCD_MOSI            EXP2_05_PIN
+      #define LCD_RESET_PIN                 PC13
+      #define DOGLCD_A0                     PC12
+      #define DOGLCD_CS                     PB6
+      #define DOGLCD_SCK                    PB3
+      #define DOGLCD_MOSI                   PB5
 
       #define FORCE_SOFT_SPI                      // SPI MODE3
 
-      #define LED_PIN                EXP1_05_PIN   // red pwm
-      //#define LED_PIN              EXP1_04_PIN  // green
-      //#define LED_PIN              EXP1_03_PIN  // blue
+      #define LED_PIN                       PB7   // red pwm
+      //#define LED_PIN                     PC15  // green
+      //#define LED_PIN                     PC14  // blue
 
       //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       //  #ifndef RGB_LED_R_PIN
-      //    #define RGB_LED_R_PIN    EXP1_05_PIN
+      //    #define RGB_LED_R_PIN PB7
       //  #endif
       //  #ifndef RGB_LED_G_PIN
-      //    #define RGB_LED_G_PIN    EXP1_04_PIN
+      //    #define RGB_LED_G_PIN PC15
       //  #endif
       //  #ifndef RGB_LED_B_PIN
-      //    #define RGB_LED_B_PIN    EXP1_03_PIN
+      //    #define RGB_LED_B_PIN PC14
       //  #endif
       //#elif ENABLED(FYSETC_MINI_12864_2_1)
-      //  #define NEOPIXEL_PIN       EXP1_05_PIN
+      //  #define NEOPIXEL_PIN    PB7
       //#endif
 
     #else                                         // !FYSETC_MINI_12864
 
-      #define LCD_PINS_D4            EXP1_06_PIN
+      #define LCD_PINS_D4                   PC13
       #if IS_ULTIPANEL
-        #define LCD_PINS_D5          EXP1_05_PIN
-        #define LCD_PINS_D6          EXP1_04_PIN
-        #define LCD_PINS_D7          EXP1_03_PIN
+        #define LCD_PINS_D5                 PB7
+        #define LCD_PINS_D6                 PC15
+        #define LCD_PINS_D7                 PC14
 
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
@@ -201,11 +186,16 @@
 
     #endif // !FYSETC_MINI_12864
 
-    // Alter timing for graphical display
-    #if ENABLED(U8GLIB_ST7920)
-      #define BOARD_ST7920_DELAY_1           125
-      #define BOARD_ST7920_DELAY_2           125
-      #define BOARD_ST7920_DELAY_3           125
+    #if HAS_MARLINUI_U8GLIB
+      #ifndef BOARD_ST7920_DELAY_1
+        #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+      #endif
+      #ifndef BOARD_ST7920_DELAY_2
+        #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+      #endif
+      #ifndef BOARD_ST7920_DELAY_3
+        #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+      #endif
     #endif
 
   #endif
@@ -224,11 +214,11 @@
 
 #if SD_CONNECTION_IS(LCD)
   #define SPI_DEVICE                           3
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_SS_PIN                  EXP2_07_PIN
+  #define SD_DETECT_PIN                     PB9
+  #define SD_SCK_PIN                        PB3
+  #define SD_MISO_PIN                       PB4
+  #define SD_MOSI_PIN                       PB5
+  #define SD_SS_PIN                         PA15
 #elif SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PA3
   #define SD_SCK_PIN                        PA5
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 77eb6aa..dc8b8c5 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -84,20 +84,15 @@
 #define E0_STEP_PIN                         PA6
 #define E0_DIR_PIN                          PA5
 
-#if HAS_TMC_UART
-  // Stepper drivers Serial UART
-  #define X_SERIAL_TX_PIN                   PB3
-  #define X_SERIAL_RX_PIN                   PD2
-
-  #define Y_SERIAL_TX_PIN                   PA15
-  #define Y_SERIAL_RX_PIN                   PC6
-
-  #define Z_SERIAL_TX_PIN                   PB11
-  #define Z_SERIAL_RX_PIN                   PB10
-
-  #define E0_SERIAL_TX_PIN                  PC5
-  #define E0_SERIAL_RX_PIN                  PC4
-#endif
+// Stepper drivers Serial UART
+#define X_SERIAL_TX_PIN                     PB3
+#define X_SERIAL_RX_PIN                     PD2
+#define Y_SERIAL_TX_PIN                     PA15
+#define Y_SERIAL_RX_PIN                     PC6
+#define Z_SERIAL_TX_PIN                     PB11
+#define Z_SERIAL_RX_PIN                     PB10
+#define E0_SERIAL_TX_PIN                    PC5
+#define E0_SERIAL_RX_PIN                    PC4
 
 // Reduce baud rate to improve software serial reliability
 #define TMC_BAUD_RATE                      19200
@@ -122,43 +117,41 @@
 #define NEOPIXEL_PIN                        PC7   // The NEOPIXEL LED driving pin
 
 /**
- *       ------
- *  PB5 |10  9 | PB6
- *  PA2 | 8  7 | RESET
- *  PA3   6  5 | PB8
- *  PB7 | 4  3 | PA4
- *  GND | 2  1 | VCC5
- *       ------
- *        EXP1
+ *     1 _____ 2
+ *  PB5 | · · | PB6
+ *  PA2 | · · | RESET
+ *  PA3 | · · | PB8
+ *  PB7 | · · | PA4
+ *  GND | · · | VCC5
+ *     9 ----- 10
+ *      LCD EXP
  */
-#define EXP1_03_PIN                         PA4
-#define EXP1_04_PIN                         PB7
-#define EXP1_05_PIN                         PB8
-#define EXP1_06_PIN                         PA3
-#define EXP1_07_PIN                         -1   // RESET
-#define EXP1_08_PIN                         PA2
-#define EXP1_09_PIN                         PB6
-#define EXP1_10_PIN                         PB5
 
 //
 // LCD / Controller
 //
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                        PB5
+  #define BTN_EN1                           PA2
+  #define BTN_EN2                           PA3
+  #define BTN_ENC                           PB6
 
-  #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
-  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
-  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
+  #define LCD_PINS_RS                       PB7   // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                       PB8   // SCLK
+  #define LCD_PINS_ENABLE                   PA4   // DATA MOSI
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1               125
-  #define BOARD_ST7920_DELAY_2               125
-  #define BOARD_ST7920_DELAY_3               125
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
index 989b7ee..0319afa 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
@@ -120,10 +120,10 @@
 #endif
 
 // SPI 2
-#define SPI_FLASH_CS_PIN                    PB12
-#define SPI_FLASH_MOSI_PIN                  PB15
-#define SPI_FLASH_MISO_PIN                  PB14
-#define SPI_FLASH_SCK_PIN                   PB13
+#define W25QXX_CS_PIN                       PB12
+#define W25QXX_MOSI_PIN                     PB15
+#define W25QXX_MISO_PIN                     PB14
+#define W25QXX_SCK_PIN                      PB13
 
 //
 // TFT with FSMC interface
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index c60d4dc..6b3c4ed 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -88,37 +88,37 @@
 //
 // Steppers
 //
+#define X_ENABLE_PIN                        PC3
 #ifndef X_STEP_PIN
   #define X_STEP_PIN                        PC2
 #endif
 #ifndef X_DIR_PIN
   #define X_DIR_PIN                         PB9
 #endif
-#define X_ENABLE_PIN                        PC3   // Shared
 
+#define Y_ENABLE_PIN                        PC3
 #ifndef Y_STEP_PIN
   #define Y_STEP_PIN                        PB8
 #endif
 #ifndef Y_DIR_PIN
   #define Y_DIR_PIN                         PB7
 #endif
-#define Y_ENABLE_PIN                X_ENABLE_PIN
 
+#define Z_ENABLE_PIN                        PC3
 #ifndef Z_STEP_PIN
   #define Z_STEP_PIN                        PB6
 #endif
 #ifndef Z_DIR_PIN
   #define Z_DIR_PIN                         PB5
 #endif
-#define Z_ENABLE_PIN                X_ENABLE_PIN
 
+#define E0_ENABLE_PIN                       PC3
 #ifndef E0_STEP_PIN
   #define E0_STEP_PIN                       PB4
 #endif
 #ifndef E0_DIR_PIN
   #define E0_DIR_PIN                        PB3
 #endif
-#define E0_ENABLE_PIN               X_ENABLE_PIN
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
@@ -154,39 +154,37 @@
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
-#if ENABLED(CR10_STOCKDISPLAY)
+#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
+  #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
+#endif
 
-  #if ENABLED(RET6_12864_LCD)
+#if ENABLED(RET6_12864_LCD)
 
-    // RET6 12864 LCD
-    #define LCD_PINS_RS                     PB12
-    #define LCD_PINS_ENABLE                 PB15
-    #define LCD_PINS_D4                     PB13
+  // RET6 12864 LCD
+  #define LCD_PINS_RS                       PB12
+  #define LCD_PINS_ENABLE                   PB15
+  #define LCD_PINS_D4                       PB13
 
-    #define BTN_ENC                         PB2
-    #define BTN_EN1                         PB10
-    #define BTN_EN2                         PB14
+  #define BTN_ENC                           PB2
+  #define BTN_EN1                           PB10
+  #define BTN_EN2                           PB14
 
-    #ifndef HAS_PIN_27_BOARD
-      #define BEEPER_PIN                    PC6
-    #endif
-
-  #elif ENABLED(VET6_12864_LCD)
-
-    // VET6 12864 LCD
-    #define LCD_PINS_RS                     PA4
-    #define LCD_PINS_ENABLE                 PA7
-    #define LCD_PINS_D4                     PA5
-
-    #define BTN_ENC                         PC5
-    #define BTN_EN1                         PB10
-    #define BTN_EN2                         PA6
-
-  #else
-    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
+  #ifndef HAS_PIN_27_BOARD
+    #define BEEPER_PIN                      PC6
   #endif
 
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#elif ENABLED(VET6_12864_LCD)
+
+  // VET6 12864 LCD
+  #define LCD_PINS_RS                       PA4
+  #define LCD_PINS_ENABLE                   PA7
+  #define LCD_PINS_D4                       PA5
+
+  #define BTN_ENC                           PC5
+  #define BTN_EN1                           PB10
+  #define BTN_EN2                           PA6
+
+#elif ENABLED(DWIN_CREALITY_LCD)
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
@@ -196,6 +194,7 @@
   //#define LCD_LED_PIN                     PB2
   #ifndef BEEPER_PIN
     #define BEEPER_PIN                      PB13
+    #undef SPEAKER
   #endif
 
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 52ebdec..d106c98 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -61,13 +61,13 @@
   // SPI
   //#define SPI_EEPROM                            // EEPROM on SPI-0
   //#define SPI_CHAN_EEPROM1  ?
-  //#define SPI_EEPROM1_CS_PIN    ?
+  //#define SPI_EEPROM1_CS    ?
 
   // 2K EEPROM
-  //#define SPI_EEPROM2_CS_PIN    ?
+  //#define SPI_EEPROM2_CS    ?
 
   // 32Mb FLASH
-  //#define SPI_FLASH_CS_PIN  ?
+  //#define SPI_FLASH_CS      ?
 #endif
 
 //
@@ -156,67 +156,35 @@
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
-#if ENABLED(CR10_STOCKDISPLAY)
+#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
+  #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
+#endif
 
-  #if ENABLED(RET6_12864_LCD)
+#if ENABLED(RET6_12864_LCD)
 
-    /**
-     *    RET6 12864 LCD
-     *        ------
-     *  PC6  |10  9 | PB2
-     *  PB10 | 8  7 | PE8
-     *  PB14   6  5 | PB13
-     *  PB12 | 4  3 | PB15
-     *  GND  | 2  1 | 5V
-     *        ------
-     *         EXP1
-     */
-    #define EXP1_03_PIN                     PB15
-    #define EXP1_04_PIN                     PB12
-    #define EXP1_05_PIN                     PB13
-    #define EXP1_06_PIN                     PB14
-    #define EXP1_07_PIN                     PE8
-    #define EXP1_08_PIN                     PB10
-    #define EXP1_09_PIN                     PB2
-    #define EXP1_10_PIN                     PC6
+  // RET6 12864 LCD
+  #define LCD_PINS_RS                       PB12
+  #define LCD_PINS_ENABLE                   PB15
+  #define LCD_PINS_D4                       PB13
 
-    #define BEEPER_PIN               EXP1_10_PIN
+  #define BTN_ENC                           PB2
+  #define BTN_EN1                           PB10
+  #define BTN_EN2                           PB14
 
-  #elif ENABLED(VET6_12864_LCD)
+  #define BEEPER_PIN                        PC6
 
-    /**
-     *    VET6 12864 LCD
-     *        ------
-     *  ?    |10  9 | PC5
-     *  PB10 | 8  7 | ?
-     *  PA6    6  5 | PA5
-     *  PA4  | 4  3 | PA7
-     *  GND  | 2  1 | 5V
-     *        ------
-     *         EXP1
-     */
-    #define EXP1_03_PIN                     PA7
-    #define EXP1_04_PIN                     PA4
-    #define EXP1_05_PIN                     PA5
-    #define EXP1_06_PIN                     PA6
-    #define EXP1_07_PIN                     -1
-    #define EXP1_08_PIN                     PB10
-    #define EXP1_09_PIN                     PC5
-    #define EXP1_10_PIN                     -1
+#elif ENABLED(VET6_12864_LCD)
 
-  #else
-    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
-  #endif
+  // VET6 12864 LCD
+  #define LCD_PINS_RS                       PA4
+  #define LCD_PINS_ENABLE                   PA7
+  #define LCD_PINS_D4                       PA5
 
-  #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
+  #define BTN_ENC                           PC5
+  #define BTN_EN1                           PB10
+  #define BTN_EN2                           PA6
 
-  #define BTN_ENC                    EXP1_09_PIN
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#elif ENABLED(DWIN_CREALITY_LCD)
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
@@ -226,6 +194,7 @@
   //#define LCD_LED_PIN                     PB2
   #ifndef BEEPER_PIN
     #define BEEPER_PIN                      PB13
+    #undef SPEAKER
   #endif
 
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
index 2f1f2ff..e8ae84d 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
@@ -31,21 +31,10 @@
 //
 // Steppers
 //
-#if MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B)
+#define X_STEP_PIN                        PB8
+#define X_DIR_PIN                         PB7
 
-  #define X_STEP_PIN                        PB8
-  #define X_DIR_PIN                         PB7
-
-  #define Y_STEP_PIN                        PC2
-  #define Y_DIR_PIN                         PB9
-
-#endif
-
-#if MB(CREALITY_V431_B, CREALITY_V431_C)
-
-  #define E0_STEP_PIN                       PB3
-  #define E0_DIR_PIN                        PB4
-
-#endif
+#define Y_STEP_PIN                        PC2
+#define Y_DIR_PIN                         PB9
 
 #include "pins_CREALITY_V4.h"
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 6717455..2dea59e 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -73,10 +73,10 @@
 
 #if HAS_SPI_FLASH
   // SPI 2
-  #define SPI_FLASH_CS_PIN                  PB12  // SPI2_NSS / Flash chip-select
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
+  #define W25QXX_CS_PIN                     PB12  // SPI2_NSS / Flash chip-select
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif
 
 //
@@ -124,11 +124,11 @@
   // SoftwareSerial with one pin per driver
   // Compatible with TMC2208 and TMC2209 drivers
   #define X_SERIAL_TX_PIN                   PA10  // RXD1
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PA10  // RXD1
   #define Y_SERIAL_TX_PIN                   PA9   // TXD1
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PA9   // TXD1
   #define Z_SERIAL_TX_PIN                   PC7   // IO1
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PC7   // IO1
   #define TMC_BAUD_RATE                    19200
 #else
   // Motor current PWM pins
@@ -222,11 +222,9 @@
   //#define PS_ON_PIN                       PA3   // PW_CN /PW_OFF
 #endif
 
-#if HAS_TFT_LVGL_UI
-  #define MT_DET_1_PIN                      PA4   // MT_DET
-  #define MT_DET_2_PIN                      PE6
-  #define MT_DET_PIN_STATE                  LOW
-#endif
+#define MT_DET_1_PIN                        PA4   // MT_DET
+#define MT_DET_2_PIN                        PE6   // FALA_CRTL
+#define MT_DET_PIN_INVERTING               false
 
 //
 // LED / NEOPixel
@@ -294,14 +292,13 @@
   #define TFT_BACKLIGHT_PIN                 PD13
 
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
 
-  #define FSMC_CS_PIN                       PD7   // NE4
-  #define FSMC_RS_PIN                       PD11  // A0
-
-  #define TFT_CS_PIN                 FSMC_CS_PIN
-  #define TFT_RS_PIN                 FSMC_RS_PIN
+  #define TFT_CS_PIN                  TFT_CS_PIN
+  #define TFT_RS_PIN                  TFT_RS_PIN
 
   #ifdef TFT_CLASSIC_UI
     #define TFT_MARLINBG_COLOR            0x3186  // Grey
@@ -310,14 +307,11 @@
     #define TFT_BTOKMENU_COLOR            0x145F  // Cyan
   #endif
   #define TFT_BUFFER_SIZE                  14400
-
 #elif HAS_GRAPHICAL_TFT
-
   #define TFT_RESET_PIN                     PC6
   #define TFT_BACKLIGHT_PIN                 PD13
   #define TFT_CS_PIN                        PD7   // NE4
   #define TFT_RS_PIN                        PD11  // A0
-
 #endif
 
 #if NEED_TOUCH_PINS
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 3f02d70..be0a622 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -83,25 +83,28 @@
 
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI              EXP2_05_PIN
+    #define TMC_SW_MOSI                     PB15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO              EXP2_10_PIN
+    #define TMC_SW_MISO                     PB14
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK               EXP2_09_PIN
+    #define TMC_SW_SCK                      PB13
   #endif
 #endif
 
 #if HAS_TMC_UART
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PB0
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PB0
   #define Y_SERIAL_TX_PIN                   PA7
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PA7
   #define Z_SERIAL_TX_PIN                   PA4
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PA4
   #define E0_SERIAL_TX_PIN                  PC2
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PC2
 #endif
 
 //
@@ -120,69 +123,52 @@
 #define TEMP_BED_PIN                        PC0   // Analog Input
 #define TEMP_0_PIN                          PC1   // Analog Input
 
-/**               ------                                        ------
- * (BEEPER) PC14 |10  9 | PC13 (BTN_ENC)      (MISO)      PB14 |10  9 | PB13 (SD_SCK)
- * (LCD_EN) PB9  | 8  7 | PB8  (LCD_RS)       (BTN_EN1)   PB3  | 8  7 | PB12 (SD_CS2)
- * (LCD_D4) PB7  | 6  5   PB6  (LCD_D5)       (BTN_EN2)   PD2  | 6  5   PB15 (SD_MOSI)
- * (LCD_D6) PB5  | 4  3 | PB4  (LCD_D7)       (SD_DETECT) PB11 | 4  3 | RESET
- *          GND  | 2  1 | 5V                              GND  | 2  1 | NC
- *                ------                                        ------
- *                 EXP1                                          EXP2
- */
-#define EXP1_03_PIN                        PB4
-#define EXP1_04_PIN                        PB5
-#define EXP1_05_PIN                        PB6
-#define EXP1_06_PIN                        PB7
-#define EXP1_07_PIN                        PB8
-#define EXP1_08_PIN                        PB9
-#define EXP1_09_PIN                        PC13
-#define EXP1_10_PIN                        PC14
-
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        PB11
-#define EXP2_05_PIN                        PB15
-#define EXP2_06_PIN                        PD2
-#define EXP2_07_PIN                        PB12
-#define EXP2_08_PIN                        PB3
-#define EXP2_09_PIN                        PB13
-#define EXP2_10_PIN                        PB14
+//
+// LCD Pins
+//
 
 //
 // LCD / Controller
 //
-#if HAS_WIRED_LCD
+#define SPI_DEVICE                             2
+#define SD_SS_PIN                           PB12
+#define SD_SCK_PIN                          PB13
+#define SD_MISO_PIN                         PB14
+#define SD_MOSI_PIN                         PB15
 
-  #define SPI_DEVICE                           2
-  #define SD_SS_PIN                  EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
+#define SDSS                           SD_SS_PIN
+#define SD_DETECT_PIN                       PB11
 
-  #define SDSS                         SD_SS_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+#define BEEPER_PIN                          PC14
 
-  #define BEEPER_PIN                 EXP1_10_PIN
+#define LCD_PINS_RS                         PB8
+#define LCD_PINS_ENABLE                     PB9
+#define LCD_PINS_D4                         PB7
+#define LCD_PINS_D5                         PB6
+#define LCD_PINS_D6                         PB5
+#define LCD_PINS_D7                         PB4
 
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
-  #define LCD_PINS_D5                EXP1_05_PIN
-  #define LCD_PINS_D6                EXP1_04_PIN
-  #define LCD_PINS_D7                EXP1_03_PIN
+#define BTN_EN1                             PD2
+#define BTN_EN2                             PB3
+#define BTN_ENC                             PC13
 
-  #define BTN_EN1                    EXP2_06_PIN
-  #define BTN_EN2                    EXP2_08_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+  #define BTN_ENC_EN                 LCD_PINS_D7  // Detect the presence of the encoder
+#endif
 
-  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
-  #endif
+//
+// Filament runout
+//
 
-  // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             715
-  #endif
-
-#endif // HAS_WIRED_LCD
+//
+// ST7920 Delays
+//
+#ifndef ST7920_DELAY_1
+  #define ST7920_DELAY_1            DELAY_NS(96)
+#endif
+#ifndef ST7920_DELAY_2
+  #define ST7920_DELAY_2            DELAY_NS(48)
+#endif
+#ifndef ST7920_DELAY_3
+  #define ST7920_DELAY_3           DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 0c2f2fc..552ad9a 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -130,39 +130,29 @@
   #define RGB_LED_B_PIN                     PB6
 #endif
 
-/**
- * EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
- *                 ------
- * (BEEPER)  PC9  |10  9 | PC12 (BTN_ENC)
- * (BTN_EN2) PC11 | 8  7 | PB14 (LCD_RS / MISO)
- * (BTN_EN1) PC10   6  5 | PB13 (SCK)
- * (LCD_EN)  PB12 | 4  3 | PB15 (MOSI)
- *            GND | 2  1 | 5V
- *                 ------
- *                  EXP1
- *
- * Notes:
- *  - The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
- *  - Functionally the pins are assigned in the same order as on the Ender-3 board.
- *  - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
- */
-#define EXP1_03_PIN                         PB15
-#define EXP1_04_PIN                         PB12
-#define EXP1_05_PIN                         PB13
-#define EXP1_06_PIN                         PC10
-#define EXP1_07_PIN                         PB14
-#define EXP1_08_PIN                         PC11
-#define EXP1_09_PIN                         PC12
-#define EXP1_10_PIN                         PC9
+/*
+* EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
+*                 _____
+*  (Beeper) PC9  | 1 2 | PC12 (BTN_ENC)
+* (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
+* (BTN_EN1) PC10   5 6 | PB13 (SCK)
+*  (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
+*            GND | 9 10| 5V
+*                 -----
+*                 EXP1
+* Note: The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
+* Note: Functionally the pins are assigned in the same order as on the Ender-3 board.
+* Note: Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
+*/
 
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                        PC9
 
   #if HAS_MARLINUI_U8GLIB
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define DOGLCD_CS                EXP1_04_PIN
-    #define DOGLCD_SCK               EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP1_03_PIN
+    #define DOGLCD_A0                       PB14
+    #define DOGLCD_CS                       PB12
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
     //#define LCD_SCREEN_ROT_90
     //#define LCD_SCREEN_ROT_180
     //#define LCD_SCREEN_ROT_270
@@ -172,30 +162,30 @@
     #endif
   #endif
 
-  #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
-  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
-  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
+  #define LCD_PINS_RS                       PB12  // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                       PB13  // SCLK
+  #define LCD_PINS_ENABLE                   PB15  // DATA MOSI
 
   //#define LCD_CONTRAST_INIT                190
 
   #if IS_NEWPANEL
-    #define BTN_EN1                  EXP1_06_PIN
-    #define BTN_EN2                  EXP1_08_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                         PC10
+    #define BTN_EN2                         PC11
+    #define BTN_ENC                         PC12
   #endif
 #endif
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define CLCD_MOD_RESET             EXP1_08_PIN
-  #define CLCD_SPI_CS                EXP1_04_PIN
+  #define BEEPER_PIN                        PC9
+  #define CLCD_MOD_RESET                    PC11
+  #define CLCD_SPI_CS                       PB12
 
   //#define CLCD_USE_SOFT_SPI                     // the Cheetah can use hardware-SPI so we do not really need this
 
   #if ENABLED(CLCD_USE_SOFT_SPI)
-    #define CLCD_SOFT_SPI_MOSI       EXP1_03_PIN
-    #define CLCD_SOFT_SPI_MISO       EXP1_07_PIN
-    #define CLCD_SOFT_SPI_SCLK       EXP1_05_PIN
+    #define CLCD_SOFT_SPI_MOSI              PB15
+    #define CLCD_SOFT_SPI_MISO              PB14
+    #define CLCD_SOFT_SPI_SCLK              PB13
   #else
     #define CLCD_SPI_BUS                       2
   #endif
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
index 120d6d6..ba35265 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
@@ -42,6 +42,9 @@
    * TMC2208/TMC2209 stepper drivers
    */
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PA11
   #define X_SERIAL_RX_PIN                   PA12
 
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index b3da8d8..4edd67a 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -157,11 +157,16 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             715
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index 3650ffd..f346c3a 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -165,11 +165,16 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             715
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index 56dda2b..2545642 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -162,11 +162,16 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             715
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index c9a20fd..865de80 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -167,11 +167,16 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             715
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index b25badc..f9ec42b 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -173,18 +170,18 @@
 #if ENABLED(SPI_EEPROM)
   // SPI1 EEPROM Winbond W25Q64 (8MB/64Mbits)
   #define SPI_CHAN_EEPROM1                     1
-  #define SPI_EEPROM1_CS_PIN                PC5   // pin 34
-  #define EEPROM_SCK_PIN      BOARD_SPI1_SCK_PIN  // PA5 pin 30
-  #define EEPROM_MISO_PIN    BOARD_SPI1_MISO_PIN  // PA6 pin 31
-  #define EEPROM_MOSI_PIN    BOARD_SPI1_MOSI_PIN  // PA7 pin 32
+  #define SPI_EEPROM1_CS                    PC5   // pin 34
+  #define EEPROM_SCK          BOARD_SPI1_SCK_PIN  // PA5 pin 30
+  #define EEPROM_MISO        BOARD_SPI1_MISO_PIN  // PA6 pin 31
+  #define EEPROM_MOSI        BOARD_SPI1_MOSI_PIN  // PA7 pin 32
   #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
   #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
 #elif HAS_SPI_FLASH
   #define SPI_FLASH_SIZE                0x40000U  // limit to 256KB (M993 will reboot with 512)
-  #define SPI_FLASH_CS_PIN                  PC5
-  #define SPI_FLASH_MOSI_PIN                PA7
-  #define SPI_FLASH_MISO_PIN                PA6
-  #define SPI_FLASH_SCK_PIN                 PA5
+  #define W25QXX_CS_PIN                     PC5
+  #define W25QXX_MOSI_PIN                   PA7
+  #define W25QXX_MISO_PIN                   PA6
+  #define W25QXX_SCK_PIN                    PA5
 #elif ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
   #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 29baeba..4d798ff 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -258,12 +258,12 @@
   //#define TMC_SOFTWARE_SERIAL
   #if ENABLED(TMC_SOFTWARE_SERIAL)
     #define X_SERIAL_TX_PIN                 PF8   // SERVO3_PIN -- XS2 - 6
-    #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
     #define Y_SERIAL_TX_PIN                 PF9   // SERVO2_PIN -- XS2 - 5
-    #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                 PA1   // SERVO1_PIN -- XS1 - 6
-    #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
     #define E0_SERIAL_TX_PIN                PC3   // SERVO0_PIN -- XS1 - 5
+    #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
+    #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
+    #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
     #define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
     #define TMC_BAUD_RATE                  19200
   #endif
@@ -275,8 +275,8 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE                0x800000  // 8MB
-  #define SPI_FLASH_CS_PIN                  PG9
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
+  #define W25QXX_CS_PIN                     PG9
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index c5080b5..2fc99f2 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -145,6 +145,10 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
+
   #define X_SERIAL_TX_PIN                   PD5
   #define X_SERIAL_RX_PIN                   PD5
 
@@ -179,19 +183,19 @@
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
-  #if ENABLED(MKS_PWC)
-    #define SUICIDE_PIN                     PB2
-    #define SUICIDE_PIN_STATE               LOW
-    #define KILL_PIN                        PA2
+  #if ENABLED(PSU_CONTROL)                        // MKSPWC
+    #define SUICIDE_PIN                     PB2   // PW_OFF
+    #define SUICIDE_PIN_INVERTING          false
+    #define KILL_PIN                        PA2   // PW_DET
     #define KILL_PIN_STATE                  HIGH
   #endif
 
-  #define MT_DET_1_PIN                      PA4
-  #define MT_DET_PIN_STATE                  LOW
+  #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
+  #define MT_DET_PIN_INVERTING             false  // LVGL UI filament RUNOUT PIN STATE
 
-  #define WIFI_IO0_PIN                      PC13
-  #define WIFI_IO1_PIN                      PC7
-  #define WIFI_RESET_PIN                    PE9
+  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
 
   #if ENABLED(MKS_TEST)
     #define MKS_TEST_POWER_LOSS_PIN         PA2   // PW_DET
@@ -326,7 +330,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-    //#define LCD_SCREEN_ROT_180
+	//#define LCD_SCREEN_ROT_180
 
   #else                                           // !MKS_MINI_12864
 
@@ -342,9 +346,15 @@
 
     #endif
 
-    #define BOARD_ST7920_DELAY_1             125
-    #define BOARD_ST7920_DELAY_2             125
-    #define BOARD_ST7920_DELAY_3             125
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+    #endif
 
   #endif // !MKS_MINI_12864
 
@@ -353,10 +363,10 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define SPI_FLASH_CS_PIN                  PB12
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
+  #define W25QXX_CS_PIN                     PB12
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif
 
 #ifndef BEEPER_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 489da08..da7ba05 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -92,6 +92,9 @@
   //#define Z_HARDWARE_SERIAL  MSerial1
   //#define E0_HARDWARE_SERIAL MSerial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PC7
   #define X_SERIAL_RX_PIN                   PC7
 
@@ -126,89 +129,65 @@
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #define PS_ON_PIN                         PA14  // PW_OFF
-  #define KILL_PIN                          PB10  // PW_DET
-  #define KILL_PIN_STATE                    HIGH
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PA14  // PW_OFF
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PB10  // PW_DET
+    #define KILL_PIN_STATE                  HIGH
+  #endif
 #endif
 
 /**
- *                ------                                    ------                                  ------
- *  (BEEPER) PC1 |10  9 | PC3 (BTN_ENC)        (MISO) PB14 |10  9 | PB13 (SD_SCK)    (BEEPER) PC1  |10  9 | PC3 (BTN_ENC)
- *  (LCD_EN) PA4 | 8  7 | PA5 (LCD_RS)      (BTN_EN1) PB11 | 8  7 | PA15 (SD_SS)    (BTN_EN1) PB11 | 8  7 | RESET
- *  (LCD_D4) PA6   6  5 | PA7 (LCD_D5)      (BTN_EN2)  PB0   6  5 | PB15 (SD_MOSI)  (BTN_EN2) PB0    6  5 | PA6  (LCD_D4)
- *  (LCD_D6) PC4 | 4  3 | PC5 (LCD_D7)    (SD_DETECT) PC10 | 4  3 | RESET            (LCD_RS) PA5  | 4  3 | PA4  (LCD_EN)
- *           GND | 2  1 | 5V                           GND | 2  1 | NC                        GND  | 2  1 | 5V
- *                ------                                    ------                                  ------
- *                 EXP1                                      EXP2                                "Ender-3 EXP1"
+ *                _____                                      _____                                     _____
+ *  (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)          (MISO) PB14 | 1 2 | PB13 (SD_SCK)                  5V | 1 2 | GND
+ *  (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)        (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS)         (LCD_EN) PA4 | 3 4 | PA5  (LCD_RS)
+ *  (LCD_D4) PA6 | 5 6   PA7 (LCD_D5)        (BTN_EN2)  PB0 | 5 6   PB15 (SD_MOSI)       (LCD_D4) PA6 | 5 6   PB0  (BTN_EN2)
+ *  (LCD_D6) PC4 | 7 8 | PC5 (LCD_D7)      (SD_DETECT) PC10 | 7 8 | RESET                       RESET | 7 8 | PB11 (BTN_EN1)
+ *           GND | 9 10| 5V                             GND | 9 10| NC                  (BTN_ENC) PC3 | 9 10| PC1  (BEEPER)
+ *                -----                                      -----                                     -----
+ *                EXP1                                       EXP2                                      EXP3
  */
-#define EXP1_03_PIN                         PC5
-#define EXP1_04_PIN                         PC4
-#define EXP1_05_PIN                         PA7
-#define EXP1_06_PIN                         PA6
-#define EXP1_07_PIN                         PA5
-#define EXP1_08_PIN                         PA4
-#define EXP1_09_PIN                         PC3
-#define EXP1_10_PIN                         PC1
-
-#define EXP2_03_PIN                         -1   // RESET
-#define EXP2_04_PIN                         PC10
-#define EXP2_05_PIN                         PB15
-#define EXP2_06_PIN                         PB0
-#define EXP2_07_PIN                         PA15
-#define EXP2_08_PIN                         PB11
-#define EXP2_09_PIN                         PB13
-#define EXP2_10_PIN                         PB14
-
-// "Ender-3 EXP1"
-#define E3_EXP1_03_PIN                      PA4
-#define E3_EXP1_04_PIN                      PA5
-#define E3_EXP1_05_PIN                      PA6
-#define E3_EXP1_06_PIN                      PB0
-#define E3_EXP1_07_PIN                      -1   // RESET
-#define E3_EXP1_08_PIN                      PB11
-#define E3_EXP1_09_PIN                      PC3
-#define E3_EXP1_10_PIN                      PC1
-
 #if HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define BEEPER_PIN                        PC1
+  #define BTN_ENC                           PC3
+  #define LCD_PINS_ENABLE                   PA4
+  #define LCD_PINS_RS                       PA5
+  #define BTN_EN1                           PB11
+  #define BTN_EN2                           PB0
 
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
   #if ENABLED(MKS_MINI_12864)
 
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN                   -1
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_A0                       PC4
+    #define DOGLCD_CS                       PA7
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
 
   #elif ENABLED(MKS_MINI_12864_V3)
-    #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                       PA4
+    #define DOGLCD_A0                       PA5
     #define LCD_PINS_DC                DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
+    #define LCD_RESET_PIN                   PA6
+    #define NEOPIXEL_PIN                    PA7
+    #define DOGLCD_MOSI                     PB15
+    #define DOGLCD_SCK                      PB13
     #define FORCE_SOFT_SPI
     #define SOFTWARE_SPI
-    //#define LCD_SCREEN_ROT_180
+	//#define LCD_SCREEN_ROT_180
 
   #else
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4                     PA6
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5                   PA7
+      #define LCD_PINS_D6                   PC4
+      #define LCD_PINS_D7                   PC5
 
       #if !defined(BTN_ENC_EN) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -220,33 +199,30 @@
 
 #endif // HAS_WIRED_LCD
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1             125
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2             125
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3             125
-  #endif
-#endif
-
 //
 // SD Card
 //
-#define SDCARD_CONNECTION                ONBOARD
 #define SPI_DEVICE                             2
 #define ONBOARD_SPI_DEVICE                     2
 #define SDSS                           SD_SS_PIN
+#define SDCARD_CONNECTION                ONBOARD
+#define SD_DETECT_PIN                       PC10
 #define ONBOARD_SD_CS_PIN              SD_SS_PIN
-#define SD_DETECT_PIN                       PC10  // EXP2_04_PIN
 #define NO_SD_HOST_DRIVE
 
 // TODO: This is the only way to set SPI for SD on STM32 (for now)
 #define ENABLE_SPI2
-#define SD_SCK_PIN                   EXP2_09_PIN
-#define SD_MISO_PIN                  EXP2_10_PIN
-#define SD_MOSI_PIN                  EXP2_05_PIN
-#define SD_SS_PIN                    EXP2_07_PIN
+#define SD_SCK_PIN                          PB13
+#define SD_MISO_PIN                         PB14
+#define SD_MOSI_PIN                         PB15
+#define SD_SS_PIN                           PA15
+
+#ifndef BOARD_ST7920_DELAY_1
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+#endif
+#ifndef BOARD_ST7920_DELAY_2
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
+#endif
+#ifndef BOARD_ST7920_DELAY_3
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 6388e17..73c77d0 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -112,11 +112,16 @@
 
   #endif // !MKS_MINI_12864
 
-  // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1             125
-    #define BOARD_ST7920_DELAY_2             125
-    #define BOARD_ST7920_DELAY_3             125
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
index 416a061..73fefdd 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -138,9 +138,9 @@
 
   #endif // !MKS_MINI_12864
 
-  #define BOARD_ST7920_DELAY_1               125
-  #define BOARD_ST7920_DELAY_2               125
-  #define BOARD_ST7920_DELAY_3               125
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 
 #endif // HAS_WIRED_LCD
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index ae45d8b..d4a2f59 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -119,10 +119,8 @@
 #define POWER_LOSS_PIN                      PA2   // PW_DET
 #define PS_ON_PIN                           PA3   // PW_OFF
 
-#if HAS_TFT_LVGL_UI
-  #define MT_DET_1_PIN                      PA4   // MT_DET
-  #define MT_DET_PIN_STATE                  LOW
-#endif
+#define MT_DET_1_PIN                        PA4
+#define MT_DET_PIN_INVERTING               false
 
 #define WIFI_IO0_PIN                        PC13
 
@@ -196,8 +194,8 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define SPI_FLASH_CS_PIN                  PB12  // Flash chip-select
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
+  #define W25QXX_CS_PIN                     PB12  // Flash chip-select
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index c729274..2a5c9f7 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -26,22 +26,203 @@
  * https://github.com/makerbase-mks/MKS-Robin-Nano-V1.X/tree/master/hardware
  */
 
-#define ALLOW_STM32DUINO
-#include "env_validate.h"
+#if NOT_TARGET(STM32F1, STM32F1xx)
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
 
 #define BOARD_INFO_NAME "MKS Robin Nano"
 
+#define BOARD_NO_NATIVE_USB
+
+// Avoid conflict with TIMER_SERVO when using the STM32 HAL
+#define TEMP_TIMER                             5
+
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
 //
 #define DISABLE_JTAG
 
+//
+// EEPROM
+//
+#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  #define EEPROM_PAGE_SIZE     (0x800U) // 2KB
+  #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+#endif
+
+#define SPI_DEVICE                             2
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA15
+#define Y_STOP_PIN                          PA12
+#define Z_MIN_PIN                           PA11
+#define Z_MAX_PIN                           PC4
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
+
+#define Y_ENABLE_PIN                        PE1
+#define Y_STEP_PIN                          PE0
+#define Y_DIR_PIN                           PB9
+
+#define Z_ENABLE_PIN                        PB8
+#define Z_STEP_PIN                          PB5
+#define Z_DIR_PIN                           PB4
+
+#define E0_ENABLE_PIN                       PB3
+#define E0_STEP_PIN                         PD6
+#define E0_DIR_PIN                          PD3
+
+#define E1_ENABLE_PIN                       PA3
+#define E1_STEP_PIN                         PA6
+#define E1_DIR_PIN                          PA1
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_BED_PIN                        PC0   // TB1
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+  #define HEATER_0_PIN                      PC3
+#endif
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
+  #ifndef FAN1_PIN
+    #define FAN1_PIN                        PB0
+  #endif
+#else
+  #ifndef HEATER_1_PIN
+    #define HEATER_1_PIN                    PB0
+  #endif
+#endif
+#ifndef FAN_PIN
+  #define FAN_PIN                           PB1   // FAN
+#endif
+#ifndef HEATER_BED_PIN
+  #define HEATER_BED_PIN                    PA0
+#endif
+
 //
 // Thermocouples
 //
 //#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
 //#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+  #endif
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PB2   // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA2
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PB2
+  #define SUICIDE_PIN_INVERTING            false
+#endif
+
+//
+// Misc. Functions
+//
+#if HAS_TFT_LVGL_UI
+  #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
+  #define MT_DET_2_PIN                      PE6   // LVGL UI FILAMENT RUNOUT2 PIN
+  #define MT_DET_PIN_INVERTING             false  // LVGL UI filament RUNOUT PIN STATE
+
+  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN                    PA5   // MKS ESP WIFI RESET PIN
+#else
+  //#define POWER_LOSS_PIN                  PA2   // PW_DET
+  //#define PS_ON_PIN                       PB2   // PW_OFF
+  #define FIL_RUNOUT_PIN                    PA4
+  #define FIL_RUNOUT2_PIN                   PE6
+#endif
+
 //#define LED_PIN                           PB2
 
-#include "pins_MKS_ROBIN_NANO_common.h"
+//
+// SD Card
+//
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#define SDIO_SUPPORT
+#define SDIO_CLOCK                       4500000  // 4.5 MHz
+#define SD_DETECT_PIN                       PD12
+#define ONBOARD_SD_CS_PIN                   PC11
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN                          PC5
+
+//
+// TFT with FSMC interface
+//
+#if HAS_FSMC_TFT
+  /**
+   * Note: MKS Robin TFT screens use various TFT controllers.
+   * If the screen stays white, disable 'TFT_RESET_PIN'
+   * to let the bootloader init the screen.
+   */
+  #define TFT_RESET_PIN                     PC6   // FSMC_RST
+  #define TFT_BACKLIGHT_PIN                 PD13
+
+  #define DOGLCD_MOSI                       -1    // Prevent auto-define by Conditionals_post.h
+  #define DOGLCD_SCK                        -1
+
+  #define TOUCH_CS_PIN                      PA7   // SPI2_NSS
+  #define TOUCH_SCK_PIN                     PB13  // SPI2_SCK
+  #define TOUCH_MISO_PIN                    PB14  // SPI2_MISO
+  #define TOUCH_MOSI_PIN                    PB15  // SPI2_MOSI
+
+  #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PD7
+  #define FSMC_RS_PIN                       PD11
+  #define FSMC_DMA_DEV                      DMA2
+  #define FSMC_DMA_CHANNEL               DMA_CH5
+
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          2
+
+  #define TFT_BUFFER_SIZE                  14400
+#endif
+
+#define HAS_SPI_FLASH                          1
+#if HAS_SPI_FLASH
+  #define SPI_FLASH_SIZE               0x1000000  // 16MB
+  #define W25QXX_CS_PIN                     PB12
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index d193433..31ce016 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -146,6 +146,10 @@
   //#define E0_HARDWARE_SERIAL MSerial1
   //#define E1_HARDWARE_SERIAL MSerial1
 
+  //
+  // Software serial
+  //
+
   #define X_SERIAL_TX_PIN                   PD5
   #define X_SERIAL_RX_PIN                   PD5
 
@@ -190,30 +194,34 @@
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
-    #undef MKS_PWC
-    #define SUICIDE_PIN                     PB2
-    #define SUICIDE_PIN_STATE               LOW
-  #else
-    #define PS_ON_PIN                       PB2   // PW_OFF
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
   #endif
-  #define KILL_PIN                          PA2
-  #define KILL_PIN_STATE                    HIGH
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PB2   // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA2
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PB2
+  #define SUICIDE_PIN_INVERTING            false
 #endif
 
 //
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
-  #define MT_DET_1_PIN                      PA4
-  #define MT_DET_2_PIN                      PE6
-  #define MT_DET_PIN_STATE                  LOW
 
-  #define WIFI_IO0_PIN                      PC13
-  #define WIFI_IO1_PIN                      PC7
-  #define WIFI_RESET_PIN                    PE9
+  #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
+  #define MT_DET_2_PIN                      PE6   // LVGL UI FILAMENT RUNOUT2 PIN
+  #define MT_DET_PIN_INVERTING             false  // LVGL UI filament RUNOUT PIN STATE
+
+  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
 
   #if ENABLED(MKS_TEST)
     #define MKS_TEST_POWER_LOSS_PIN         PA2   // PW_DET
@@ -349,7 +357,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-    //#define LCD_SCREEN_ROT_180
+	//#define LCD_SCREEN_ROT_180
 
   #else                                           // !MKS_MINI_12864
 
@@ -365,10 +373,14 @@
 
     #endif
 
-    #if ENABLED(U8GLIB_ST7920)
-      #define BOARD_ST7920_DELAY_1           125
-      #define BOARD_ST7920_DELAY_2           125
-      #define BOARD_ST7920_DELAY_3           125
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
     #endif
 
   #endif // !MKS_MINI_12864
@@ -378,10 +390,10 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define SPI_FLASH_CS_PIN                  PB12
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
+  #define W25QXX_CS_PIN                     PB12
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif
 
 #ifndef BEEPER_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index fdee796..2f62563 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -133,6 +133,9 @@
   //#define E1_HARDWARE_SERIAL MSerial1
   //#define E2_HARDWARE_SERIAL MSerial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PF7
   #define X_SERIAL_RX_PIN                   PF8
 
@@ -183,17 +186,20 @@
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
-    #undef MKS_PWC
-    #define SUICIDE_PIN                     PG11
-    #define SUICIDE_PIN_STATE               LOW
-  #else
-    #define PS_ON_PIN                       PG11  // PW_OFF
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
   #endif
-  #define KILL_PIN                          PA2
-  #define KILL_PIN_STATE                    HIGH
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PG11  // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA2
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PG11
+  #define SUICIDE_PIN_INVERTING            false
 #endif
 
 //
@@ -299,18 +305,21 @@
 
 #endif
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1               125
-  #define BOARD_ST7920_DELAY_2               125
-  #define BOARD_ST7920_DELAY_3               125
+#ifndef BOARD_ST7920_DELAY_1
+  #define BOARD_ST7920_DELAY_1              DELAY_NS(125)
+#endif
+#ifndef BOARD_ST7920_DELAY_2
+  #define BOARD_ST7920_DELAY_2              DELAY_NS(125)
+#endif
+#ifndef BOARD_ST7920_DELAY_3
+  #define BOARD_ST7920_DELAY_3              DELAY_NS(125)
 #endif
 
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define SPI_FLASH_CS_PIN                  PB12  // Flash chip-select
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
+  #define W25QXX_CS_PIN                     PB12  // Flash chip-select
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index bf38955..5b59a15 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -147,9 +147,6 @@
   #define FSMC_CS_PIN                       PD7   // NE4
   #define FSMC_RS_PIN                       PD11  // A0
 
-  #define TFT_CS_PIN                 FSMC_CS_PIN
-  #define TFT_RS_PIN                 FSMC_RS_PIN
-
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index d4f77d5..bad5db7 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -201,9 +201,9 @@
   #define BTN_EN1                    EXP1_03_PIN
   #define BTN_EN2                    EXP1_06_PIN
   #define BTN_ENC                    EXP1_04_PIN
-  #define BOARD_ST7920_DELAY_1               125
-  #define BOARD_ST7920_DELAY_2               200
-  #define BOARD_ST7920_DELAY_3               125
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(200)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
 
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
 
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index daacd0c..8a6bb4b 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -331,11 +331,10 @@
   #define ADC_KEYPAD_PIN                    PC0   // PIN6 of AUX1
 #endif
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1               125
-  #define BOARD_ST7920_DELAY_2               250
-  #define BOARD_ST7920_DELAY_3               125
+#if HAS_MARLINUI_U8GLIB
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
 #endif
 
 // Remap SERVO0 PIN for BLTouch
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index e0b2f6a..5bbf43b 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -304,11 +304,10 @@
   #define BTN_ENC                    EXP2_05_PIN  // PE15
 #endif
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1               200  // Tclk_fall <200ns
-  #define BOARD_ST7920_DELAY_2               250  // Tdata_width >200ns
-  #define BOARD_ST7920_DELAY_3               200  // Tclk_rise <200ns
+#if HAS_MARLINUI_U8GLIB
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(200)    // Tclk_fall <200ns
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)    // Tdata_width >200ns
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(200)    // Tclk_rise <200ns
 #endif
 
 // Remap SERVO0 PIN for BLTouch
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index 196a779..d2ee2e0 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #pragma once
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h
index bad5b8f..f5ebf82 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #pragma once
 
 #define BOARD_INFO_NAME "Anet ET4P 1.x"
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index 7cccac7..a67af08 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -38,10 +38,8 @@
 #define BOARD_INFO_NAME      "Arm'ed"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
-#if NO_EEPROM_SELECTED
-  #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
-#endif
+#define I2C_EEPROM
+#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
 
 //
 // Limit Switches
@@ -206,6 +204,9 @@
 
 #if HAS_TMC_UART
   // TMC2208/TMC2209 stepper drivers
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN               EXT0_PIN
   #define X_SERIAL_RX_PIN               EXT0_PIN
 
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
index 86851a7..408048b 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -137,17 +137,20 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial  ##
+  //
   #define X_SERIAL_TX_PIN                   PE2
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PE2
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PE3
 
   #define Z_SERIAL_TX_PIN                   PE4
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PE4
 
   #define E0_SERIAL_TX_PIN                  PD7
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PD7
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -158,7 +161,6 @@
 //
 #define TEMP_0_PIN                          PA2   // T0 <-> E0
 #define TEMP_1_PIN                          PA0   // T1 <-> E1
-#define TEMP_BOARD_PIN                      PC2   // Onboard thermistor, NTC100K
 #define TEMP_BED_PIN                        PA1   // T2 <-> Bed
 #define TEMP_PROBE_PIN                      PC3   // Shares J4 connector with PD1
 
@@ -182,6 +184,7 @@
  *                EXP2                                            EXP1                   |
  * --------------------------------------------------------------------------------------
  */
+
 #define EXP1_03_PIN                         PE13
 #define EXP1_04_PIN                         PE12
 #define EXP1_05_PIN                         PE11
@@ -285,10 +288,16 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             600
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index eb0c3bd..a806611 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -112,24 +112,27 @@
  * TMC2208/TMC2209 stepper drivers
  */
 #if HAS_TMC_UART
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PD6
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PD6
 
   #define Y_SERIAL_TX_PIN                   PD1
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PD1
 
   #define Z_SERIAL_TX_PIN                   PD15
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PD15
 
   #define E0_SERIAL_TX_PIN                  PD11
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PD11
 
   #if ENABLED(BTT_E3_RRF_IDEX_BOARD)
     #define X2_SERIAL_TX_PIN           FPC12_PIN  // X2UART
-    #define X2_SERIAL_RX_PIN    X2_SERIAL_TX_PIN
+    #define X2_SERIAL_RX_PIN           FPC12_PIN  // X2UART
 
     #define E1_SERIAL_TX_PIN            FPC6_PIN  // E1UART
-    #define E1_SERIAL_RX_PIN    E1_SERIAL_TX_PIN
+    #define E1_SERIAL_RX_PIN            FPC6_PIN  // E1UART
   #endif
 
   // Reduce baud rate to improve software serial reliability
@@ -183,7 +186,7 @@
 
 /**
  *               BTT E3 RRF
- *                 -----
+ *                 _____
  *             5V | 1 2 | GND
  *  (LCD_EN) PE11 | 3 4 | PB1  (LCD_RS)
  *  (LCD_D4) PE10 | 5 6   PB2  (BTN_EN2)
@@ -207,6 +210,11 @@
     #define LCD_PINS_ENABLE                 PE11
     #define LCD_PINS_D4                     PE10
 
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
@@ -243,7 +251,7 @@
        * TFTGLCD_PANEL_SPI display pinout
        *
        *               Board                                      Display
-       *               -----                                       -----
+       *               _____                                       _____
        *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
        * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)     LCD_CS | 3 4 | SD_CS (PB2)
        * (FREE)  PE10 | 5 6 | PB2  (SD_CS)                 (FREE) | 5 6 | MOSI  (SPI1-MOSI)
@@ -277,10 +285,16 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             600
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
@@ -292,7 +306,7 @@
   /** FYSETC TFT TFT81050 display pinout
    *
    *               Board                                      Display
-   *               -----                                       -----
+   *               _____                                       _____
    *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
    * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)  MOD_RESET | 3 4 | SD_CS (PB2)
    * (FREE)  PE10 | 5 6 | PB2  (SD_CS)       (PB1)     LCD_CS | 5 6 | MOSI  (SPI1-MOSI)
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
index 68948f7..3151a38 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -239,39 +239,42 @@
   //#define E6_HARDWARE_SERIAL Serial1  // M5 MOTOR 4
   //#define E7_HARDWARE_SERIAL Serial1  // M5 MOTOR 5
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PC14
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PC14
 
   #define Y_SERIAL_TX_PIN                   PE1
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PE1
 
   #define Z_SERIAL_TX_PIN                   PB5
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PB5
 
   #define E0_SERIAL_TX_PIN                  PG10
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PG10
 
   #define E1_SERIAL_TX_PIN                  PD4
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PD4
 
   #define E2_SERIAL_TX_PIN                  PC12
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                  PC12
 
   #if ENABLED(M5_EXTENDER)
     #define E3_SERIAL_TX_PIN                PG4
-    #define E3_SERIAL_RX_PIN    E3_SERIAL_TX_PIN
+    #define E3_SERIAL_RX_PIN                PG4
 
     #define E4_SERIAL_TX_PIN                PE15
-    #define E4_SERIAL_RX_PIN    E4_SERIAL_TX_PIN
+    #define E4_SERIAL_RX_PIN                PE15
 
     #define E5_SERIAL_TX_PIN                PE7
-    #define E5_SERIAL_RX_PIN    E5_SERIAL_TX_PIN
+    #define E5_SERIAL_RX_PIN                PE7
 
     #define E6_SERIAL_TX_PIN                PF15
-    #define E6_SERIAL_RX_PIN    E6_SERIAL_TX_PIN
+    #define E6_SERIAL_RX_PIN                PF15
 
     #define E7_SERIAL_TX_PIN                PH14
-    #define E7_SERIAL_RX_PIN    E7_SERIAL_TX_PIN
+    #define E7_SERIAL_RX_PIN                PH14
   #endif
 
   // Reduce baud rate to improve software serial reliability
@@ -425,6 +428,11 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
   #elif ENABLED(MKS_MINI_12864)
     #define DOGLCD_A0                EXP1_04_PIN
     #define DOGLCD_CS                EXP1_05_PIN
@@ -483,10 +491,16 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             600
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+    #endif
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index ab0a7dd..25622bc 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -72,7 +72,7 @@
   #else
     #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
   #endif
-#elif EITHER(X_DUAL_ENDSTOPS, DUAL_X_CARRIAGE)
+#elif ENABLED(X_DUAL_ENDSTOPS)
   #ifndef X_MIN_PIN
     #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
   #endif
@@ -282,43 +282,48 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PC4
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PC4
 
   #define Y_SERIAL_TX_PIN                   PD11
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PD11
 
   #define Z_SERIAL_TX_PIN                   PC6
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PC6
 
   #define Z2_SERIAL_TX_PIN                  PC7
-  #define Z2_SERIAL_RX_PIN      Z2_SERIAL_TX_PIN
+  #define Z2_SERIAL_RX_PIN                  PC7
 
   #define E0_SERIAL_TX_PIN                  PF2
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PF2
 
   #define E1_SERIAL_TX_PIN                  PE4
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PE4
 
   #define E2_SERIAL_TX_PIN                  PE1
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                  PE1
 
   #define E3_SERIAL_TX_PIN                  PD3
-  #define E3_SERIAL_RX_PIN      E3_SERIAL_TX_PIN
+  #define E3_SERIAL_RX_PIN                  PD3
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
 #endif
 
-/**               ------                                      ------
- * (BEEPER) PE8  |10  9 | PE7  (BTN_ENC)         (MISO) PA6  |10  9 | PA5  (SCK)
- * (LCD_EN) PE9  | 8  7 | PE10 (LCD_RS)       (BTN_EN1) PB2  | 8  7 | PA4  (SD_SS)
- * (LCD_D4) PE12   6  5 | PE13 (LCD_D5)       (BTN_EN2) PB1    6  5 | PA7  (MOSI)
- * (LCD_D6) PE14 | 4  3 | PE15 (LCD_D7)     (SD_DETECT) PC15 | 4  3 | RESET
- *          GND  | 2  1 | 5V                            GND  | 2  1 | NC
- *                ------                                      ------
- *                 EXP1                                        EXP2
+/**
+ *               ______                                              ______
+ *           NC | 1  2 | GND                                     5V | 1  2 | GND
+ *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
+ *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
+ *  (SD_SS) PA4 | 7  8 | PB2  (BTN_EN1)               (LCD_RS) PE10 | 7  8 | PE9  (LCD_EN)
+ *    (SCK) PA5 | 9 10 | PA6  (MISO)                 (BTN_ENC)  PE7 | 9 10 | PE8  (BEEPER)
+ *               ------                                               -----
+ *               EXP2                                                EXP1
  */
+
 #define EXP1_03_PIN                         PE15
 #define EXP1_04_PIN                         PE14
 #define EXP1_05_PIN                         PE13
@@ -364,7 +369,7 @@
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
   /**
-   *         ------                        ------
+   *         ______                        ______
    *     NC | 1  2 | GND               NC | 1  2 | GND
    *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
    *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG
@@ -382,7 +387,7 @@
   #define E4_CS_PIN                  EXP1_05_PIN
   #if HAS_TMC_UART
     #define E4_SERIAL_TX_PIN         EXP1_05_PIN
-    #define E4_SERIAL_RX_PIN    E4_SERIAL_TX_PIN
+    #define E4_SERIAL_RX_PIN         EXP1_05_PIN
   #endif
 
   // M2 on Driver Expansion Module
@@ -393,7 +398,7 @@
   #define E5_CS_PIN                  EXP1_07_PIN
   #if HAS_TMC_UART
     #define E5_SERIAL_TX_PIN         EXP1_07_PIN
-    #define E5_SERIAL_RX_PIN    E5_SERIAL_TX_PIN
+    #define E5_SERIAL_RX_PIN         EXP1_07_PIN
   #endif
 
   // M3 on Driver Expansion Module
@@ -404,7 +409,7 @@
   #define E6_CS_PIN                  EXP1_09_PIN
   #if HAS_TMC_UART
     #define E6_SERIAL_TX_PIN         EXP1_09_PIN
-    #define E6_SERIAL_RX_PIN    E6_SERIAL_TX_PIN
+    #define E6_SERIAL_RX_PIN         EXP1_09_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION
@@ -433,6 +438,11 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
   #else
 
     #define LCD_PINS_RS              EXP1_07_PIN
@@ -478,10 +488,16 @@
 #endif  // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1               120
-  #define BOARD_ST7920_DELAY_2                80
-  #define BOARD_ST7920_DELAY_3               580
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)  // DELAY_NS(96)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(80)   // DELAY_NS(48)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)  // DELAY_NS(600)
+  #endif
 #endif
 
 #if HAS_SPI_TFT
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 72154be..eb3ce73 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -204,23 +204,26 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PC13
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PC13
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PE3
 
   #define Z_SERIAL_TX_PIN                   PE1
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PE1
 
   #define E0_SERIAL_TX_PIN                  PD4
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PD4
 
   #define E1_SERIAL_TX_PIN                  PD1
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PD1
 
   #define E2_SERIAL_TX_PIN                  PD6
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                  PD6
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -311,15 +314,17 @@
   #define SDCARD_CONNECTION                  LCD
 #endif
 
-/**               ------                                      ------
- * (BEEPER) PG4  |10  9 | PA8  (BTN_ENC)         (MISO) PB14 |10  9 | PB13 (SCK)
- * (LCD_EN) PD11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PG10 | 8  7 | PB12 (SD_SS)
- * (LCD_D4) PG2    6  5 | PG3  (LCD_D5)       (BTN_EN2) PF11   6  5 | PB15 (MOSI)
- * (LCD_D6) PG6  | 4  3 | PG7  (LCD_D7)     (SD_DETECT) PF12 | 4  3 | RESET
- *          GND  | 2  1 | 5V                            GND  | 2  1 | NC
- *                ------                                      ------
- *                 EXP1                                        EXP2
+/**
+ *               -----                                             -----
+ *           NC | 1 2 | GND                                    5V | 1 2 | GND
+ *        RESET | 3 4 | PF12(SD_DETECT)             (LCD_D7)  PG7 | 3 4 | PG6  (LCD_D6)
+ *   (MOSI)PB15 | 5 6   PF11(BTN_EN2)               (LCD_D5)  PG3 | 5 6   PG2  (LCD_D4)
+ *  (SD_SS)PB12 | 7 8 | PG10(BTN_EN1)               (LCD_RS) PD10 | 7 8 | PD11 (LCD_EN)
+ *    (SCK)PB13 | 9 10| PB14(MISO)                 (BTN_ENC)  PA8 | 9 10| PG4  (BEEPER)
+ *               -----                                             -----
+ *               EXP2                                              EXP1
  */
+
 #define EXP1_03_PIN                         PG7
 #define EXP1_04_PIN                         PG6
 #define EXP1_05_PIN                         PG3
@@ -365,7 +370,7 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       -----                        -----
+  /**       _____                        _____
    *    NC | . . | GND               NC | . . | GND
    *    NC | . . | M1EN            M2EN | . . | M3EN
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
@@ -446,6 +451,11 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
   #elif ENABLED(MKS_MINI_12864)
 
     #define DOGLCD_A0                EXP1_04_PIN
@@ -499,15 +509,15 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1             125
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(125)
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2              90
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(90)
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3             600
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index a05f4fb..e5d6b68 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -267,20 +267,23 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PE0
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PE0
 
   #define Y_SERIAL_TX_PIN                   PD3
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PD3
 
   #define Z_SERIAL_TX_PIN                   PD0
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PD0
 
   #define E0_SERIAL_TX_PIN                  PC6
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PC6
 
   #define E1_SERIAL_TX_PIN                  PD12
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PD12
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -303,6 +306,7 @@
  *               -----                                             -----
  *               EXP2                                              EXP1
  */
+
 #define EXP1_03_PIN                         PE13
 #define EXP1_04_PIN                         PE12
 #define EXP1_05_PIN                         PE11
@@ -349,7 +353,7 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       -----                        -----
+  /**       _____                        _____
    *    NC | . . | GND               NC | . . | GND
    *    NC | . . | M1EN            M2EN | . . | M3EN
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
@@ -430,6 +434,11 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
   #elif ENABLED(MKS_MINI_12864)
 
     #define DOGLCD_A0                EXP1_04_PIN
@@ -483,15 +492,15 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1             120
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2              80
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(80)
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3             580
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 8a9ac56..77257f8 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -175,38 +175,17 @@
 #define FAN4_PIN                            PE13
 #define FAN5_PIN                            PB11
 
-/**
- *        ------                ------
- *  PB10 |10  9 | PE15    PB14 |10  9 | PB13
- *  PE14 | 8  7 | PE12    PC5  | 8  7 | PF11
- *  PE10   6  5 | PE9     PC4    6  5 | PB15
- *  PE8  | 4  3 | PE7     PB2  | 4  3 | RESET
- *  GND  | 2  1 | 5V      GND  | 2  1 | NC
- *        ------                ------
- *         EXP1                  EXP2
- */
-#define EXP1_03_PIN                         PE7
-#define EXP1_04_PIN                         PE8
-#define EXP1_05_PIN                         PE9
-#define EXP1_06_PIN                         PE10
-#define EXP1_07_PIN                         PE12
-#define EXP1_08_PIN                         PE14
-#define EXP1_09_PIN                         PE15
-#define EXP1_10_PIN                         PB10
-
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB2
-#define EXP2_05_PIN                         PB15
-#define EXP2_06_PIN                         PC4
-#define EXP2_07_PIN                         PF11
-#define EXP2_08_PIN                         PC5
-#define EXP2_09_PIN                         PB13
-#define EXP2_10_PIN                         PB14
-
 //
 // Onboard SD support
 //
+
+#define SDIO_D0_PIN                         PC8
+#define SDIO_D1_PIN                         PC9
 //#define SD_CARD_DETECT_PIN                PC13
+#define SDIO_D2_PIN                         PC10
+#define SDIO_D3_PIN                         PC11
+#define SDIO_CK_PIN                         PC12
+#define SDIO_CMD_PIN                        PD2
 
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
@@ -215,37 +194,37 @@
 #if SD_CONNECTION_IS(ONBOARD)
 
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-
-  #if DISABLED(SDIO_SUPPORT)
+  #ifndef SDIO_SUPPORT
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
-    #define SDSS                            PC11
-    #define SD_SCK_PIN                      PC12
-    #define SD_MISO_PIN                     PC8
-    #define SD_MOSI_PIN                     PD2
+    #define SDSS                     SDIO_D3_PIN
+    #define SD_SCK_PIN               SDIO_CK_PIN
+    #define SD_MISO_PIN              SDIO_D0_PIN
+    #define SD_MOSI_PIN             SDIO_CMD_PIN
   #endif
 
 #elif SD_CONNECTION_IS(LCD)
 
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SDSS                       EXP2_07_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SCK_PIN                        PB13
+  #define SD_MISO_PIN                       PB14
+  #define SD_MOSI_PIN                       PB15
+  #define SDSS                              PF11
+  #define SD_DETECT_PIN                     PB2
 
 #endif
 
 //
 // Trinamic Software SPI
 //
+
 #if ENABLED(TMC_USE_SW_SPI)
-  #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK               EXP2_09_PIN
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PB15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO              EXP2_10_PIN
+    #define TMC_SW_MISO                     PB14
   #endif
-  #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI              EXP2_05_PIN
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PB13
   #endif
 #endif
 
@@ -255,48 +234,48 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PG13
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PG13
 
   #define Y_SERIAL_TX_PIN                   PG10
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PG10
 
   #define Z_SERIAL_TX_PIN                   PD5
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PD5
 
   #define E0_SERIAL_TX_PIN                  PD1
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PD1
 
   #define E1_SERIAL_TX_PIN                  PA14
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PA14
 
   #define E2_SERIAL_TX_PIN                  PG6
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                  PG6
 
   #define E3_SERIAL_TX_PIN                  PG3
-  #define E3_SERIAL_RX_PIN      E3_SERIAL_TX_PIN
+  #define E3_SERIAL_RX_PIN                  PG3
 
   #define E4_SERIAL_TX_PIN                  PD10
-  #define E4_SERIAL_RX_PIN      E4_SERIAL_TX_PIN
+  #define E4_SERIAL_RX_PIN                  PD10
 
   #define E5_SERIAL_TX_PIN                  PB12
-  #define E5_SERIAL_RX_PIN      E5_SERIAL_TX_PIN
+  #define E5_SERIAL_RX_PIN                  PB12
+
 #endif
 
 //
 // LCD / Controller
 //
-#if IS_RRD_SC
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
-  #define LCD_PINS_D5                EXP1_05_PIN
-  #define LCD_PINS_D6                EXP1_04_PIN
-  #define LCD_PINS_D7                EXP1_03_PIN
-  #define BTN_EN1                    EXP2_06_PIN
-  #define BTN_EN2                    EXP2_08_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-#endif
+
+#define BEEPER_PIN                          PB10
+#define LCD_PINS_RS                         PE12
+#define LCD_PINS_ENABLE                     PE14
+#define LCD_PINS_D4                         PE10
+#define LCD_PINS_D5                         PE9
+#define LCD_PINS_D6                         PE8
+#define LCD_PINS_D7                         PE7
+#define BTN_EN1                             PC4
+#define BTN_EN2                             PC5
+#define BTN_ENC                             PE15
 
 //
 // Filament runout
@@ -304,9 +283,15 @@
 
 #define FIL_RUNOUT_PIN                      PA3
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                96
-  #define BOARD_ST7920_DELAY_2                48
-  #define BOARD_ST7920_DELAY_3               715
+//
+// ST7920 Delays
+//
+#ifndef BOARD_ST7920_DELAY_1
+  #define BOARD_ST7920_DELAY_1      DELAY_NS(96)
+#endif
+#ifndef BOARD_ST7920_DELAY_2
+  #define BOARD_ST7920_DELAY_2      DELAY_NS(48)
+#endif
+#ifndef BOARD_ST7920_DELAY_3
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index 3fe7449..ef1c14a 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -138,7 +138,7 @@
 #endif
 
 /**
- *                -----                                              -----
+ *                _____                                              _____
  *            5V | 1 2 | GND                                     5V | 1 2 | GND
  *         RESET | 3 4 | PC3  (SD_DETECT)             (LCD_D7)  PB7 | 3 4 | PB6  (LCD_D6)
  * (SD_MOSI) PA7   5 6 | PC11 (BTN_EN2)               (LCD_D5) PB14   5 6 | PB13 (LCD_D4)
@@ -149,7 +149,7 @@
  */
 
 /**
-*                 -----
+*                 _____
 *  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
 * (BTN_EN1) PC10 | 3 4 | PB14 (LCD_D5/MISO)
 * (BTN_EN2) PC11   5 6 | PB13 (LCD_D4/SCK)
@@ -192,6 +192,11 @@
     #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4              EXP1_06_PIN
 
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
   #elif ENABLED(MKS_MINI_12864)
 
     #define DOGLCD_A0                EXP1_04_PIN
@@ -245,10 +250,16 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                96
-  #define BOARD_ST7920_DELAY_2                48
-  #define BOARD_ST7920_DELAY_3               600
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
+  #endif
 #endif
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 6b6f644..4923830 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -118,6 +118,9 @@
   // TMC2208/TMC2209 stepper drivers
   //
 
+  //
+  // Software serial
+  //
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                 PE9
   #endif
@@ -184,126 +187,99 @@
 #define FAN1_PIN                            PB1
 #define FAN2_PIN                            PB2
 
+//
+// SPI
+//
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
+
 //
 // Misc. Functions
 //
 //#define LED_PIN                           PB14
+//#define BTN_PIN                           PC10
 //#define PS_ON_PIN                         PE11
 //#define KILL_PIN                          PC5
 
-/**
- *         ------                 ------
- *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
- *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
- *   PC10   6  5 | PC12     PC7    6  5 | PA7
- *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
- *   GND  | 2  1 | 5V       GND  | 2  1 | 5V
- *         ------                 ------
- *          EXP1                   EXP2
- */
-#define EXP1_03_PIN                         PD1
-#define EXP1_04_PIN                         PD0
-#define EXP1_05_PIN                         PC12
-#define EXP1_06_PIN                         PC10
-#define EXP1_07_PIN                         PD2
-#define EXP1_08_PIN                         PC11
-#define EXP1_09_PIN                         PA8
-#define EXP1_10_PIN                         PC9
-
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB10
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PC7
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PC6
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
-
-//
-// SPI / SD Card
-//
-#define SD_SCK_PIN                   EXP2_09_PIN
-#define SD_MISO_PIN                  EXP2_10_PIN
-#define SD_MOSI_PIN                  EXP2_05_PIN
-
-#define SDSS                         EXP2_07_PIN
-#define SD_DETECT_PIN                EXP2_04_PIN
+#define SDSS                                PA4
+#define SD_DETECT_PIN                       PB10
 
 //
 // LCD / Controller
 //
 #if ENABLED(FYSETC_242_OLED_12864)
 
-  #define BTN_EN1                    EXP1_10_PIN
-  #define BTN_EN2                    EXP1_03_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                           PC9
+  #define BTN_EN2                           PD1
+  #define BTN_ENC                           PA8
 
-  #define BEEPER_PIN                 EXP2_08_PIN
+  #define BEEPER_PIN                        PC6
 
-  #define LCD_PINS_DC                EXP1_05_PIN
-  #define LCD_PINS_RS                EXP2_06_PIN  // LCD_RST
-  #define DOGLCD_CS                  EXP1_07_PIN
-  #define DOGLCD_MOSI                EXP1_06_PIN
-  #define DOGLCD_SCK                 EXP1_08_PIN
+  #define LCD_PINS_DC                       PC12
+  #define LCD_PINS_RS                       PC7   // LCD_RST
+  #define DOGLCD_CS                         PD2
+  #define DOGLCD_MOSI                       PC10
+  #define DOGLCD_SCK                        PC11
   #define DOGLCD_A0                  LCD_PINS_DC
   #define FORCE_SOFT_SPI
 
   #define KILL_PIN                          -1    // NC
-  #define NEOPIXEL_PIN               EXP1_04_PIN
+  #define NEOPIXEL_PIN                      PD0
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                        PC9
+  #define BTN_ENC                           PA8
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS                     PD0
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                         PC11
+    #define BTN_EN2                         PC10
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE                 PD1
+    #define LCD_PINS_D4                     PC12
 
   #else
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS                     PD2
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                         PC6
+    #define BTN_EN2                         PC7
 
-    #define LCD_SDSS                 EXP2_07_PIN
+    #define LCD_SDSS                        PA4
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_ENABLE                 PC11
+    #define LCD_PINS_D4                     PC10
 
     #if ENABLED(FYSETC_MINI_12864)
       // See https://wiki.fysetc.com/Mini12864_Panel
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS                     PC11
+      #define DOGLCD_A0                     PD2
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
-        #define LCD_BACKLIGHT_PIN    EXP1_04_PIN
+        #define LCD_BACKLIGHT_PIN           PD0
       #endif
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                 PC10  // Must be high or open for LCD to operate normally.
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN      EXP1_05_PIN
+          #define RGB_LED_R_PIN             PC12
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN             PD0
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN             PD1
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN                PC12
       #endif
     #endif
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5                   PC12
+      #define LCD_PINS_D6                   PD0
+      #define LCD_PINS_D7                   PD1
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
       #endif
@@ -314,10 +290,16 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                96
-  #define BOARD_ST7920_DELAY_2                48
-  #define BOARD_ST7920_DELAY_3               640
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
+  #endif
 #endif
 
 #ifndef RGB_LED_R_PIN
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
index 6f1c9be..641805d 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
@@ -40,6 +40,7 @@
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PE8
   #define Y_SERIAL_TX_PIN                   PC4
+  #define Y_SERIAL_RX_PIN                   PC4
   #define Z_SERIAL_TX_PIN                   PD12
   #define E0_SERIAL_TX_PIN                  PA15
   #define E1_SERIAL_TX_PIN                  PC5
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
index e058115..e90ac55 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
@@ -76,28 +76,21 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PE7
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
-
-  #define X2_SERIAL_TX_PIN                  PA15
-  #define X2_SERIAL_RX_PIN      X2_SERIAL_TX_PIN
-
+  #define X_SERIAL_RX_PIN                   PE7
   #define Y_SERIAL_TX_PIN                   PE15
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
-
+  #define Y_SERIAL_RX_PIN                   PE15
   #define Z_SERIAL_TX_PIN                   PD10
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
-
-  #define Z2_SERIAL_TX_PIN                  PD11
-  #define Z2_SERIAL_RX_PIN      Z2_SERIAL_TX_PIN
-
+  #define Z_SERIAL_RX_PIN                   PD10
   #define E0_SERIAL_TX_PIN                  PD7
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
-
+  #define E0_SERIAL_RX_PIN                  PD7
   #define E1_SERIAL_TX_PIN                  PC14
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
-
+  #define E1_SERIAL_RX_PIN                  PC14
   #define E2_SERIAL_TX_PIN                  PC15
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                  PC15
+  #define X2_SERIAL_TX_PIN                  PA15
+  #define X2_SERIAL_RX_PIN                  PA15
+  #define Z2_SERIAL_TX_PIN                  PD11
+  #define Z2_SERIAL_RX_PIN                  PD11
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 6ad3849..3b75e70 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -75,43 +72,42 @@
 #define X_DIR_PIN                           PB10
 #define X_ENABLE_PIN                        PG0
 //#ifndef X_CS_PIN
-//  #define X_CS_PIN                        PB2
+//  #define X_CS_PIN                        PE0
 //#endif
 
 #define Y_STEP_PIN                          PF14
 #define Y_DIR_PIN                           PF15
 #define Y_ENABLE_PIN                        PF13
 //#ifndef Y_CS_PIN
-//  #define Y_CS_PIN                        PE2
+//  #define Y_CS_PIN                        PE1
 //#endif
 
 #define Z_STEP_PIN                          PF11
 #define Z_DIR_PIN                           PF12
 #define Z_ENABLE_PIN                        PC5
 //#ifndef Z_CS_PIN
-//  #define Z_CS_PIN                        PE3
+//  #define Z_CS_PIN                        PE2
 //#endif
 
 #define E0_STEP_PIN                         PC14
 #define E0_DIR_PIN                          PC13
 #define E0_ENABLE_PIN                       PC15
 //#ifndef E0_CS_PIN
-//  #define E0_CS_PIN                       PE4
+//  #define E0_CS_PIN                       PE3
 //#endif
 
 #define E1_STEP_PIN                         PF1
 #define E1_DIR_PIN                          PF0
 #define E1_ENABLE_PIN                       PF2
 //#ifndef E1_CS_PIN
-//  #define E1_CS_PIN                       PE1
+//  #define E1_CS_PIN                       PE4
 //#endif
 
-//#define Z2_STEP_PIN                       PF4
-//#define Z2_DIR_PIN                        PF3
-//#define Z2_ENABLE_PIN                     PF5
-//#define Z2_STOP_PIN                       PG2
-//#ifndef Z2_CS_PIN
-//  #define Z2_CS_PIN                       PE0
+//#define E2_STEP_PIN                       PF4  // best guess
+//#define E2_DIR_PIN                        PF3  // best guess
+//#define E2_ENABLE_PIN                     PF5  // best guess
+//#ifndef E2_CS_PIN
+//  #define E2_CS_PIN                       PB2  // best guess
 //#endif
 
 #if HAS_TMC_UART
@@ -122,43 +118,38 @@
     #define X_SERIAL_TX_PIN                 PB2
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
+    #define X_SERIAL_RX_PIN                 PB2
   #endif
   #ifndef Y_SERIAL_TX_PIN
     #define Y_SERIAL_TX_PIN                 PE2
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
+    #define Y_SERIAL_RX_PIN                 PE2
   #endif
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                 PE3
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
+    #define Z_SERIAL_RX_PIN                 PE3
   #endif
   #ifndef E0_SERIAL_TX_PIN
     #define E0_SERIAL_TX_PIN                PE4
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
+    #define E0_SERIAL_RX_PIN                PE4
   #endif
   #ifndef E1_SERIAL_TX_PIN
     #define E1_SERIAL_TX_PIN                PE1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN    E1_SERIAL_TX_PIN
+    #define E1_SERIAL_RX_PIN                PE1
   #endif
-  // Ex-motor can be any... X2/Y2/Z2 or E2
   #ifndef EX_SERIAL_TX_PIN
-    #define EX_SERIAL_TX_PIN                PE0
+    #define E2_SERIAL_TX_PIN                PE0
   #endif
   #ifndef EX_SERIAL_RX_PIN
-    #define EX_SERIAL_RX_PIN    EX_SERIAL_TX_PIN
+    #define E2_SERIAL_RX_PIN                PE0
   #endif
-  //#define Z2_SERIAL_RX_PIN EX_SERIAL_RX_PIN
-  //#define Z2_SERIAL_TX_PIN EX_SERIAL_TX_PIN
-  //#define E2_SERIAL_RX_PIN EX_SERIAL_RX_PIN
-  //#define E2_SERIAL_TX_PIN EX_SERIAL_TX_PIN
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
 #endif
@@ -202,8 +193,8 @@
 //
 // LED / Lighting
 //
-#define LED_PIN                             PA15  // Status LED
-//#define CASE_LIGHT_PIN                    PB6   // LED Ribbon Connector (PWM TIM4_CH1)
+//#define CASE_LIGHT_PIN_CI                 -1
+//#define CASE_LIGHT_PIN_DO                 -1
 //#define NEOPIXEL_PIN                      -1
 #ifndef RGB_LED_R_PIN
   #define RGB_LED_R_PIN                     PB8   // swap R and G pin for compatibility with real wires
@@ -220,54 +211,44 @@
 //
 #define SDIO_SUPPORT
 #define SDIO_CLOCK                       4800000
-#define SD_DETECT_PIN                       PA8
-#if DISABLED(SDIO_SUPPORT)
-  #define SOFTWARE_SPI
-  #define SD_SCK_PIN                        PC12
-  #define SD_MISO_PIN                       PC8
-  #define SD_MOSI_PIN                       PD2
-  #define SD_SS_PIN                         PC11
-  #define SDSS                              PC11
-#endif
 
 //
 // Misc. Functions
 //
+#define SDSS                                PC11
+#define LED_PIN                             PA15  // Alive
 #define PS_ON_PIN                           PA4
 #define KILL_PIN                            -1
 #define POWER_LOSS_PIN                      PA4   // Power-loss / nAC_FAULT
 
+#define SD_SCK_PIN                          PC12
+#define SD_MISO_PIN                         PC8
+#define SD_MOSI_PIN                         PD2
+#define SD_SS_PIN                           PC11
+
+#define SD_DETECT_PIN                       PA8
+#define BEEPER_PIN                          PC7
+
 //
 // TFT with FSMC interface
 //
 #if HAS_FSMC_TFT
-  #ifndef TFT_DRIVER
-    #define TFT_DRIVER                    ST7796
-  #endif
-  #define ST7796S_INVERTED
+  //#define TFT_DRIVER             LERDGE_ST7796
 
   #define TFT_RESET_PIN                     PD6
   #define TFT_BACKLIGHT_PIN                 PD3
 
-  #define FSMC_CS_PIN                       PD7
-  #define FSMC_RS_PIN                       PD11
-
-  #define TFT_CS_PIN                 FSMC_CS_PIN
-  #define TFT_RS_PIN                 FSMC_RS_PIN
+  #define TFT_CS_PIN                        PD7
+  #define TFT_RS_PIN                        PD11
 
   #define TOUCH_CS_PIN                      PG15
   #define TOUCH_SCK_PIN                     PB3
   #define TOUCH_MOSI_PIN                    PB5
   #define TOUCH_MISO_PIN                    PB4
-  #define TOUCH_INT_PIN                     PG12
 #endif
 
 #if IS_NEWPANEL
-  #define BEEPER_PIN                        PC7
-  #define BTN_EN1                           PG11
-  #define BTN_EN2                           PG10
+  #define BTN_EN1                           PG10
+  #define BTN_EN2                           PG11
   #define BTN_ENC                           PG9
-  #ifndef ENCODER_STEPS_PER_MENU_ITEM
-    #define ENCODER_STEPS_PER_MENU_ITEM 2
-  #endif
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 68e5636..65db990 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -34,6 +31,8 @@
 #define STEP_TIMER                             4
 #define TEMP_TIMER                             2
 
+//#define I2C_EEPROM
+
 // USB Flash Drive support
 #define HAS_OTG_USB_HOST_SUPPORT
 
@@ -151,6 +150,7 @@
 //
 // Misc. Functions
 //
+#define SDSS                                PC11  // SD is working using SDIO, not sure if this definition is needed?
 #define LED_PIN                             PC6   // Mainboard soldered green LED
 #define PS_ON_PIN                           PB2   // Board has a power module connector
 #define KILL_PIN                            -1    // There is no reset button on the LCD
@@ -161,71 +161,53 @@
 //
 #define SDIO_SUPPORT
 #define SDIO_CLOCK                       4800000
+
+#define SD_SCK_PIN                          PC12
+#define SD_MISO_PIN                         PC8
+#define SD_MOSI_PIN                         PD2
+#define SD_SS_PIN                           PC11
+
 #define SD_DETECT_PIN                       PG15
-#if DISABLED(SDIO_SUPPORT)
-  #define SOFTWARE_SPI
-  #define SD_SCK_PIN                        PC12
-  #define SD_MISO_PIN                       PC8
-  #define SD_MOSI_PIN                       PD2
-  #define SD_SS_PIN                         PC11
-  #define SDSS                              PC11
-#endif
 
 //
 // Persistent Storage
 // If no option is selected below the SD Card will be used
-// Prefer the I2C option (F-RAM) to store Marlin settings, SPI option is not working yet
-
+// (this section modelled after pins_LONGER3D_LK.h)
+// Warning: Not tested yet! Pins traced with multimeter, mistakes are possible
 //#define SPI_EEPROM
-//#define I2C_EEPROM
 
-#if ENABLED(SPI_EEPROM)                           // SPI EEPROM Winbond W25Q128 (128Mbits) https://www.pjrc.com/teensy/W25Q128FV.pdf
+#if ENABLED(SPI_EEPROM)
+  // Lerdge has an SPI EEPROM Winbond W25Q128 (128Mbits) https://www.pjrc.com/teensy/W25Q128FV.pdf
   #define SPI_CHAN_EEPROM1                     1
-  #define SPI_EEPROM1_CS_PIN                PB12  // datasheet: /CS pin, found with multimeter, not tested
-  #define EEPROM_SCK_PIN                    PB13  // datasheet: CLK pin, found with multimeter, not tested
-  #define EEPROM_MISO_PIN                   PB14  // datasheet: DO pin, found with multimeter, not tested
-  #define EEPROM_MOSI_PIN                   PB15  // datasheet: DI pin, found with multimeter, not tested
+  #define SPI_EEPROM1_CS                    PB12  // datasheet: /CS pin, found with multimeter, not tested
+  #define EEPROM_SCK                        PB13  // datasheet: CLK pin, found with multimeter, not tested
+  #define EEPROM_MISO                       PB14  // datasheet: DO pin, found with multimeter, not tested
+  #define EEPROM_MOSI                       PB15  // datasheet: DI pin, found with multimeter, not tested
   #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
   #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
-#elif ENABLED(I2C_EEPROM)                         // FM24CL64BG (CYP1813) 64Kbit F-RAM
-  #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
-  #define I2C_SDA_PIN                       PG13
-  #define I2C_SCL_PIN                       PG14  // To be confirmed on the Lerdge S, but probably same as the K
-  #define MARLIN_EEPROM_SIZE             0x10000
 #else
   #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
 #endif
 
 //
-// TFT with FSMC interface
+// LCD / Controller
 //
-#if HAS_FSMC_TFT
-  #ifndef TFT_DRIVER
-    #define TFT_DRIVER                    ST7796
-  #endif
-  #define ST7796S_INVERTED
 
-  #define TFT_RESET_PIN                     PD6
-  #define TFT_BACKLIGHT_PIN                 PD3
+// The LCD is initialized in FSMC mode
+#define BEEPER_PIN                          PD13
 
-  #define FSMC_CS_PIN                       PD7
-  #define FSMC_RS_PIN                       PD11
+#define BTN_EN1                             PC14
+#define BTN_EN2                             PC15
+#define BTN_ENC                             PC13
 
-  #define TFT_CS_PIN                 FSMC_CS_PIN
-  #define TFT_RS_PIN                 FSMC_RS_PIN
+#define TFT_RESET_PIN                       PD6
+#define TFT_BACKLIGHT_PIN                   PD3
 
-  #define TOUCH_CS_PIN                      PB6
-  #define TOUCH_SCK_PIN                     PB3
-  #define TOUCH_MOSI_PIN                    PB5
-  #define TOUCH_MISO_PIN                    PB4
-#endif
+#define TFT_CS_PIN                          PD7   // TFT works
+#define TFT_RS_PIN                          PD11  // TFT works
 
-#if IS_NEWPANEL
-  #define BEEPER_PIN                        PD13
-  #define BTN_EN1                           PC15
-  #define BTN_EN2                           PC14
-  #define BTN_ENC                           PC13
-  #ifndef ENCODER_STEPS_PER_MENU_ITEM
-    #define ENCODER_STEPS_PER_MENU_ITEM 2
-  #endif
-#endif
+// There is touch, but calibration is off
+#define TOUCH_CS_PIN                        PB6
+#define TOUCH_SCK_PIN                       PB3
+#define TOUCH_MOSI_PIN                      PB5
+#define TOUCH_MISO_PIN                      PB4
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index 12e47e3..3a9c286 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -2,9 +2,6 @@
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -116,24 +113,10 @@
 //#define CASE_LIGHT_PIN_DO                 -1
 //#define NEOPIXEL_PIN                      -1
 
-//
-// SD support (On board)
-//
-#define SDIO_SUPPORT
-#define SD_DETECT_PIN                       PA8
-#define SDIO_CLOCK                       4800000
-#if DISABLED(SDIO_SUPPORT)
-  #define SOFTWARE_SPI
-  #define SD_SCK_PIN                        PC12
-  #define SD_MISO_PIN                       PC8
-  #define SD_MOSI_PIN                       PD2
-  #define SD_SS_PIN                         PC11
-  #define SDSS                              PC11
-#endif
-
 //
 // Misc. Functions
 //
+#define SDSS                                PC11
 #define LED_PIN                             PC7   // Alive
 #define PS_ON_PIN                           -1
 #define KILL_PIN                            -1
@@ -141,36 +124,36 @@
 // Lerdge supports auto-power off and power loss sense through a single pin.
 #define POWER_LOSS_PIN                      PC14  // Power-loss / nAC_FAULT
 
+#define SD_SCK_PIN                          PC12
+#define SD_MISO_PIN                         PC8
+#define SD_MOSI_PIN                         PD2
+#define SD_SS_PIN                           PC11
+
 //
-// TFT with FSMC interface
+// SD support
 //
-#if HAS_FSMC_TFT
-  #ifndef TFT_DRIVER
-    #define TFT_DRIVER                    ST7796
-  #endif
-  #define ST7796S_INVERTED
+#define SDIO_SUPPORT
+#define SD_DETECT_PIN                       PA8
+#define SDIO_CLOCK                       4800000
 
-  #define FSMC_CS_PIN                       PD7
-  #define FSMC_RS_PIN                       PD11
+//
+// LCD / Controller
+//
 
-  #define TFT_RESET_PIN                     PD6
-  #define TFT_BACKLIGHT_PIN                 PD3
+// The LCD is initialized in FSMC mode
+#define BEEPER_PIN                          PD12
 
-  #define TFT_CS_PIN                 FSMC_CS_PIN
-  #define TFT_RS_PIN                 FSMC_RS_PIN
+#define BTN_EN1                             PE3
+#define BTN_EN2                             PE4
+#define BTN_ENC                             PE2
 
-  #define TOUCH_CS_PIN                      PB6
-  #define TOUCH_SCK_PIN                     PB3
-  #define TOUCH_MOSI_PIN                    PB5
-  #define TOUCH_MISO_PIN                    PB4
-#endif
+#define TFT_RESET_PIN                       PD6
+#define TFT_BACKLIGHT_PIN                   PD3
 
-#if IS_NEWPANEL
-  #define BEEPER_PIN                        PD12
-  #define BTN_EN1                           PE4
-  #define BTN_EN2                           PE3
-  #define BTN_ENC                           PE2
-  #ifndef ENCODER_STEPS_PER_MENU_ITEM
-    #define ENCODER_STEPS_PER_MENU_ITEM 2
-  #endif
-#endif
+#define TFT_CS_PIN                          PD7
+#define TFT_RS_PIN                          PD11
+
+#define TOUCH_CS_PIN                        PB6
+#define TOUCH_SCK_PIN                       PB3
+#define TOUCH_MOSI_PIN                      PB5
+#define TOUCH_MISO_PIN                      PB4
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 8fa211d..2db5584 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -160,28 +160,28 @@
   // No Hardware serial for steppers
   //
   #define X_SERIAL_TX_PIN                   PE6
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PE6
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PE3
 
   #define Z_SERIAL_TX_PIN                   PB7
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PB7
 
   #define E0_SERIAL_TX_PIN                  PB3
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PB3
 
   #define E1_SERIAL_TX_PIN                  PD4
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PD4
 
   #define E2_SERIAL_TX_PIN                  PD0
-  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+  #define E2_SERIAL_RX_PIN                  PD0
 
   #define E3_SERIAL_TX_PIN                  PD15
-  #define E3_SERIAL_RX_PIN      E3_SERIAL_TX_PIN
+  #define E3_SERIAL_RX_PIN                  PD15
 
   #define E4_SERIAL_TX_PIN                  PD11
-  #define E4_SERIAL_RX_PIN      E4_SERIAL_TX_PIN
+  #define E4_SERIAL_RX_PIN                  PD11
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -210,61 +210,45 @@
 //
 // Misc. Functions
 //
-#define PW_DET                              PC5   // Y+
-#define PW_OFF                              PB12  // Z+
-#define MT_DET_1_PIN                      PW_DET
-#define MT_DET_2_PIN                      PW_OFF
+#define MT_DET_1                            PC5   // Y+
+#define MT_DET_2                            PB12  // Z+
+
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
+  #define FIL_RUNOUT_PIN                MT_DET_1
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
+  #define FIL_RUNOUT2_PIN               MT_DET_2
 #endif
 
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                   MT_DET_2  // Z+
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                    MT_DET_1  // Y+
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define PW_DET                        MT_DET_1
+  #define PW_OFF                        MT_DET_2
+  #define POWER_LOSS_PIN                  PW_DET
   #define PS_ON_PIN                       PW_OFF
-  #define KILL_PIN                        PW_DET
-  #define KILL_PIN_STATE                    HIGH
 #endif
 
 // Random Info
 #define USB_SERIAL                          -1    // USB Serial
 
-/**
- *                  ------                                      ------
- *   (BEEPER) PB2  |10  9 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5 (SPI1 SCK)
- *   (LCD_EN) PE11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 8  7 | PA4 (SPI1 CS)
- *   (LCD_D4) PD9    6  5 | PD8  (LCD_D5)       (BTN_EN2) PE8    6  5 | PA7 (SPI1 MOSI)
- *   (LCD_D6) PE15 | 4  3 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 4  3 | RESET
- *            GND  | 2  1 | 5V                             GND | 2  1 | 3.3V
- *                  ------                                      ------
- *                   EXP1                                        EXP2
- */
-#define EXP1_03_PIN                         PE7
-#define EXP1_04_PIN                         PE15
-#define EXP1_05_PIN                         PD8
-#define EXP1_06_PIN                         PD9
-#define EXP1_07_PIN                         PD10
-#define EXP1_08_PIN                         PE11
-#define EXP1_09_PIN                         PE10
-#define EXP1_10_PIN                         PB2
-
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB11
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PE8
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PE9
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
-
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
+//
+// Onboard SD card
+//
+// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
 #if SD_CONNECTION_IS(ONBOARD)
   #define ENABLE_SPI3
   #define SD_SS_PIN                         -1
@@ -272,49 +256,31 @@
   #define SD_SCK_PIN                        PC10
   #define SD_MISO_PIN                       PC11
   #define SD_MOSI_PIN                       PC12
-  #define SD_DETECT_PIN                     PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
+  #define SD_DETECT_PIN                     PC4
+//
+// LCD SD
+//
 #elif SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SDSS                              PA4
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PB11
 #endif
 
+/**
+ *                _____                                             _____
+ *   (BEEPER)PB2 | · · | PE10(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
+ *  (LCD_EN)PE11 | · · | PD10(LCD_RS)                (BTN_EN1) PE9 | · · | PA4 (SPI1 CS)
+ *  (LCD_D4)PD9  | · ·   PD8(LCD_D5)                 (BTN_EN2) PE8 | · ·   PA7 (SPI1 MOSI)
+ *  (LCD_D6)PE15 | · · | PE7(LCD_D7)                (SPI1_RS) PB11 | · · | RESET
+ *           GND | · · | 5V                                    GND | · · | 3.3V
+ *                ￣￣￣                                             ￣￣￣
+ *                EXP1                                               EXP2
+ */
+
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
-  #define TFT_RST_PIN                EXP1_07_PIN
-  #define TFT_A0_PIN                  TFT_DC_PIN
-
-  #define TFT_RESET_PIN              EXP1_07_PIN
-  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
-
-  #define TOUCH_BUTTONS_HW_SPI
-  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
-
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
-  #ifndef TFT_WIDTH
-    #define TFT_WIDTH                        480
-  #endif
-  #ifndef TFT_HEIGHT
-    #define TFT_HEIGHT                       320
-  #endif
-
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
-
-  #define LCD_READ_ID                       0xD3
-  #define LCD_USE_DMA_SPI
-
-  #define TFT_BUFFER_SIZE                  14400
-
   #ifndef TOUCH_CALIBRATION_X
     #define TOUCH_CALIBRATION_X           -17253
   #endif
@@ -331,10 +297,51 @@
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
   #endif
 
+  #define TFT_CS_PIN                        PE15
+  #define TFT_SCK_PIN                       PA5
+  #define TFT_MISO_PIN                      PA6
+  #define TFT_MOSI_PIN                      PA7
+  #define TFT_DC_PIN                        PE7
+  #define TFT_RST_PIN                       PD10
+  #define TFT_A0_PIN                  TFT_DC_PIN
+
+  #define TFT_RESET_PIN                     PD10
+  #define TFT_BACKLIGHT_PIN                 PE11
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
+
+  #define LCD_BACKLIGHT_PIN                 PE11
+  #ifndef TFT_WIDTH
+    #define TFT_WIDTH                        480
+  #endif
+  #ifndef TFT_HEIGHT
+    #define TFT_HEIGHT                       320
+  #endif
+
+  #define TOUCH_CS_PIN                      PD9   // SPI1_NSS
+  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
+  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
+  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
+
+  #define BTN_EN1                           PE9
+  #define BTN_EN2                           PE8
+  #define BEEPER_PIN                        PB2
+  #define BTN_ENC                           PE10
+
+  #define LCD_READ_ID                       0xD3
+  #define LCD_USE_DMA_SPI
+
+  #define TFT_BUFFER_SIZE                  14400
+
 #elif HAS_WIRED_LCD
 
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
+  #define BEEPER_PIN                        PB2
+  #define BTN_ENC                           PE10
+  #define LCD_PINS_ENABLE                   PE11
+  #define LCD_PINS_RS                       PD10
+  #define BTN_EN1                           PE9
+  #define BTN_EN2                           PE8
   #define LCD_BACKLIGHT_PIN                 -1
 
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
@@ -342,19 +349,19 @@
     //#define LCD_BACKLIGHT_PIN             -1
     //#define LCD_RESET_PIN                 -1
     #define DOGLCD_A0                       PD11
-    #define DOGLCD_CS                EXP1_04_PIN
-    //#define DOGLCD_SCK             EXP2_09_PIN
-    //#define DOGLCD_MOSI            EXP2_05_PIN
+    #define DOGLCD_CS                       PE15
+    //#define DOGLCD_SCK                    PA5
+    //#define DOGLCD_MOSI                   PA7
 
   #elif ENABLED(MKS_MINI_12864_V3)
-    #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                       PE11
+    #define DOGLCD_A0                       PD10
     #define LCD_PINS_DC                DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
+    #define LCD_RESET_PIN                   PD9
+    #define NEOPIXEL_PIN                    PD8
+    #define DOGLCD_MOSI                     PA7
+    #define DOGLCD_SCK                      PA5
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
@@ -362,24 +369,17 @@
 
   #else
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4                     PD9
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5                   PD8
+      #define LCD_PINS_D6                   PE15
+      #define LCD_PINS_D7                   PE7
     #endif
 
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             600
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
 
   #endif // !MKS_MINI_12864
 
 #endif // HAS_WIRED_LCD
-
-#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index c9762a6..eff941b 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -41,12 +41,10 @@
 // Use one of these or SDCard-based Emulation will be used
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
-#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
-  #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
-  #define I2C_SCL_PIN                       PB6
-  #define I2C_SDA_PIN                       PB7
-#endif
+#define I2C_EEPROM
+#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
+#define I2C_SCL_PIN                         PB6
+#define I2C_SDA_PIN                         PB7
 
 //
 // Release PB4 (Z_DIR_PIN) from JTAG NRST role
@@ -67,10 +65,11 @@
 #define E0_DIAG_PIN                         PC4
 #define E1_DIAG_PIN                         PE7
 
-#define X_STOP_PIN                    X_DIAG_PIN
-#define Y_STOP_PIN                    Y_DIAG_PIN
-#define Z_MIN_PIN                     Z_DIAG_PIN
-#define Z_MAX_PIN                    E0_DIAG_PIN
+//
+#define X_STOP_PIN                          PA15
+#define Y_STOP_PIN                          PD2
+#define Z_MIN_PIN                           PC8
+#define Z_MAX_PIN                           PC4
 
 //
 // Steppers
@@ -135,19 +134,19 @@
   // No Hardware serial for steppers
   //
   #define X_SERIAL_TX_PIN                   PD5
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PD5
 
   #define Y_SERIAL_TX_PIN                   PD7
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PD7
 
   #define Z_SERIAL_TX_PIN                   PD4
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PD4
 
   #define E0_SERIAL_TX_PIN                  PD9
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PD9
 
   #define E1_SERIAL_TX_PIN                  PD8
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PD8
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -179,11 +178,9 @@
 //
 // Misc. Functions
 //
-#if HAS_TFT_LVGL_UI
-  #define MT_DET_1_PIN                      PA4   // MT_DET
-  #define MT_DET_2_PIN                      PE6
-  #define MT_DET_PIN_STATE                  LOW
-#endif
+#define MT_DET_1_PIN                        PA4
+#define MT_DET_2_PIN                        PE6
+#define MT_DET_PIN_INVERTING               false  // LVGL UI filament RUNOUT PIN STATE
 
 #ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN            MT_DET_1_PIN
@@ -192,29 +189,35 @@
   #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
 #endif
 
-#ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN                    PA13  // PW_DET
-#endif
-
+//
+// Enable MKSPWC support
+//
 //#define SUICIDE_PIN                       PB2
 //#define LED_PIN                           PB2
 //#define KILL_PIN                          PA2
-//#define KILL_PIN_STATE                    LOW
+//#define KILL_PIN_STATE                    HIGH
 
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
-    #undef MKS_PWC
-    #define SUICIDE_PIN                     PB2
-    #define SUICIDE_PIN_STATE               LOW
-  #else
-    #define PS_ON_PIN                       PB2   // PW_OFF
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
   #endif
-  #define KILL_PIN                          PA13  // PW_DET
-  #define KILL_PIN_STATE                    HIGH
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PB2   // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA13  // PW_DET
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PB2
+  #define SUICIDE_PIN_INVERTING            false
+#endif
+
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PA13  // PW_DET
 #endif
 
 // Random Info
@@ -229,9 +232,9 @@
 
 // MKS WIFI MODULE
 #if ENABLED(MKS_WIFI_MODULE)
-  #define WIFI_IO0_PIN                      PC13
-  #define WIFI_IO1_PIN                      PC7
-  #define WIFI_RESET_PIN                    PE9
+  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
 #endif
 
 // MKS TEST
@@ -254,93 +257,43 @@
   #define SD_DETECT_PIN                     PD12
 #endif
 
-#define SPI_FLASH
-#if ENABLED(SPI_FLASH)
-  #define HAS_SPI_FLASH                        1
-  #define SPI_DEVICE                           2
-  #define SPI_FLASH_SIZE               0x1000000
-  #define SPI_FLASH_CS_PIN                  PB12
-  #define SPI_FLASH_MOSI_PIN                PC3
-  #define SPI_FLASH_MISO_PIN                PC2
-  #define SPI_FLASH_SCK_PIN                 PB13
-#endif
-
-/**
- *                ------                                     ------
- * (BEEPER)  PC5 |10  9 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 |10  9 | PA5  (SPI1 SCK)
- * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 8  7 | PE10 (SPI1 CS)
- * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)      (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
- * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 4  3 | RESET
- *           GND | 2  1 | 5V                            GND | 2  1 | 3.3V
- *                ------                                     ------
- *                 EXP1                                       EXP2
- */
-#define EXP1_03_PIN                         PD10
-#define EXP1_04_PIN                         PD11
-#define EXP1_05_PIN                         PE15
-#define EXP1_06_PIN                         PE14
-#define EXP1_07_PIN                         PC6
-#define EXP1_08_PIN                         PD13
-#define EXP1_09_PIN                         PE13
-#define EXP1_10_PIN                         PC5
-
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PE12
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PE11
-#define EXP2_07_PIN                         PE10
-#define EXP2_08_PIN                         PE8
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
-
 //
-// SPI SD Card
+// LCD SD
 //
 #if SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SDSS                              PE10
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PE12
 #endif
 
 //
 // LCD / Controller
-//
+#define SPI_FLASH
+#define HAS_SPI_FLASH                          1
+#define SPI_DEVICE                             2
+#define SPI_FLASH_SIZE                 0x1000000
+#if ENABLED(SPI_FLASH)
+  #define W25QXX_CS_PIN                     PB12
+  #define W25QXX_MOSI_PIN                   PC3
+  #define W25QXX_MISO_PIN                   PC2
+  #define W25QXX_SCK_PIN                    PB13
+#endif
+
+/**
+ *                _____                                             _____
+ *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
+ *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
+ *  (LCD_D4)PE14 | · ·   PE15(LCD_D5)               (BTN_EN2) PE11 | · ·   PA7 (SPI1 MOSI)
+ *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI1_RS) PE12 | · · | RESET
+ *           GND | · · | 5V                                    GND | · · | 3.3V
+ *                ￣￣￣                                             ￣￣￣
+ *                EXP1                                               EXP2
+ */
+
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
-  #define TFT_RST_PIN                EXP1_07_PIN
-  #define TFT_A0_PIN                  TFT_DC_PIN
-
-  #define TFT_RESET_PIN              EXP1_07_PIN
-  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
-
-  #define TOUCH_BUTTONS_HW_SPI
-  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
-
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
-  #ifndef TFT_WIDTH
-    #define TFT_WIDTH                        480
-  #endif
-  #ifndef TFT_HEIGHT
-    #define TFT_HEIGHT                       320
-  #endif
-
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
-
-  #define LCD_READ_ID                       0xD3
-  #define LCD_USE_DMA_SPI
-
-  #define TFT_BUFFER_SIZE                  14400
-
   #ifndef TOUCH_CALIBRATION_X
     #define TOUCH_CALIBRATION_X           -17253
   #endif
@@ -357,59 +310,93 @@
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
   #endif
 
+  #define TFT_CS_PIN                        PD11
+  #define TFT_SCK_PIN                       PA5
+  #define TFT_MISO_PIN                      PA6
+  #define TFT_MOSI_PIN                      PA7
+  #define TFT_DC_PIN                        PD10
+  #define TFT_RST_PIN                       PC6
+  #define TFT_A0_PIN                  TFT_DC_PIN
+
+  #define TFT_RESET_PIN                     PC6
+  #define TFT_BACKLIGHT_PIN                 PD13
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
+
+  #define LCD_BACKLIGHT_PIN                 PD13
+  #ifndef TFT_WIDTH
+    #define TFT_WIDTH                        480
+  #endif
+  #ifndef TFT_HEIGHT
+    #define TFT_HEIGHT                       320
+  #endif
+
+  #define TOUCH_CS_PIN                      PE14  // SPI1_NSS
+  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
+  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
+  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
+
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE11
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PE13
+
+  #define LCD_READ_ID                       0xD3
+  #define LCD_USE_DMA_SPI
+
+  #define TFT_BUFFER_SIZE                  14400
+
 #elif HAS_WIRED_LCD
 
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PE13
+  #define LCD_PINS_ENABLE                   PD13
+  #define LCD_PINS_RS                       PC6
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE11
   #define LCD_BACKLIGHT_PIN                 -1
 
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
   #if ENABLED(MKS_MINI_12864)
     //#define LCD_BACKLIGHT_PIN             -1
     //#define LCD_RESET_PIN                 -1
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    //#define DOGLCD_SCK             EXP2_09_PIN
-    //#define DOGLCD_MOSI            EXP2_05_PIN
+    #define DOGLCD_A0                       PD11
+    #define DOGLCD_CS                       PE15
+    //#define DOGLCD_SCK                    PA5
+    //#define DOGLCD_MOSI                   PA7
 
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
     //#undef SHOW_BOOTSCREEN
 
   #elif ENABLED(MKS_MINI_12864_V3)
-    #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                       PD13
+    #define DOGLCD_A0                       PC6
     #define LCD_PINS_DC                DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
+    #define LCD_RESET_PIN                   PE14
+    #define NEOPIXEL_PIN                    PE15
+    #define DOGLCD_MOSI                     PA7
+    #define DOGLCD_SCK                      PA5
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-    //#define LCD_SCREEN_ROT_180
+	//#define LCD_SCREEN_ROT_180
 
-  #else                                           // !MKS_MINI_12864
+  #else // !MKS_MINI_12864
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4                     PE14
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5                   PE15
+      #define LCD_PINS_D6                   PD11
+      #define LCD_PINS_D7                   PD10
     #endif
 
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             600
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
 
   #endif // !MKS_MINI_12864
 
 #endif // HAS_WIRED_LCD
-
-#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 46dec71..2e47f98 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -147,20 +147,24 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
+
   #define X_SERIAL_TX_PIN                   PD5
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PD5
 
   #define Y_SERIAL_TX_PIN                   PD7
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PD7
 
   #define Z_SERIAL_TX_PIN                   PD4
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PD4
 
   #define E0_SERIAL_TX_PIN                  PD9
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PD9
 
   #define E1_SERIAL_TX_PIN                  PD8
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PD8
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -191,18 +195,18 @@
 //
 // Misc. Functions
 //
-//#define POWER_LOSS_PIN                    PA2   // PW_DET
 //#define PS_ON_PIN                         PA3   // PW_OFF
 
 //
 // Power Supply Control
 //
-#if ENABLED(MKS_PWC)
-  #define SUICIDE_PIN                       PB2
-  #define KILL_PIN                          PA2
-  #define KILL_PIN_STATE                    LOW
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  //#define SUICIDE_PIN                     PB2   // LED
+  //#define KILL_PIN                        PA2   // PW_DET
+  //#define KILL_PIN_STATE                  HIGH
 #else
-  #define LED_PIN                           PB2
+  //#define POWER_LOSS_PIN                  PA2   // PW_DET
+  //#define LED_PIN                         PB2
 #endif
 
 #ifndef SDCARD_CONNECTION
@@ -215,8 +219,8 @@
 // Onboard SD card
 // NOT compatible with LCD
 //
-// Detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
-#if SD_CONNECTION_IS(ONBOARD)
+// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
   #if USE_NEW_SPI_API
     #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
   #else
@@ -230,60 +234,44 @@
   #define SD_DETECT_PIN                     PD12
 #endif
 
-/**               ------                                      ------
- * (BEEPER) PC5  |10  9 | PE13 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5  (SPI1 SCK)
- * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)       (BTN_EN1) PE8  | 8  7 | PE10 (SPI1 CS)
- * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)       (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
- * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)       (SPI DET) PE12 | 4  3 | RESET
- *           GND | 2  1 | 5V                             GND | 2  1 | 3.3V
- *                ------                                      ------
- *                 EXP1                                        EXP2
- */
-#define EXP1_03_PIN                     PD10
-#define EXP1_04_PIN                     PD11
-#define EXP1_05_PIN                     PE15
-#define EXP1_06_PIN                     PE14
-#define EXP1_07_PIN                     PC6
-#define EXP1_08_PIN                     PD13
-#define EXP1_09_PIN                     PE13
-#define EXP1_10_PIN                     PC5
-
-#define EXP2_03_PIN                     -1    // RESET
-#define EXP2_04_PIN                     PE12
-#define EXP2_05_PIN                     PA7
-#define EXP2_06_PIN                     PE11
-#define EXP2_07_PIN                     PE10
-#define EXP2_08_PIN                     PE8
-#define EXP2_09_PIN                     PA5
-#define EXP2_10_PIN                     PA6
-
+/*
 //
 // LCD SD
 //
-/*
-#if SD_CONNECTION_IS(LCD)
+#if SDCARD_CONNECTION == LCD
   #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SDSS                              PE10
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PE12
 #endif
 */
 
 //
 // LCD / Controller
 #define SPI_FLASH
-#define HAS_SPI_FLASH                          1
+#define HAS_SPI_FLASH 1
 #define SPI_DEVICE                             2
 #define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)
-  #define SPI_FLASH_CS_PIN                  PB12
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
+  #define W25QXX_CS_PIN                     PB12
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif
 
+/**
+ *                _____                                             _____
+ *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
+ *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
+ *  (LCD_D4)PE14 | · · | PE15(LCD_D5)               (BTN_EN2) PE11 | · · | PA7 (SPI1 MOSI)
+ *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI DET) PE12 | · · | RESET
+ *           GND | · · | 5V                                    GND | · · | 3.3V
+ *                ￣￣￣                                             ￣￣￣
+ *                EXP1                                               EXP2
+ */
+
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
   #ifndef TOUCH_CALIBRATION_X
     #define TOUCH_CALIBRATION_X           -17253
@@ -301,21 +289,21 @@
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
   #endif
 
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
-  #define TFT_RST_PIN                EXP1_07_PIN
+  #define TFT_CS_PIN                        PD11
+  #define TFT_SCK_PIN                       PA5
+  #define TFT_MISO_PIN                      PA6
+  #define TFT_MOSI_PIN                      PA7
+  #define TFT_DC_PIN                        PD10
+  #define TFT_RST_PIN                       PC6
   #define TFT_A0_PIN                  TFT_DC_PIN
 
-  #define TFT_RESET_PIN              EXP1_07_PIN
-  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
+  #define TFT_RESET_PIN                     PC6
+  #define TFT_BACKLIGHT_PIN                 PD13
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
 
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define LCD_BACKLIGHT_PIN                 PD13
   #ifndef TFT_WIDTH
     #define TFT_WIDTH                        480
   #endif
@@ -323,15 +311,15 @@
     #define TFT_HEIGHT                       320
   #endif
 
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+  #define TOUCH_CS_PIN                      PE14  // SPI1_NSS
+  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
+  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
+  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE11
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PE13
 
   #define LCD_READ_ID                       0xD3
   #define LCD_USE_DMA_SPI
@@ -341,22 +329,22 @@
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PE13
+  #define LCD_PINS_ENABLE                   PD13
+  #define LCD_PINS_RS                       PC6
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE11
   #define LCD_BACKLIGHT_PIN                 -1
 
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
   #if ENABLED(MKS_MINI_12864)
     //#define LCD_BACKLIGHT_PIN             -1
     //#define LCD_RESET_PIN                 -1
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    //#define DOGLCD_SCK             EXP2_09_PIN
-    //#define DOGLCD_MOSI            EXP2_05_PIN
+    #define DOGLCD_A0                       PD11
+    #define DOGLCD_CS                       PE15
+    //#define DOGLCD_SCK                    PA5
+    //#define DOGLCD_MOSI                   PA7
 
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
@@ -364,16 +352,22 @@
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4                     PE14
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5                   PE15
+      #define LCD_PINS_D6                   PD11
+      #define LCD_PINS_D7                   PD10
     #endif
 
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             600
+    #ifndef ST7920_DELAY_1
+    #define ST7920_DELAY_1          DELAY_NS(96)
+    #endif
+    #ifndef ST7920_DELAY_2
+      #define ST7920_DELAY_2        DELAY_NS(48)
+    #endif
+    #ifndef ST7920_DELAY_3
+      #define ST7920_DELAY_3       DELAY_NS(600)
+    #endif
 
   #endif // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
index f207345..a60a278 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
@@ -51,6 +51,7 @@
 #if MB(RUMBA32_V1_1)
 
   #define SERVO0_PIN                        PA15
+  #undef BTN_PIN
 
   #if HAS_TMC_UART
     //
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
index 0b53941..4dce7b7 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
@@ -67,6 +67,9 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PA3
   #define X_SERIAL_RX_PIN                   PC14
 
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index 4c0e351..7bf1488 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -134,6 +134,7 @@
 // Misc. Functions
 //
 #define LED_PIN                             PB14
+#define BTN_PIN                             PC10
 #define PS_ON_PIN                           PE11
 #define KILL_PIN                            PC5
 
@@ -167,13 +168,20 @@
     #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
       #define BTN_ENC_EN             LCD_PINS_D7  // Detect the presence of the encoder
     #endif
+
   #endif
 
-#endif // HAS_WIRED_LCD
+  // Alter timing for graphical display
+  #if HAS_MARLINUI_U8GLIB
+    #ifndef BOARD_ST7920_DELAY_1
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_2
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #endif
+    #ifndef BOARD_ST7920_DELAY_3
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
+    #endif
+  #endif
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                96
-  #define BOARD_ST7920_DELAY_2                48
-  #define BOARD_ST7920_DELAY_3               640
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 7ccb57e..5f8ffe9 100644
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#pragma once
 
 // Source: https://github.com/stm32duino/Arduino_Core_STM32/blob/master/variants/ST3DP001_EVAL/variant.cpp
 
@@ -39,6 +38,8 @@
  *          C Runtime Library: "newlib Nano (default)"
  */
 
+#pragma once
+
 #include "env_validate.h"
 
 #ifndef MACHINE_NAME
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index f936df2..9d122c2 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -182,9 +182,15 @@
   #define BTN_ENC                           PB12
 #endif
 
-// Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1                96
-  #define BOARD_ST7920_DELAY_2                48
-  #define BOARD_ST7920_DELAY_3               715
+//
+// ST7920 Delays
+//
+#ifndef BOARD_ST7920_DELAY_1
+  #define BOARD_ST7920_DELAY_1      DELAY_NS(96)
+#endif
+#ifndef BOARD_ST7920_DELAY_2
+  #define BOARD_ST7920_DELAY_2      DELAY_NS(48)
+#endif
+#ifndef BOARD_ST7920_DELAY_3
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
 #endif
diff --git a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
index c41b5ab..5e50548 100644
--- a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
+++ b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
@@ -130,16 +130,16 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PB9
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PB9
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PE3
 
   #define Z_SERIAL_TX_PIN                   PE12
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PE12
 
-  #define E0_SERIAL_TX_PIN                  PG9
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E_SERIAL_TX_PIN                   PG9
+  #define E_SERIAL_RX_PIN                   PG9
 #endif
 
 //
@@ -191,7 +191,7 @@
   #define BTN_EN1                           PF13  // BTN_EN1
   #define BTN_EN2                           PE9   // BTN_EN2
 
-  #define BOARD_ST7920_DELAY_1               125
-  #define BOARD_ST7920_DELAY_2                63
-  #define BOARD_ST7920_DELAY_3               780
+  #define BOARD_ST7920_DELAY_1  DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2  DELAY_NS(63)
+  #define BOARD_ST7920_DELAY_3  DELAY_NS(780)
 #endif
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index 991c611..d85bbf7 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -131,20 +131,23 @@
   //#define E6_HARDWARE_SERIAL Serial1
   //#define E7_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PG10
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+  #define X_SERIAL_RX_PIN                   PG10
 
   #define Y_SERIAL_TX_PIN                   PD4
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN                   PD4
 
   #define Z_SERIAL_TX_PIN                   PD5
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN                   PD5
 
   #define E0_SERIAL_TX_PIN                  PI8
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN                  PI8
 
   #define E1_SERIAL_TX_PIN                  PC8
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+  #define E1_SERIAL_RX_PIN                  PC8
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 76b98cc..539a3bb 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -245,9 +245,9 @@
     //#define MISO                            23  //         13               B3                ICSP-06             EXP2-05
 
     // Alter timing for graphical display
-    #define BOARD_ST7920_DELAY_1           313
-    #define BOARD_ST7920_DELAY_2           313
-    #define BOARD_ST7920_DELAY_3           313
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(313)
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(313)
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(313)
 
   #else
 
diff --git a/Marlin/src/sd/SdFile.h b/Marlin/src/sd/SdFile.h
index 1ff0582..1691898 100644
--- a/Marlin/src/sd/SdFile.h
+++ b/Marlin/src/sd/SdFile.h
@@ -33,6 +33,7 @@
 #include "SdBaseFile.h"
 
 #include <stdint.h>
+#include <string.h>
 
 /**
  * \class SdFile
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 9f8aac6..c0bc81a 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -33,8 +33,6 @@
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #include "../module/planner.h"        // for synchronize
@@ -379,7 +377,7 @@ void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=fa
       // Go to the next segment
       while (path[++i]) { }
 
-      //SERIAL_ECHOLNPGM("Looking for segment: ", segment);
+      //SERIAL_ECHOLNPAIR("Looking for segment: ", segment);
 
       // Find the item, setting the long filename
       diveDir.rewind();
@@ -399,7 +397,7 @@ void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=fa
       if (!dir.open(&diveDir, segment, O_READ)) {
         SERIAL_EOL();
         SERIAL_ECHO_START();
-        SERIAL_ECHOPGM(STR_SD_CANT_OPEN_SUBDIR, segment);
+        SERIAL_ECHOPAIR(STR_SD_CANT_OPEN_SUBDIR, segment);
         break;
       }
 
@@ -475,7 +473,7 @@ void CardReader::manage_media() {
   uint8_t stat = uint8_t(IS_SD_INSERTED());
   if (stat == prev_stat) return;
 
-  DEBUG_ECHOLNPGM("SD: Status changed from ", prev_stat, " to ", stat);
+  DEBUG_ECHOLNPAIR("SD: Status changed from ", prev_stat, " to ", stat);
 
   flag.workDirIsRoot = true;          // Return to root on mount/release
 
@@ -566,7 +564,7 @@ void CardReader::startOrResumeFilePrinting() {
 //
 void CardReader::endFilePrintNow(TERN_(SD_RESORT, const bool re_sort/*=false*/)) {
   TERN_(ADVANCED_PAUSE_FEATURE, did_pause_print = 0);
-  TERN_(HAS_DWIN_E3V2_BASIC, HMI_flag.print_finish = flag.sdprinting);
+  TERN_(DWIN_CREALITY_LCD, HMI_flag.print_finish = flag.sdprinting);
   flag.abort_sd_printing = false;
   if (isFileOpen()) file.close();
   TERN_(SD_RESORT, if (re_sort) presort());
@@ -606,7 +604,7 @@ void CardReader::getAbsFilenameInCWD(char *dst) {
 }
 
 void openFailed(const char * const fname) {
-  SERIAL_ECHOLNPGM(STR_SD_OPEN_FILE_FAIL, fname, ".");
+  SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, fname, ".");
 }
 
 void announceOpen(const uint8_t doing, const char * const path) {
@@ -615,7 +613,7 @@ void announceOpen(const uint8_t doing, const char * const path) {
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Now ");
     SERIAL_ECHOPGM_P(doing == 1 ? PSTR("doing") : PSTR("fresh"));
-    SERIAL_ECHOLNPGM(" file: ", path);
+    SERIAL_ECHOLNPAIR(" file: ", path);
   }
 }
 
@@ -678,7 +676,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
 
     { // Don't remove this block, as the PORT_REDIRECT is a RAII
       PORT_REDIRECT(SerialMask::All);
-      SERIAL_ECHOLNPGM(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
+      SERIAL_ECHOLNPAIR(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
       SERIAL_ECHOLNPGM(STR_SD_FILE_SELECTED);
     }
 
@@ -690,7 +688,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
 }
 
 inline void echo_write_to_file(const char * const fname) {
-  SERIAL_ECHOLNPGM(STR_SD_WRITE_TO_FILE, fname);
+  SERIAL_ECHOLNPAIR(STR_SD_WRITE_TO_FILE, fname);
 }
 
 //
@@ -730,7 +728,7 @@ void CardReader::openFileWrite(const char * const path) {
 bool CardReader::fileExists(const char * const path) {
   if (!isMounted()) return false;
 
-  DEBUG_ECHOLNPGM("fileExists: ", path);
+  DEBUG_ECHOLNPAIR("fileExists: ", path);
 
   // Dive to the file's directory and get the base name
   SdFile *diveDir = nullptr;
@@ -762,21 +760,21 @@ void CardReader::removeFile(const char * const name) {
   if (!fname) return;
 
   #if ENABLED(SDCARD_READONLY)
-    SERIAL_ECHOLNPGM("Deletion failed (read-only), File: ", fname, ".");
+    SERIAL_ECHOLNPAIR("Deletion failed (read-only), File: ", fname, ".");
   #else
     if (file.remove(itsDirPtr, fname)) {
-      SERIAL_ECHOLNPGM("File deleted:", fname);
+      SERIAL_ECHOLNPAIR("File deleted:", fname);
       sdpos = 0;
       TERN_(SDCARD_SORT_ALPHA, presort());
     }
     else
-      SERIAL_ECHOLNPGM("Deletion failed, File: ", fname, ".");
+      SERIAL_ECHOLNPAIR("Deletion failed, File: ", fname, ".");
   #endif
 }
 
 void CardReader::report_status() {
   if (isPrinting()) {
-    SERIAL_ECHOPGM(STR_SD_PRINTING_BYTE, sdpos);
+    SERIAL_ECHOPAIR(STR_SD_PRINTING_BYTE, sdpos);
     SERIAL_CHAR('/');
     SERIAL_ECHOLN(filesize);
   }
@@ -924,12 +922,12 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
   // Parsing the path string
   const char *atom_ptr = path;
 
-  DEBUG_ECHOLNPGM(" path = '", path, "'");
+  DEBUG_ECHOLNPAIR(" path = '", path, "'");
 
   if (path[0] == '/') {               // Starting at the root directory?
     inDirPtr = &root;
     atom_ptr++;
-    DEBUG_ECHOLNPGM(" CWD to root: ", hex_address((void*)inDirPtr));
+    DEBUG_ECHOLNPAIR(" CWD to root: ", hex_address((void*)inDirPtr));
     if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
   }
   else
@@ -937,7 +935,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
   startDirPtr = inDirPtr;
 
-  DEBUG_ECHOLNPGM(" startDirPtr = ", hex_address((void*)startDirPtr));
+  DEBUG_ECHOLNPAIR(" startDirPtr = ", hex_address((void*)startDirPtr));
 
   while (atom_ptr) {
     // Find next subdirectory delimiter
@@ -954,7 +952,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
     if (echo) SERIAL_ECHOLN(dosSubdirname);
 
-    DEBUG_ECHOLNPGM(" sub = ", hex_address((void*)sub));
+    DEBUG_ECHOLNPAIR(" sub = ", hex_address((void*)sub));
 
     // Open inDirPtr (closing first)
     sub->close();
@@ -966,24 +964,24 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
     // Close inDirPtr if not at starting-point
     if (inDirPtr != startDirPtr) {
-      DEBUG_ECHOLNPGM(" closing inDirPtr: ", hex_address((void*)inDirPtr));
+      DEBUG_ECHOLNPAIR(" closing inDirPtr: ", hex_address((void*)inDirPtr));
       inDirPtr->close();
     }
 
     // inDirPtr now subDir
     inDirPtr = sub;
-    DEBUG_ECHOLNPGM(" inDirPtr = sub: ", hex_address((void*)inDirPtr));
+    DEBUG_ECHOLNPAIR(" inDirPtr = sub: ", hex_address((void*)inDirPtr));
 
     // Update workDirParents and workDirDepth
     if (update_cwd) {
-      DEBUG_ECHOLNPGM(" update_cwd");
+      DEBUG_ECHOLNPAIR(" update_cwd");
       if (workDirDepth < MAX_DIR_DEPTH)
         workDirParents[workDirDepth++] = *inDirPtr;
     }
 
     // Point sub at the other scratch object
     sub = (inDirPtr != &newDir1) ? &newDir1 : &newDir2;
-    DEBUG_ECHOLNPGM(" swapping sub = ", hex_address((void*)sub));
+    DEBUG_ECHOLNPAIR(" swapping sub = ", hex_address((void*)sub));
 
     // Next path atom address
     atom_ptr = name_end + 1;
@@ -991,12 +989,12 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
   if (update_cwd) {
     workDir = *inDirPtr;
-    DEBUG_ECHOLNPGM(" final workDir = ", hex_address((void*)inDirPtr));
+    DEBUG_ECHOLNPAIR(" final workDir = ", hex_address((void*)inDirPtr));
     flag.workDirIsRoot = (workDirDepth == 0);
     TERN_(SDCARD_SORT_ALPHA, presort());
   }
 
-  DEBUG_ECHOLNPGM(" returning string ", atom_ptr ?: "nullptr");
+  DEBUG_ECHOLNPAIR(" returning string ", atom_ptr ?: "nullptr");
   return atom_ptr;
 }
 
@@ -1138,9 +1136,9 @@ void CardReader::cdroot() {
             selectFileByIndex(i);
             SET_SORTNAME(i);
             SET_SORTSHORT(i);
-            //char out[30];
-            //sprintf_P(out, PSTR("---- %i %s %s"), i, flag.filenameIsDir ? "D" : " ", sortnames[i]);
-            //SERIAL_ECHOLN(out);
+            // char out[30];
+            // sprintf_P(out, PSTR("---- %i %s %s"), i, flag.filenameIsDir ? "D" : " ", sortnames[i]);
+            // SERIAL_ECHOLN(out);
             #if HAS_FOLDER_SORTING
               const uint16_t bit = i & 0x07, ind = i >> 3;
               if (bit == 0) isDir[ind] = 0x00;
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index 5991a9f..1975418 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -34,9 +34,9 @@
 #define USB_STARTUP_DELAY 0
 
 // uncomment to get 'printf' console debugging. NOT FOR UNO!
-//#define HOST_DEBUG(...)     {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPGM("UHS:",s);}
-//#define BS_HOST_DEBUG(...)  {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPGM("UHS:",s);}
-//#define MAX_HOST_DEBUG(...) {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPGM("UHS:",s);}
+//#define HOST_DEBUG(...)     {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPAIR("UHS:",s);}
+//#define BS_HOST_DEBUG(...)  {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPAIR("UHS:",s);}
+//#define MAX_HOST_DEBUG(...) {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPAIR("UHS:",s);}
 
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
 
@@ -170,7 +170,7 @@ void DiskIODriver_USBFlash::idle() {
           UHS_USB_DEBUG(CONFIGURING_DONE);
           UHS_USB_DEBUG(RUNNING);
           default:
-            SERIAL_ECHOLNPGM("UHS_USB_HOST_STATE: ", task_state);
+            SERIAL_ECHOLNPAIR("UHS_USB_HOST_STATE: ", task_state);
             break;
         }
       }
@@ -273,14 +273,14 @@ bool DiskIODriver_USBFlash::init(const uint8_t, const pin_t) {
   #if USB_DEBUG >= 1
   const uint32_t sectorSize = bulk.GetSectorSize(0);
   if (sectorSize != 512) {
-    SERIAL_ECHOLNPGM("Expecting sector size of 512. Got: ", sectorSize);
+    SERIAL_ECHOLNPAIR("Expecting sector size of 512. Got: ", sectorSize);
     return false;
   }
   #endif
 
   #if USB_DEBUG >= 3
     lun0_capacity = bulk.GetCapacity(0);
-    SERIAL_ECHOLNPGM("LUN Capacity (in blocks): ", lun0_capacity);
+    SERIAL_ECHOLNPAIR("LUN Capacity (in blocks): ", lun0_capacity);
   #endif
   return true;
 }
@@ -299,11 +299,11 @@ bool DiskIODriver_USBFlash::readBlock(uint32_t block, uint8_t *dst) {
   if (!isInserted()) return false;
   #if USB_DEBUG >= 3
     if (block >= lun0_capacity) {
-      SERIAL_ECHOLNPGM("Attempt to read past end of LUN: ", block);
+      SERIAL_ECHOLNPAIR("Attempt to read past end of LUN: ", block);
       return false;
     }
     #if USB_DEBUG >= 4
-      SERIAL_ECHOLNPGM("Read block ", block);
+      SERIAL_ECHOLNPAIR("Read block ", block);
     #endif
   #endif
   return bulk.Read(0, block, 512, 1, dst) == 0;
@@ -313,11 +313,11 @@ bool DiskIODriver_USBFlash::writeBlock(uint32_t block, const uint8_t *src) {
   if (!isInserted()) return false;
   #if USB_DEBUG >= 3
     if (block >= lun0_capacity) {
-      SERIAL_ECHOLNPGM("Attempt to write past end of LUN: ", block);
+      SERIAL_ECHOLNPAIR("Attempt to write past end of LUN: ", block);
       return false;
     }
     #if USB_DEBUG >= 4
-      SERIAL_ECHOLNPGM("Write block ", block);
+      SERIAL_ECHOLNPAIR("Write block ", block);
     #endif
   #endif
   return bulk.Write(0, block, 512, 1, src) == 0;
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt b/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
index 4e9bd84..5abcc8f 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
@@ -40,4 +40,7 @@ under the "MIT" license, as documented here:
 
 ==== MARLIN INTEGRATION WORK ====
 
-All additional work done to integrate USB into Marlin was performed by LulzBot and is licensed under the GPLv3.
+All additional work done to integrate USB into Marlin was performed by AlephObjects, Inc.
+and is licensed under the GPLv3.
+
+-- marcio@alephobjects.com
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h b/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h
index f7eb9ad..6cad39d 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h
@@ -67,7 +67,7 @@
 
 #define rCPUCTL     0x80    //16<<3
 /* CPUCTL Bits  */
-#define bmPULSEWID1 0x80    //b7
+#define bmPUSLEWID1 0x80    //b7
 #define bmPULSEWID0 0x40    //b6
 #define bmIE        0x01    //b0
 
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
index a1a3b7d..4ee206b 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
@@ -121,7 +121,7 @@ bool MAX3421e::start() {
 
   const uint8_t revision = regRd(rREVISION);
   if (revision == 0x00 || revision == 0xFF) {
-    SERIAL_ECHOLNPGM("Revision register appears incorrect on MAX3421e initialization. Got ", revision);
+    SERIAL_ECHOLNPAIR("Revision register appears incorrect on MAX3421e initialization. Got ", revision);
     return false;
   }
 
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt b/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
index 378786f..710b3f2 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
@@ -16,7 +16,7 @@ usb_flashdrive/lib        github.com/felis/UHS30         GPLv2 or later
 ==== MARLIN INTEGRATION WORK ====
 
 All additional work done to integrate USB into Marlin was performed by
-LulzBot and is licensed under the GPLv3.
+AlephObjects, Inc. and is licensed under the GPLv3.
 
 This version of UHS3 has been modified for better compatibility with Marlin.
 The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to
@@ -27,3 +27,5 @@ IRQ.
 
 SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with
 certain devices.
+
+-- marcio@alephobjects.com
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h
index 841cc8f..8ecafd4 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h
@@ -59,19 +59,19 @@ e-mail   :  support@circuitsathome.com
 
 // (CPUCTL)
 #define         rCPUCTL 0x80            //16<<3
-#define     bmPULSEWID1 0x80            //b7
+#define     bmPUSLEWID1 0x80            //b7
 #define     bmPULSEWID0 0x40            //b6
 #define            bmIE 0x01            //b0
 
-// bmPULSEWID1 bmPULSEWID0 Pulse width
+// bmPUSLEWID1 bmPULSEWID0 Pulse width
 // 0           0           10.6uS
 // 0           1            5.3uS
 // 1           0            2.6uS
 // 1           1            1.3uS
-#define  PULSEWIDTH10_6 (0)
-#define   PULSEWIDTH5_3 (bmPULSEWID0)
-#define   PULSEWIDTH2_6 (bmPULSEWID1)
-#define   PULSEWIDTH1_3 (bmPULSEWID0 | bmPULSEWID1)
+#define  PUSLEWIDTH10_6 (0)
+#define   PUSLEWIDTH5_3 (bmPULSEWID0)
+#define   PUSLEWIDTH2_6 (bmPUSLEWID1)
+#define   PUSLEWIDTH1_3 (bmPULSEWID0 | bmPUSLEWID1)
 
 // (PINCTL)
 #define         rPINCTL 0x88            //17<<3
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h
index 79c06a4..7d17d62 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h
@@ -272,11 +272,11 @@ e-mail   :  support@circuitsathome.com
 //
 #define IRQ_SENSE FALLING
 #ifdef ARDUINO_ARCH_PIC32
-//#define bmPULSEWIDTH PULSEWIDTH10_6
+//#define bmPULSEWIDTH PUSLEWIDTH10_6
 #define bmPULSEWIDTH 0
 #define bmIRQ_SENSE 0
 #else
-#define bmPULSEWIDTH PULSEWIDTH1_3
+#define bmPULSEWIDTH PUSLEWIDTH1_3
 #define bmIRQ_SENSE 0
 #endif
 #else