diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 34f089c872..48d137d2ff 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3564,8 +3564,18 @@
       #define SPINDLE_LASER_POWERDOWN_DELAY   50 // (ms) Delay to allow the spindle to stop
 
     #endif
+
+    //
+    // Laser I2C Ammeter (High precision INA226 low/high side module)
+    //
+    //#define I2C_AMMETER
+    #if ENABLED(I2C_AMMETER)
+      #define I2C_AMMETER_IMAX            0.1    // (Amps) Calibration value for the expected current range
+      #define I2C_AMMETER_SHUNT_RESISTOR  0.1    // (Ohms) Calibration shunt resistor value
+    #endif
+
   #endif
-#endif
+#endif // SPINDLE_FEATURE || LASER_FEATURE
 
 /**
  * Synchronous Laser Control with M106/M107
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index e24b923ef0..a5896a0e97 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -186,7 +186,7 @@ inline void HAL_adc_init() {
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-#define HAL_SENSITIVE_PINS 0, 1
+#define HAL_SENSITIVE_PINS 0, 1,
 
 #ifdef __AVR_AT90USB1286__
   #define JTAG_DISABLE() do{ MCUCR = 0x80; MCUCR = 0x80; }while(0)
diff --git a/Marlin/src/HAL/LINUX/include/pinmapping.cpp b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
index 870ab3a96e..5823668cd5 100644
--- a/Marlin/src/HAL/LINUX/include/pinmapping.cpp
+++ b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
@@ -25,43 +25,6 @@
 
 #include "../../../gcode/parser.h"
 
-uint8_t analog_offset = NUM_DIGITAL_PINS - NUM_ANALOG_INPUTS;
-
-// Get the digital pin for an analog index
-pin_t analogInputToDigitalPin(const int8_t p) {
-  return (WITHIN(p, 0, NUM_ANALOG_INPUTS) ? analog_offset + p : P_NC);
-}
-
-// Return the index of a pin number
-int16_t GET_PIN_MAP_INDEX(const pin_t pin) {
-  return pin;
-}
-
-// Test whether the pin is valid
-bool VALID_PIN(const pin_t p) {
-  return WITHIN(p, 0, NUM_DIGITAL_PINS);
-}
-
-// Get the analog index for a digital pin
-int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p) {
-  return (WITHIN(p, analog_offset, NUM_DIGITAL_PINS) ? p - analog_offset : P_NC);
-}
-
-// Test whether the pin is PWM
-bool PWM_PIN(const pin_t p) {
-  return false;
-}
-
-// Test whether the pin is interruptable
-bool INTERRUPT_PIN(const pin_t p) {
-  return false;
-}
-
-// Get the pin number at the given index
-pin_t GET_PIN_MAP_PIN(const int16_t ind) {
-  return ind;
-}
-
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return parser.intval(code, dval);
 }
diff --git a/Marlin/src/HAL/LINUX/include/pinmapping.h b/Marlin/src/HAL/LINUX/include/pinmapping.h
index 98f4b812e8..3751ae0027 100644
--- a/Marlin/src/HAL/LINUX/include/pinmapping.h
+++ b/Marlin/src/HAL/LINUX/include/pinmapping.h
@@ -34,26 +34,32 @@ constexpr uint8_t NUM_ANALOG_INPUTS = 16;
 
 #define HAL_SENSITIVE_PINS
 
+constexpr uint8_t analog_offset = NUM_DIGITAL_PINS - NUM_ANALOG_INPUTS;
+
 // Get the digital pin for an analog index
-pin_t analogInputToDigitalPin(const int8_t p);
-
-// Return the index of a pin number
-int16_t GET_PIN_MAP_INDEX(const pin_t pin);
-
-// Test whether the pin is valid
-bool VALID_PIN(const pin_t p);
+constexpr pin_t analogInputToDigitalPin(const int8_t p) {
+  return (WITHIN(p, 0, NUM_ANALOG_INPUTS) ? analog_offset + p : P_NC);
+}
 
 // Get the analog index for a digital pin
-int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p);
+constexpr int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p) {
+  return (WITHIN(p, analog_offset, NUM_DIGITAL_PINS) ? p - analog_offset : P_NC);
+}
+
+// Return the index of a pin number
+constexpr int16_t GET_PIN_MAP_INDEX(const pin_t pin) { return pin; }
+
+// Test whether the pin is valid
+constexpr bool VALID_PIN(const pin_t p) { return WITHIN(p, 0, NUM_DIGITAL_PINS); }
 
 // Test whether the pin is PWM
-bool PWM_PIN(const pin_t p);
+constexpr bool PWM_PIN(const pin_t p) { return false; }
 
 // Test whether the pin is interruptable
-bool INTERRUPT_PIN(const pin_t p);
+constexpr bool INTERRUPT_PIN(const pin_t p) { return false; }
 
 // Get the pin number at the given index
-pin_t GET_PIN_MAP_PIN(const int16_t ind);
+constexpr pin_t GET_PIN_MAP_PIN(const int16_t ind) { return ind; }
 
 // Parse a G-code word into a pin index
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index 85e8933920..3f9cd2dfbd 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -198,7 +198,7 @@ constexpr pin_t GET_PIN_MAP_PIN(const int16_t index) {
 // Parse a G-code word into a pin index
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 // P0.6 thru P0.9 are for the onboard SD card
-#define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09
+#define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09,
 
 #define HAL_IDLETASK 1
 void HAL_idletask();
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 3d06b172bd..dfeae9e9e5 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -30,7 +30,7 @@
 
 // Better: "utility/stm32_eeprom.h", but only after updating stm32duino to 2.0.0
 // Use EEPROM.h for compatibility, for now.
-#include <EEPROM.h> 
+#include <EEPROM.h>
 
 /**
  * The STM32 HAL supports chips that deal with "pages" and some with "sectors" and some that
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
index d71a5c61b9..451c94f25d 100644
--- a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
@@ -30,3 +30,6 @@
   #undef F_CPU
   #define F_CPU BOARD_F_CPU
 #endif
+
+// The Sensitive Pins array is not optimizable
+#define RUNTIME_ONLY_ANALOG_TO_DIGITAL
diff --git a/Marlin/src/HAL/shared/eeprom_if_i2c.cpp b/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
index 27f0233562..6b559e234b 100644
--- a/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
+++ b/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
@@ -61,11 +61,24 @@ static constexpr uint8_t eeprom_device_address = I2C_ADDRESS(EEPROM_DEVICE_ADDRE
 // Public functions
 // ------------------------
 
+#define SMALL_EEPROM (MARLIN_EEPROM_SIZE <= 2048)
+
+// Combine Address high bits into the device address on <=16Kbit (2K) and >512Kbit (64K) EEPROMs.
+// Note: MARLIN_EEPROM_SIZE is specified in bytes, whereas EEPROM model numbers refer to bits.
+//       e.g., The "16" in BL24C16 indicates a 16Kbit (2KB) size.
+static uint8_t _eeprom_calc_device_address(uint8_t * const pos) {
+  const unsigned eeprom_address = (unsigned)pos;
+  return (SMALL_EEPROM || MARLIN_EEPROM_SIZE > 65536)
+    ? uint8_t(eeprom_device_address | ((eeprom_address >> (SMALL_EEPROM ? 8 : 16)) & 0x07))
+    : eeprom_device_address;
+}
+
 static void _eeprom_begin(uint8_t * const pos) {
   const unsigned eeprom_address = (unsigned)pos;
-  Wire.beginTransmission(eeprom_device_address);
-  Wire.write(int(eeprom_address >> 8));   // Address High
-  Wire.write(int(eeprom_address & 0xFF)); // Address Low
+  Wire.beginTransmission(_eeprom_calc_device_address(pos));
+  if (!SMALL_EEPROM)
+    Wire.write(uint8_t((eeprom_address >> 8) & 0xFF));  // Address High, if needed
+  Wire.write(uint8_t(eeprom_address & 0xFF));           // Address Low
 }
 
 void eeprom_write_byte(uint8_t *pos, uint8_t value) {
@@ -81,7 +94,7 @@ void eeprom_write_byte(uint8_t *pos, uint8_t value) {
 uint8_t eeprom_read_byte(uint8_t *pos) {
   _eeprom_begin(pos);
   Wire.endTransmission();
-  Wire.requestFrom(eeprom_device_address, (byte)1);
+  Wire.requestFrom(_eeprom_calc_device_address(pos), (byte)1);
   return Wire.available() ? Wire.read() : 0xFF;
 }
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 18bee54009..40e6d77c74 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -282,8 +282,15 @@ bool wait_for_heatup = true;
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnarrowing"
 
+#ifdef RUNTIME_ONLY_ANALOG_TO_DIGITAL
+  static const pin_t sensitive_pins[] PROGMEM = { SENSITIVE_PINS };
+#else
+  template <pin_t ...D>
+  constexpr pin_t OnlyPins<-2, D...>::table[sizeof...(D)];
+  #define sensitive_pins OnlyPins<SENSITIVE_PINS>::table
+#endif
+
 bool pin_is_protected(const pin_t pin) {
-  static const pin_t sensitive_pins[] PROGMEM = SENSITIVE_PINS;
   LOOP_L_N(i, COUNT(sensitive_pins)) {
     pin_t sensitive_pin;
     memcpy_P(&sensitive_pin, &sensitive_pins[i], sizeof(pin_t));
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 651df5aedf..9dc951e229 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -321,7 +321,7 @@
 #define BOARD_BTT_SKR_MINI_V1_1       4023  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_0    4024  // BigTreeTech SKR Mini E3 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4025  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
-#define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
 #define BOARD_BTT_SKR_MINI_MZ_V1_0    4027  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
 #define BOARD_BTT_SKR_E3_DIP          4028  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
 #define BOARD_BTT_SKR_CR6             4029  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
diff --git a/Marlin/src/feature/ammeter.cpp b/Marlin/src/feature/ammeter.cpp
new file mode 100644
index 0000000000..71b84f1121
--- /dev/null
+++ b/Marlin/src/feature/ammeter.cpp
@@ -0,0 +1,54 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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/>.
+ *
+ */
+
+#include "../inc/MarlinConfig.h"
+
+#if ENABLED(I2C_AMMETER)
+
+#include "ammeter.h"
+
+#ifndef I2C_AMMETER_IMAX
+  #define I2C_AMMETER_IMAX     0.500  // Calibration range 500 Milliamps
+#endif
+
+INA226 ina;
+
+Ammeter ammeter;
+
+float Ammeter::scale;
+float Ammeter::current;
+
+void Ammeter::init() {
+  ina.begin();
+  ina.configure(INA226_AVERAGES_16, INA226_BUS_CONV_TIME_1100US, INA226_SHUNT_CONV_TIME_1100US, INA226_MODE_SHUNT_BUS_CONT);
+  ina.calibrate(I2C_AMMETER_SHUNT_RESISTOR, I2C_AMMETER_IMAX);
+}
+
+float Ammeter::read() {
+  scale = 1;
+  current = ina.readShuntCurrent();
+  if (current <= 0.0001f) current = 0;  // Clean up least-significant-bit amplification errors
+  if (current < 0.1f) scale = 1000;
+  return current * scale;
+}
+
+#endif // I2C_AMMETER
diff --git a/Marlin/src/feature/ammeter.h b/Marlin/src/feature/ammeter.h
new file mode 100644
index 0000000000..86f09bb9a1
--- /dev/null
+++ b/Marlin/src/feature/ammeter.h
@@ -0,0 +1,39 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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/>.
+ *
+ */
+#pragma once
+
+#include "../inc/MarlinConfigPre.h"
+
+#include <Wire.h>
+#include <INA226.h>
+
+class Ammeter {
+private:
+  static float scale;
+
+public:
+  static float current;
+  static void init();
+  static float read();
+};
+
+extern Ammeter ammeter;
diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index 9bab2fbd2f..63f032eee8 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -24,7 +24,7 @@
 #include "../../inc/MarlinConfigPre.h"
 
 #if EITHER(RESTORE_LEVELING_AFTER_G28, ENABLE_LEVELING_AFTER_G28)
-  #define G28_L0_ENSURES_LEVELING_OFF 1
+  #define CAN_SET_LEVELING_AFTER_G28 1
 #endif
 
 #if ENABLED(PROBE_MANUALLY)
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 0fa9172fcf..55180e5390 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -88,7 +88,7 @@ typedef struct {
     uint8_t fan_speed[FAN_COUNT];
   #endif
 
-  #if ENABLED(HAS_LEVELING)
+  #if HAS_LEVELING
     float fade;
   #endif
 
@@ -120,7 +120,7 @@ typedef struct {
     bool raised:1;                // Raised before saved
     bool dryrun:1;                // M111 S8
     bool allow_cold_extrusion:1;  // M302 P1
-    #if ENABLED(HAS_LEVELING)
+    #if HAS_LEVELING
       bool leveling:1;            // M420 S
     #endif
     #if DISABLED(NO_VOLUMETRICS)
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 100b7c4b26..539fafeb34 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -34,6 +34,10 @@
   #include "../module/servo.h"
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  #include "../feature/ammeter.h"
+#endif
+
 SpindleLaser cutter;
 uint8_t SpindleLaser::power;
 #if ENABLED(LASER_FEATURE)
@@ -74,6 +78,9 @@ void SpindleLaser::init() {
   #if ENABLED(AIR_ASSIST)
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
   #endif
+  #if ENABLED(I2C_AMMETER)
+    ammeter.init();                                                   // Init I2C Ammeter
+  #endif
 }
 
 #if ENABLED(SPINDLE_LASER_PWM)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 5760667bed..729bca93a6 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -246,7 +246,7 @@ G29_TYPE GcodeSuite::G29() {
 
   // Send 'N' to force homing before G29 (internal only)
   if (parser.seen_test('N'))
-    process_subcommands_now_P(TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
+    process_subcommands_now_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
 
   // Don't allow auto-leveling without homing first
   if (homing_needed_error()) G29_RETURN(false);
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 07721330ba..055acc1ed4 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::G29() {
       mbl.reset();
       mbl_probe_index = 0;
       if (!ui.wait_for_move) {
-        queue.inject_P(parser.seen_test('N') ? PSTR("G28" TERN(G28_L0_ENSURES_LEVELING_OFF, "L0", "") "\nG29S2") : PSTR("G29S2"));
+        queue.inject_P(parser.seen_test('N') ? PSTR("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : PSTR("G29S2"));
         return;
       }
       state = MeshNext;
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 2eca66c3b0..61e7ab4233 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -242,12 +242,16 @@ void GcodeSuite::G28() {
   SET_SOFT_ENDSTOP_LOOSE(false);  // Reset a leftover 'loose' motion state
 
   // Disable the leveling matrix before homing
-  #if HAS_LEVELING
-    const bool leveling_restore_state = parser.boolval('L', TERN(RESTORE_LEVELING_AFTER_G28, planner.leveling_active, ENABLED(ENABLE_LEVELING_AFTER_G28)));
-    IF_ENABLED(PROBE_MANUALLY, g29_in_progress = false); // Cancel the active G29 session
-    set_bed_leveling_enabled(false);
+  #if CAN_SET_LEVELING_AFTER_G28
+    const bool leveling_restore_state = parser.boolval('L', TERN1(RESTORE_LEVELING_AFTER_G28, planner.leveling_active));
   #endif
 
+  // Cancel any prior G29 session
+  TERN_(PROBE_MANUALLY, g29_in_progress = false);
+
+  // Disable leveling before homing
+  TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
+
   // Reset to the XY plane
   TERN_(CNC_WORKSPACE_PLANES, workspace_plane = PLANE_XY);
 
@@ -353,13 +357,14 @@ void GcodeSuite::G28() {
 
     const float z_homing_height = parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT;
 
-    if (z_homing_height && (0 LINEAR_AXIS_GANG(|| doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
+    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_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
       TERN_(BLTOUCH, bltouch.init());
     }
 
+    // Diagonal move first if both are homing
     TERN_(QUICK_HOME, if (doX && doY) quick_home_xy());
 
     // Home Y (before X)
@@ -464,12 +469,10 @@ void GcodeSuite::G28() {
   // Clear endstop state for polled stallGuard endstops
   TERN_(SPI_ENDSTOPS, endstops.clear_endstop_state());
 
-  #if BOTH(DELTA, DELTA_HOME_TO_SAFE_ZONE)
-    // move to a height where we can use the full xy-area
-    do_blocking_move_to_z(delta_clip_start_height);
-  #endif
+  // Move to a height where we can use the full xy-area
+  TERN_(DELTA_HOME_TO_SAFE_ZONE, do_blocking_move_to_z(delta_clip_start_height));
 
-  TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_restore_state));
+  TERN_(CAN_SET_LEVELING_AFTER_G28, if (leveling_restore_state) set_bed_leveling_enabled());
 
   restore_feedrate_and_scaling();
 
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 56b1555fc4..c8efea858c 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -439,7 +439,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
       SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     #endif
-    #if LINEAR_AXES >= 4 AXIS_CAN_CALIBRATE(I)
+    #if LINEAR_AXES >= 4 && AXIS_CAN_CALIBRATE(I)
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
         SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
       #endif
@@ -447,7 +447,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 5 AXIS_CAN_CALIBRATE(J)
+    #if LINEAR_AXES >= 5 && AXIS_CAN_CALIBRATE(J)
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
         SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
       #endif
@@ -455,7 +455,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 6 AXIS_CAN_CALIBRATE(K)
+    #if LINEAR_AXES >= 6 && AXIS_CAN_CALIBRATE(K)
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
         SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
       #endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index abd7f07916..89605ee25b 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -392,7 +392,7 @@ public:
   static void process_subcommands_now(char * gcode);
 
   static inline void home_all_axes(const bool keep_leveling=false) {
-    process_subcommands_now_P(keep_leveling ? G28_STR : TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
+    process_subcommands_now_P(keep_leveling ? G28_STR : TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
   }
 
   #if EITHER(HAS_AUTO_REPORTING, HOST_KEEPALIVE_FEATURE)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index a09d80b153..c5c878a80d 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -405,6 +405,10 @@
 
 #endif
 
+#if EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008) && DISABLED(NO_LCD_DETECT)
+  #define DETECT_I2C_LCD_DEVICE 1
+#endif
+
 #ifndef STD_ENCODER_PULSES_PER_STEP
   #if ENABLED(TOUCH_SCREEN)
     #define STD_ENCODER_PULSES_PER_STEP 2
@@ -713,14 +717,19 @@
   #ifndef Z_PROBE_SERVO_NR
     #define Z_PROBE_SERVO_NR 0
   #endif
-  #undef DEACTIVATE_SERVOS_AFTER_MOVE
+  #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
+    #error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
+  #endif
 
   // Always disable probe pin inverting for BLTouch
-  #undef Z_MIN_PROBE_ENDSTOP_INVERTING
-  #define Z_MIN_PROBE_ENDSTOP_INVERTING false
+  #if Z_MIN_PROBE_ENDSTOP_INVERTING
+    #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
+  #endif
+
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
-    #undef Z_MIN_ENDSTOP_INVERTING
-    #define Z_MIN_ENDSTOP_INVERTING false
+    #if Z_MIN_ENDSTOP_INVERTING
+      #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
+    #endif
   #endif
 #endif
 
@@ -1013,6 +1022,10 @@
   #endif
 #endif
 
+#if DISABLED(DELTA)
+  #undef DELTA_HOME_TO_SAFE_ZONE
+#endif
+
 // This flag indicates some kind of jerk storage is needed
 #if EITHER(CLASSIC_JERK, IS_KINEMATIC)
   #define HAS_CLASSIC_JERK 1
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9415a53c19..b6441f8056 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2021-06-06"
+  #define STRING_DISTRIBUTION_DATE "2021-06-11"
 #endif
 
 /**
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 50c80c9fa0..0c87c3dc3f 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -50,6 +50,10 @@
   #include "../../feature/cooler.h"
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  #include "../../feature/ammeter.h"
+#endif
+
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
@@ -64,11 +68,7 @@
 
 #elif EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008)
 
-  LCD_CLASS lcd(LCD_I2C_ADDRESS
-    #ifdef DETECT_DEVICE
-      , 1
-    #endif
-  );
+  LCD_CLASS lcd(LCD_I2C_ADDRESS OPTARG(DETECT_I2C_LCD_DEVICE, 1));
 
 #elif ENABLED(LCD_I2C_TYPE_PCA8574)
 
@@ -376,11 +376,7 @@ void MarlinUI::init_lcd() {
 }
 
 bool MarlinUI::detected() {
-  return (true
-    #if EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008) && defined(DETECT_DEVICE)
-      && lcd.LcdDetected() == 1
-    #endif
-  );
+  return TERN1(DETECT_I2C_LCD_DEVICE, lcd.LcdDetected() == 1);
 }
 
 #if HAS_SLOW_BUTTONS
@@ -588,12 +584,27 @@ FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
 
 #if ENABLED(LASER_COOLANT_FLOW_METER)
   FORCE_INLINE void _draw_flowmeter_status() {
-    lcd_put_u8str("~ ");
+    lcd_put_u8str("~");
     lcd_put_u8str(ftostr11ns(cooler.flowrate));
     lcd_put_wchar('L');
   }
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  FORCE_INLINE void _draw_ammeter_status() {
+    lcd_put_u8str(" ");
+    ammeter.read();
+    if (ammeter.current <= 0.999f) {
+      lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
+      lcd_put_u8str("mA");
+    }
+    else {
+      lcd_put_u8str(ftostr12ns(ammeter.current));
+      lcd_put_wchar('A');
+    }
+  }
+#endif
+
 FORCE_INLINE void _draw_bed_status(const bool blink) {
   _draw_heater_status(H_BED, TERN0(HAS_LEVELING, blink && planner.leveling_active) ? '_' : LCD_STR_BEDTEMP[0], blink);
 }
@@ -829,12 +840,9 @@ void MarlinUI::draw_status_screen() {
         #endif
       #endif
 
-      #if HAS_COOLER
-        _draw_cooler_status('*', blink);
-      #endif
-      #if ENABLED(LASER_COOLANT_FLOW_METER)
-        _draw_flowmeter_status();
-      #endif
+      TERN_(HAS_COOLER, _draw_cooler_status('*', blink));
+      TERN_(LASER_COOLANT_FLOW_METER, _draw_flowmeter_status());
+      TERN_(I2C_AMMETER, _draw_ammeter_status());
 
     #endif // LCD_WIDTH >= 20
 
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index 61d22a28ec..6aa2bab0da 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -107,7 +107,17 @@
   #define STATUS_FLOWMETER_BYTEWIDTH BW(STATUS_FLOWMETER_WIDTH)
 #endif
 
-
+//
+// Laser Ammeter
+//
+#if ENABLED(I2C_AMMETER)
+  #if !STATUS_AMMETER_WIDTH
+    #include "status/ammeter.h"
+  #endif
+  #ifndef STATUS_AMMETER_WIDTH
+    #define STATUS_AMMETER_WIDTH 0
+  #endif
+#endif
 
 //
 // Bed
@@ -603,6 +613,31 @@
   #endif
 #endif
 
+//
+// I2C Laser Ammeter
+//
+#if ENABLED(I2C_AMMETER) && STATUS_AMMETER_WIDTH
+  #ifndef STATUS_AMMETER_BYTEWIDTH
+    #define STATUS_AMMETER_BYTEWIDTH BW(STATUS_AMMETER_WIDTH)
+  #endif
+  #ifndef STATUS_AMMETER_X
+    #define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8)
+  #endif
+  #ifndef STATUS_AMMETER_HEIGHT
+    #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH))
+  #endif
+  #ifndef STATUS_AMMETER_Y
+    #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
+  #endif
+  #ifndef STATUS_AMMETER_TEXT_X
+    #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
+  #endif
+  static_assert(
+    sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
+    "Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data."
+  );
+#endif
+
 //
 // Bed Bitmap Properties
 //
@@ -696,6 +731,9 @@
 #if ENABLED(LASER_COOLANT_FLOW_METER)
   #define DO_DRAW_FLOWMETER 1
 #endif
+#if ENABLED(I2C_AMMETER)
+  #define DO_DRAW_AMMETER 1
+#endif
 
 #if HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4
   #define DO_DRAW_CHAMBER 1
diff --git a/Marlin/src/lcd/dogm/status/ammeter.h b/Marlin/src/lcd/dogm/status/ammeter.h
new file mode 100644
index 0000000000..d99ea6949a
--- /dev/null
+++ b/Marlin/src/lcd/dogm/status/ammeter.h
@@ -0,0 +1,68 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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/>.
+ *
+ */
+#pragma once
+
+//
+// lcd/dogm/status/ammeter.h - Status Screen Laser Ammeter bitmaps
+//
+
+#define STATUS_AMMETER_WIDTH 20
+
+const unsigned char status_ammeter_bmp_mA[] PROGMEM = {
+  B00000000,B11111100,B00000000,
+  B00000011,B00000011,B00000000,
+  B00000100,B00000000,B10000000,
+  B00001000,B00000000,B01000000,
+  B00010000,B00000110,B00100000,
+  B00010000,B00001001,B00100000,
+  B00100000,B00001001,B00010000,
+  B00100011,B01001111,B00010000,
+  B11100010,B10101001,B00011100,
+  B00100010,B10101001,B00010000,
+  B00100010,B10101001,B00010000,
+  B00010000,B00000000,B00100000,
+  B00010000,B00000000,B00100000,
+  B00001000,B00000000,B01000000,
+  B00000100,B00000000,B10000000,
+  B00000011,B00000011,B00000000,
+  B00000000,B11111100,B00000000
+};
+
+const unsigned char status_ammeter_bmp_A[] PROGMEM = {
+  B00000000,B11111100,B00000000,
+  B00000011,B00000011,B00000000,
+  B00000100,B00000000,B10000000,
+  B00001000,B00000000,B01000000,
+  B00010000,B00000000,B00100000,
+  B00010000,B00110000,B00100000,
+  B00100000,B01001000,B00010000,
+  B00100000,B01001000,B00010000,
+  B11100000,B01111000,B00011100,
+  B00100000,B01001000,B00010000,
+  B00100000,B01001000,B00010000,
+  B00010000,B01001000,B00100000,
+  B00010000,B00000000,B00100000,
+  B00001000,B00000000,B01000000,
+  B00000100,B00000000,B10000000,
+  B00000011,B00000011,B00000000,
+  B00000000,B11111100,B00000000,
+};
diff --git a/Marlin/src/lcd/dogm/status/cooler.h b/Marlin/src/lcd/dogm/status/cooler.h
index 6cf67a4b62..65c28ec28e 100644
--- a/Marlin/src/lcd/dogm/status/cooler.h
+++ b/Marlin/src/lcd/dogm/status/cooler.h
@@ -29,40 +29,40 @@
   #define STATUS_COOLER_WIDTH 22
 
   const unsigned char status_cooler_bmp2[] PROGMEM = {
-    B00000100,B00000010,B00000000,
-    B00000100,B10010010,B01000000,
-    B00010101,B00001010,B10000000,
-    B00001110,B00000111,B00000000,
-    B00111111,B10111111,B11000000,
-    B00001110,B00000111,B00000000,
-    B00010101,B00001010,B10000000,
-    B00100100,B00100010,B01000000,
-    B00000100,B00100000,B00000000,
-    B00000001,B00100100,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000000,B01110000,B00000000,
-    B00000111,B11111111,B00000000,
-    B00000000,B01110000,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000001,B00100100,B00000000
+    B00000001,B00000000,B10000000,
+    B00000001,B00100100,B10010000,
+    B00000101,B01000010,B10100000,
+    B00000011,B10000001,B11000000,
+    B00001111,B11101111,B11110000,
+    B00000011,B10000001,B11000000,
+    B00000101,B01000010,B10100000,
+    B00001001,B00001000,B10010000,
+    B00000001,B00001000,B00000000,
+    B00000000,B01001001,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B00011100,B00000000,
+    B00000001,B11111111,B11000000,
+    B00000000,B00011100,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B01001001,B00000000
   };
   const unsigned char status_cooler_bmp1[] PROGMEM = {
-    B00000100,B00000010,B00000000,
-    B00000100,B10010010,B01000000,
-    B00010101,B00001010,B10000000,
-    B00001010,B00000101,B00000000,
-    B00110001,B11011000,B11000000,
-    B00001010,B00000101,B00000000,
-    B00010101,B00001010,B10000000,
-    B00100100,B00100010,B01000000,
-    B00000100,B00100000,B00000000,
-    B00000001,B00100100,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000000,B01010000,B00000000,
-    B00000111,B10001111,B00000000,
-    B00000000,B01010000,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000001,B00100100,B00000000
+    B00000001,B00000000,B10000000,
+    B00000001,B00100100,B10010000,
+    B00000101,B01000010,B10100000,
+    B00000010,B10000001,B01000000,
+    B00001100,B01110110,B00110000,
+    B00000010,B10000001,B01000000,
+    B00000101,B01000010,B10100000,
+    B00001001,B00001000,B10010000,
+    B00000001,B00001000,B00000000,
+    B00000000,B01001001,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B00010100,B00000000,
+    B00000001,B11100011,B11000000,
+    B00000000,B00010100,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B01001001,B00000000
   };
 
 #endif
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index f05958e675..8309c3a00e 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -205,6 +205,14 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
   }
 #endif
 
+#if DO_DRAW_AMMETER
+  FORCE_INLINE void _draw_centered_current(const float current, const uint8_t tx, const uint8_t ty) {
+    const char *str = ftostr31ns(current);
+    const uint8_t len = str[0] != ' ' ? 3 : str[1] != ' ' ? 2 : 1;
+    lcd_put_u8str(tx - len * (INFO_FONT_WIDTH) / 2 + 1, ty, &str[3-len]);
+  }
+#endif
+
 #if DO_DRAW_HOTENDS
 
   // Draw hotend bitmap with current and target temperatures
@@ -404,6 +412,13 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
   }
 #endif
 
+#if DO_DRAW_AMMETER
+  FORCE_INLINE void _draw_ammeter_status() {
+    if (PAGE_CONTAINS(28 - INFO_FONT_ASCENT, 28 - 1))
+      _draw_centered_current(ammeter.read(), STATUS_AMMETER_TEXT_X, 28);
+  }
+#endif
+
 //
 // Before homing, blink '123' <-> '???'.
 // Homed but unknown... '123' <-> '   '.
@@ -677,6 +692,13 @@ void MarlinUI::draw_status_screen() {
         u8g.drawBitmapP(STATUS_FLOWMETER_X, flowmetery, STATUS_FLOWMETER_BYTEWIDTH, flowmeterh, blink && cooler.flowpulses ? status_flowmeter_bmp2 : status_flowmeter_bmp1);
     #endif
 
+    // Laser Ammeter
+    #if DO_DRAW_AMMETER
+      const uint8_t ammetery = STATUS_AMMETER_Y(status_ammeter_bmp_mA),
+                    ammeterh = STATUS_AMMETER_HEIGHT(status_ammeter_bmp_mA);
+       if (PAGE_CONTAINS(ammetery, ammetery + ammeterh - 1))
+        u8g.drawBitmapP(STATUS_AMMETER_X, ammetery, STATUS_AMMETER_BYTEWIDTH, ammeterh, (ammeter.current < 0.1f) ? status_ammeter_bmp_mA : status_ammeter_bmp_A);
+    #endif
 
     // Heated Bed
     TERN_(DO_DRAW_BED, _draw_bed_status(blink));
@@ -690,6 +712,9 @@ void MarlinUI::draw_status_screen() {
     // Flowmeter
     TERN_(DO_DRAW_FLOWMETER, _draw_flowmeter_status());
 
+    // Flowmeter
+    TERN_(DO_DRAW_AMMETER, _draw_ammeter_status());
+
     // Fan, if a bitmap was provided
     #if DO_DRAW_FAN
       if (PAGE_CONTAINS(STATUS_FAN_TEXT_Y - INFO_FONT_ASCENT, STATUS_FAN_TEXT_Y - 1)) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
index ab60579700..ea8d403753 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
@@ -27,9 +27,7 @@
 
   #if ENABLED(SDSUPPORT)
     bool MediaFileReader::open(const char *filename) {
-      card.init(SD_SPI_SPEED, SDSS);
-      volume.init(&card);
-      root.openRoot(&volume);
+      root = CardReader::getroot();
       return file.open(&root, filename, O_READ);
     }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
index 16b2891e27..fd478c95a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_ADVANCED_SETTINGS_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
index 3b55551375..dedda6d215 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_CONFIRM_HOME_E
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
index f1abd2e76a..bff1808d0d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_CONFIRM_HOME_XYZ
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
index 6897ceb914..ae5e7d8ab1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_MAIN_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
index 10ed6eb14a..86c700f235 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_PRINTING_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index c66e4d94d8..6fa4d761f6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -22,14 +22,14 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_STATUS_SCREEN
 
 #if ENABLED(TOUCH_UI_PORTRAIT)
-  #include "bio_printer_ui_portrait.h"
+  #include "ui_portrait.h"
 #else
-  #include "bio_printer_ui_landscape.h"
+  #include "ui_landscape.h"
 #endif
 
 #define GRID_COLS 2
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
index 806f7bd1af..31021c31c0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_TUNE_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
index 7bd149bd46..d984dbe120 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
@@ -1,5 +1,5 @@
 /*****************************************
- * cocoa_press_advance_settings_menu.cpp *
+ * cocoa_press/advance_settings_menu.cpp *
  *****************************************/
 
 /****************************************************************************
@@ -21,9 +21,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_ADVANCED_SETTINGS_MENU
+#ifdef COCOA_ADVANCED_SETTINGS_MENU
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -92,4 +92,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
   }
   return true;
 }
-#endif // FTDI_COCOA_ADVANCED_SETTINGS_MENU
+#endif // COCOA_ADVANCED_SETTINGS_MENU
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.h
similarity index 91%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.h
index 08c0745321..02f65572a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.h
@@ -1,5 +1,5 @@
 /***************************************
- * cocoa_press_advance_settings_menu.h *
+ * cocoa_press/advance_settings_menu.h *
  ***************************************/
 
 /****************************************************************************
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_ADVANCED_SETTINGS_MENU
-#define FTDI_COCOA_ADVANCED_SETTINGS_MENU_CLASS AdvancedSettingsMenu
+#define COCOA_ADVANCED_SETTINGS_MENU
+#define COCOA_ADVANCED_SETTINGS_MENU_CLASS AdvancedSettingsMenu
 
 class AdvancedSettingsMenu : public BaseScreen, public CachedScreen<ADVANCED_SETTINGS_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
index ac49df0916..8c15cae60f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
@@ -1,6 +1,6 @@
-/************************************
- * cocoa_press_unload_cartridge.cpp *
- ************************************/
+/**********************************
+ * cocoa_press/load_chocolate.cpp *
+ **********************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
+#ifdef COCOA_LOAD_CHOCOLATE_SCREEN
 
 #include "cocoa_press_ui.h"
 
@@ -215,4 +215,4 @@ void LoadChocolateScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
+#endif // COCOA_LOAD_CHOCOLATE_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.h
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.h
index 819464495b..4a582f0212 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.h
@@ -1,5 +1,5 @@
 /********************************
- * cocoa_press_load_chocolate.h *
+ * cocoa_press/load_chocolate.h *
  ********************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
-#define FTDI_COCOA_LOAD_CHOCOLATE_SCREEN_CLASS LoadChocolateScreen
+#define COCOA_LOAD_CHOCOLATE_SCREEN
+#define COCOA_LOAD_CHOCOLATE_SCREEN_CLASS LoadChocolateScreen
 
 struct LoadChocolateScreenData {
   uint8_t repeat_tag;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
index 7708b38eca..28dad42b13 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
@@ -1,5 +1,5 @@
 /*****************************
- * cocoa_press_main_menu.cpp *
+ * cocoa_press/main_menu.cpp *
  *****************************/
 
 /****************************************************************************
@@ -22,9 +22,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_MAIN_MENU
+#ifdef COCOA_MAIN_MENU
 
 using namespace FTDI;
 using namespace Theme;
@@ -97,4 +97,4 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-#endif // FTDI_COCOA_MAIN_MENU
+#endif // COCOA_MAIN_MENU
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.h
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.h
index 7c2bb5039a..460bb4b81a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.h
@@ -1,5 +1,5 @@
 /***************************
- * cocoa_press_main_menu.h *
+ * cocoa_press/main_menu.h *
  ***************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MAIN_MENU
-#define FTDI_COCOA_MAIN_MENU_CLASS MainMenu
+#define COCOA_MAIN_MENU
+#define COCOA_MAIN_MENU_CLASS MainMenu
 
 class MainMenu : public BaseScreen, public CachedScreen<MENU_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.cpp
index 2621ef64fe..f7dbc466c7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.cpp
@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_move_e_screen.cpp *
+ * cocoa_press/move_e_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_MOVE_E_SCREEN
+#ifdef COCOA_MOVE_E_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -60,4 +60,4 @@ void MoveEScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_MOVE_E_SCREEN
+#endif // COCOA_MOVE_E_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.h
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.h
index e86a91a529..0cede6f0c5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.h
@@ -1,5 +1,5 @@
 /*******************************
- * cocoa_press_move_e_screen.h *
+ * cocoa_press/move_e_screen.h *
  *******************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MOVE_E_SCREEN
-#define FTDI_COCOA_MOVE_E_SCREEN_CLASS MoveEScreen
+#define COCOA_MOVE_E_SCREEN
+#define COCOA_MOVE_E_SCREEN_CLASS MoveEScreen
 
 class MoveEScreen : public BaseMoveAxisScreen, public CachedScreen<MOVE_E_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.cpp
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.cpp
index c9442c9322..8e80bd53a9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.cpp
@@ -1,5 +1,5 @@
 /***********************************
- * cocoa_press_move_xyz_screen.cpp *
+ * cocoa_press/move_xyz_screen.cpp *
  ***********************************/
 
 /****************************************************************************
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_MOVE_XYZ_SCREEN
+#ifdef COCOA_MOVE_XYZ_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -49,4 +49,4 @@ void MoveXYZScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_MOVE_XYZ_SCREEN
+#endif // COCOA_MOVE_XYZ_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.h
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.h
index 9cbec113e6..015f5b30e4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.h
@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_move_xyz_screen.h *
+ * cocoa_press/move_xyz_screen.h *
  *********************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MOVE_XYZ_SCREEN
-#define FTDI_COCOA_MOVE_XYZ_SCREEN_CLASS MoveXYZScreen
+#define COCOA_MOVE_XYZ_SCREEN
+#define COCOA_MOVE_XYZ_SCREEN_CLASS MoveXYZScreen
 
 class MoveXYZScreen : public BaseMoveAxisScreen, public CachedScreen<MOVE_XYZ_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
index 92d1522360..56e90ceb4d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
@@ -1,5 +1,5 @@
 /********************************
- * cocoa_press_preheat_menu.cpp *
+ * cocoa_press/preheat_menu.cpp *
  ********************************/
 
 /****************************************************************************
@@ -20,9 +20,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_PREHEAT_MENU
+#ifdef COCOA_PREHEAT_MENU
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -113,4 +113,4 @@ bool PreheatMenu::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-#endif // FTDI_COCOA_PREHEAT_MENU
+#endif // COCOA_PREHEAT_MENU
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.h
similarity index 92%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.h
index a109e42111..46bded7df4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.h
@@ -1,5 +1,5 @@
 /******************************
- * cocoa_press_preheat_menu.h *
+ * cocoa_press/preheat_menu.h *
  ******************************/
 
 /****************************************************************************
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_PREHEAT_MENU
-#define FTDI_COCOA_PREHEAT_MENU_CLASS PreheatMenu
+#define COCOA_PREHEAT_MENU
+#define COCOA_PREHEAT_MENU_CLASS PreheatMenu
 
 class PreheatMenu : public BaseScreen, public CachedScreen<PREHEAT_MENU_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
index a8a172b3da..3bcc64fd93 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
@@ -1,6 +1,6 @@
-/****************************
- * preheat_timer_screen.cpp *
- ****************************/
+/***************************************
+ * cocoapress/preheat_timer_screen.cpp *
+ ***************************************/
 
 /****************************************************************************
  *   Written By Marcio Teixeira 2019 - Cocoa Press                          *
@@ -20,10 +20,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_PREHEAT_SCREEN
+#ifdef COCOA_PREHEAT_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -168,4 +168,4 @@ void PreheatTimerScreen::onIdle() {
   BaseScreen::onIdle();
 }
 
-#endif // FTDI_COCOA_PREHEAT_SCREEN
+#endif // COCOA_PREHEAT_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
index e91340a3aa..9b8e2620dc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
@@ -1,5 +1,5 @@
 /*********************************
- * cocoapress_preheat_screen.cpp *
+ * cocoapress/preheat_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_PREHEAT_SCREEN
-#define FTDI_COCOA_PREHEAT_SCREEN_CLASS PreheatTimerScreen
+#define COCOA_PREHEAT_SCREEN
+#define COCOA_PREHEAT_SCREEN_CLASS PreheatTimerScreen
 
 struct PreheatTimerScreenData {
     uint32_t start_ms;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index a0c8914589..38fdc2bb26 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_status_screen.cpp *
+ * cocoa_press/status_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -22,9 +22,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_STATUS_SCREEN
+#ifdef COCOA_STATUS_SCREEN
 
 #include "cocoa_press_ui.h"
 
@@ -294,4 +294,4 @@ void StatusScreen::onIdle() {
   }
 }
 
-#endif // FTDI_COCOA_STATUS_SCREEN
+#endif // COCOA_STATUS_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
similarity index 95%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
index b22bceac14..1cddfa0896 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
@@ -1,5 +1,5 @@
 /*******************************
- * cocoa_press_status_screen.h *
+ * cocoa_press/status_screen.h *
  *******************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_STATUS_SCREEN
-#define FTDI_COCOA_STATUS_SCREEN_CLASS StatusScreen
+#define COCOA_STATUS_SCREEN
+#define COCOA_STATUS_SCREEN_CLASS StatusScreen
 
 class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE> {
   private:
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 08faaa3b6a..e15f61be00 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
@@ -28,7 +28,7 @@
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
-#include "screens/screens.h"
+#include "screens.h"
 
 namespace ExtUI {
   using namespace Theme;
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 6d53d00bb8..9f73c7dfb8 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
@@ -82,8 +82,8 @@ namespace FTDI {
       box_width = w;
       measure_text_box(fm, str, box_width, box_height);
       if (box_width <= (uint16_t)w && box_height <= (uint16_t)h) break;
-      fm.load(--font);
       if (font == 26) break;
+      fm.load(--font);
     }
 
     const uint16_t dx = (options & OPT_RIGHTX) ? w :
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 1d8db12ef9..3d2c6a9e44 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -21,12 +21,12 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ABOUT_SCREEN
 
 #define GRID_COLS 4
-#define GRID_ROWS 7
+#define GRID_ROWS 8
 
 using namespace FTDI;
 using namespace Theme;
@@ -47,9 +47,9 @@ void AboutScreen::onRedraw(draw_mode_t) {
   #define HEADING_POS BTN_POS(1,2), BTN_SIZE(4,1)
   #define FW_VERS_POS BTN_POS(1,3), BTN_SIZE(4,1)
   #define FW_INFO_POS BTN_POS(1,4), BTN_SIZE(4,1)
-  #define LICENSE_POS BTN_POS(1,5), BTN_SIZE(4,2)
-  #define STATS_POS   BTN_POS(1,7), BTN_SIZE(2,1)
-  #define BACK_POS    BTN_POS(3,7), BTN_SIZE(2,1)
+  #define LICENSE_POS BTN_POS(1,5), BTN_SIZE(4,3)
+  #define STATS_POS   BTN_POS(1,8), BTN_SIZE(2,1)
+  #define BACK_POS    BTN_POS(3,8), BTN_SIZE(2,1)
 
   #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
   #define INSET_POS(pos) _INSET_POS(pos)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
index b9255c11b9..58a7112d01 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ADVANCED_SETTINGS_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
index bbe922ad5d..ccdfa89419 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_ALERT_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.cpp
index 11fb72b5a8..c3fcb25f43 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BACKLASH_COMP_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
index 747e632d8f..90199783fd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BASE_NUMERIC_ADJ_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
index 139a3100cf..3981a37042 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BASE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.cpp
index 83b0825802..14f2196453 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BED_MESH_BASE
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
index 31c6ab8fcb..e06fb52773 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -20,8 +20,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BED_MESH_EDIT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
index 1a00e10ca9..75b15828a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
@@ -20,8 +20,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BED_MESH_VIEW_SCREEN
 
@@ -69,7 +69,7 @@ void BedMeshViewScreen::onEntry() {
 void BedMeshViewScreen::drawHighlightedPointValue() {
   CommandProcessor cmd;
   cmd.font(Theme::font_medium)
-     .colors(normal_btn)
+     .cmd(COLOR_RGB(bg_text_enabled))
      .text(Z_LABEL_POS, GET_TEXT_F(MSG_MESH_EDIT_Z))
      .font(font_small);
 
@@ -161,7 +161,7 @@ void BedMeshViewScreen::doProbe() {
 void BedMeshViewScreen::doMeshValidation() {
   mydata.count = 0;
   GOTO_SCREEN(StatusScreen);
-  injectCommands_P(PSTR("G28 O\nM117 Heating...\nG26 R X0 Y0"));
+  injectCommands_P(PSTR("M75\nG28 O\nM117 Heating...\nG26 R X0 Y0\nG27\nM77"));
 }
 
 void BedMeshViewScreen::show() {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
index c8c7cdb5a5..d2a2269295 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
@@ -22,7 +22,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BOOT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.cpp
index 04327128ab..8fbb400a68 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CASE_LIGHT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
index e9fa8a66d4..a3cb91af5d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CHANGE_FILAMENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
index 46b27062bf..02e48efa01 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_ABORT_PRINT_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
index 65b5140ccb..748cc1d7ef 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_AUTO_CALIBRATION_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.cpp
index 13d61005e8..b4ddebea5e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_ERASE_FLASH_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
index 86e7e33035..47aac62860 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CONFIRM_START_PRINT_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
index d514015058..4aabbaab59 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CONFIRM_USER_REQUEST_ALERT_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
index d5d1abdf9d..5f8ff92922 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CUSTOM_USER_MENUS
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.cpp
index 6178228d09..07473d66a1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DEFAULT_ACCELERATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
index 0bbce08a2b..34c754d535 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DEVELOPER_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
index feaebb77be..0d604751f1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DIALOG_BOX_BASE_CLASS
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.cpp
index 62a329e907..504ebde169 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DISPLAY_TUNING_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
index e79e88b6b0..d12cb32e20 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ENDSTOP_STATE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.cpp
index 8b3984aa01..80eb295f64 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FEEDRATE_PERCENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
index cf63a1a124..bd5fa96e8d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FILAMENT_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
index 069686b541..37ab70f7ac 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FILAMENT_RUNOUT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index f9057ae88e..c34a3d3055 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_FILES_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.cpp
index 5280092ced..be350bd9a7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FLOW_PERCENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
index 56f0fbdc3c..05c6956e42 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_INTERFACE_SETTINGS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
index 4e47653899..3ba035f19b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_INTERFACE_SOUNDS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.cpp
index d74879fd41..4331cb7089 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_JERK_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.cpp
index 4b9f5512bb..98e4816790 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_JUNCTION_DEVIATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
index fe58cad93c..bb44a87176 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_KILL_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
index 77c0d02756..ce6045018b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_LANGUAGE_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 1309ab5c09..93f9c4c228 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_LEVELING_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.cpp
index e70d6933cc..e3b59eef5c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_LINEAR_ADVANCE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
index f89ad5c44c..4e44f26d91 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_LOCK_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
index 53d6306175..f7a0d6683a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -22,7 +22,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_MAIN_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
index d4d14d6331..be3a244380 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_MAX_ACCELERATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
index 4de3e33360..bca533c94f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_MAX_VELOCITY_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.cpp
index 38e8b0b5c7..061c8555df 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 /**
  * The MediaPlayerScreen allows an AVI to be played.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
index 9406572c33..3bfe1784fc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_MOVE_AXIS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.cpp
index a444a07cfc..288d06ea8e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_NOZZLE_OFFSETS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.cpp
index 96ad833b14..c1611100a9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_NUDGE_NOZZLE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
index 8dce1a259c..2dfd64fa5b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_RESTORE_FAILSAFE_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
index a475a9863c..176630d11e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_SAVE_SETTINGS_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 7483261e3c..489beabe6b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_SPINNER_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
index 2d62d5349b..2153a1e1ad 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STATISTICS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index f61136e396..9ef481d39b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_STATUS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.cpp
index 701fb78062..ddbe648c32 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STEPPER_BUMP_SENSITIVITY_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.cpp
index 4b63b1f3e4..ddd273aa47 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STEPPER_CURRENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.cpp
index ec812b776b..c73c49493e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STEPS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
index 916315a243..09f2088240 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_STRESS_TEST_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
index ac423c2d07..09f0bb6089 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
@@ -23,7 +23,7 @@
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
-#include "screens.h"
+#include "../screens.h"
 
 #define ROUND(val) uint16_t((val)+0.5)
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
index b1d00aa521..ee53a82bee 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TEMPERATURE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.cpp
index 37f0c5d33a..c7c21368df 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TOUCH_CALIBRATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
index 01c7169a3e..5475d67a80 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TOUCH_REGISTERS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
index 5403b4004e..b4afae9f17 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TUNE_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.cpp
index 451b7e786e..d02397abf9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_WIDGET_DEMO_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
similarity index 85%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
index 8a21efcbac..8d886c704a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_Z_OFFSET_SCREEN
 
@@ -46,17 +46,22 @@ void ZOffsetScreen::onRedraw(draw_mode_t what) {
   w.heading(                  GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
   w.color(z_axis).adjuster(4, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), getZOffset_mm());
   w.increments();
-  w.button(   2, GET_TEXT_F(MSG_PROBE_WIZARD));
+  w.button(2, GET_TEXT_F(MSG_PROBE_WIZARD), !isPrinting());
 }
 
-void ZOffsetScreen::move(float inc) {
+void ZOffsetScreen::move(float mm, int16_t steps) {
   // We can't store state after the call to the AlertBox, so
   // check whether the current position equal mydata.z in order
   // to know whether the user started the wizard.
   if (getAxisPosition_mm(Z) == mydata.z) {
-    mydata.z += inc;
+    // In the wizard
+    mydata.z += mm;
     setAxisPosition_mm(mydata.z, Z);
   }
+  else {
+    // Otherwise doing a manual adjustment, possibly during a print.
+    babystepAxis_steps(steps, Z);
+  }
 }
 
 void ZOffsetScreen::runWizard() {
@@ -80,11 +85,12 @@ void ZOffsetScreen::runWizard() {
 }
 
 bool ZOffsetScreen::onTouchHeld(uint8_t tag) {
-  const float increment = getIncrement();
+  const int16_t steps = mmToWholeSteps(getIncrement(), Z);
+  const float increment = mmFromWholeSteps(steps, Z);
   switch (tag) {
     case 2: runWizard(); break;
-    case 4: UI_DECREMENT(ZOffset_mm); move(-increment); break;
-    case 5: UI_INCREMENT(ZOffset_mm); move( increment); break;
+    case 4: UI_DECREMENT(ZOffset_mm); move(-increment, -steps); break;
+    case 5: UI_INCREMENT(ZOffset_mm); move( increment,  steps); break;
     default:
       return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
index 159fd2383c..067687f315 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
@@ -31,7 +31,7 @@ struct ZOffsetScreenData : public BaseNumericAdjustmentScreenData {
 
 class ZOffsetScreen : public BaseNumericAdjustmentScreen, public CachedScreen<ZOFFSET_SCREEN_CACHE> {
   private:
-    static void move(float inc);
+    static void move(float mm, int16_t steps);
     static void runWizard();
   public:
     static void onEntry();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
index 9de9623e19..4ac44501d5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
@@ -70,7 +70,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2      = WEBSITE_URL;
   PROGMEM Language_Str MSG_LICENSE                  = u8"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.\n\nTo view a copy of the GNU General "
+                                                        "of the License, or (at your option) any later version. To view a copy of the GNU General "
                                                         "Public License, go to the following location: https://www.gnu.org/licenses.";
   PROGMEM Language_Str MSG_RUNOUT_1                 = u8"Runout 1";
   PROGMEM Language_Str MSG_RUNOUT_2                 = u8"Runout 2";
@@ -130,7 +130,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_EEPROM_RESTORED          = u8"Settings restored from backup";
   PROGMEM Language_Str MSG_EEPROM_RESET             = u8"Settings restored to default";
   PROGMEM Language_Str MSG_EEPROM_SAVED             = u8"Settings saved!";
-  PROGMEM Language_Str MSG_EEPROM_SAVE_PROMPT       = u8"Do you wish to save these settings as defaults?";
+  PROGMEM Language_Str MSG_EEPROM_SAVE_PROMPT       = u8"Do you wish to save these settings for next power-on?";
   PROGMEM Language_Str MSG_EEPROM_RESET_WARNING     = u8"Are you sure? Customizations will be lost.";
 
   PROGMEM Language_Str MSG_PASSCODE_REJECTED        = u8"Wrong passcode!";
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
index 17e445fe4d..057054a6af 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../ftdi_eve_lib/ftdi_eve_lib.h"
+#include "ftdi_eve_lib/ftdi_eve_lib.h"
 
 // To save RAM, store state information related to a particular screen
 // in a union. The values should be initialized in the onEntry method.
@@ -58,12 +58,12 @@ union screen_data_t {
   DECL_DATA_IF_INCLUDED(FTDI_BED_MESH_VIEW_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_BED_MESH_EDIT_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_STRESS_TEST_SCREEN)
-  DECL_DATA_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
-  DECL_DATA_IF_INCLUDED(FTDI_COCOA_LOAD_CHOCOLATE_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_NUDGE_NOZZLE_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_Z_OFFSET_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_BASE_NUMERIC_ADJ_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_ALERT_DIALOG_BOX)
+  DECL_DATA_IF_INCLUDED(COCOA_PREHEAT_SCREEN)
+  DECL_DATA_IF_INCLUDED(COCOA_LOAD_CHOCOLATE_SCREEN)
 };
 
 extern screen_data_t screen_data;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
similarity index 90%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
index c3e015d75c..e1900ac793 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
@@ -20,7 +20,7 @@
  *   location: <https://www.gnu.org/licenses/>.                             *
  ****************************************************************************/
 
-#include "../config.h"
+#include "config.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 #include "screens.h"
@@ -100,15 +100,6 @@ SCREEN_TABLE {
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_PRINTING_DIALOG_BOX)
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_XYZ)
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_E)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_STATUS_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MAIN_MENU)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_ADVANCED_SETTINGS_MENU)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_MENU)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_LOAD_CHOCOLATE_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MOVE_XYZ_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MOVE_E_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_DEVELOPER_MENU)
   DECL_SCREEN_IF_INCLUDED(FTDI_CONFIRM_ERASE_FLASH_DIALOG_BOX)
   DECL_SCREEN_IF_INCLUDED(FTDI_WIDGET_DEMO_SCREEN)
@@ -116,6 +107,14 @@ SCREEN_TABLE {
   DECL_SCREEN_IF_INCLUDED(FTDI_STRESS_TEST_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_MEDIA_PLAYER_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_DISPLAY_TUNING_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_STATUS_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_MAIN_MENU)
+  DECL_SCREEN_IF_INCLUDED(COCOA_ADVANCED_SETTINGS_MENU)
+  DECL_SCREEN_IF_INCLUDED(COCOA_PREHEAT_MENU)
+  DECL_SCREEN_IF_INCLUDED(COCOA_PREHEAT_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_LOAD_CHOCOLATE_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_MOVE_XYZ_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_MOVE_E_SCREEN)
 };
 
 SCREEN_TABLE_POST
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
similarity index 62%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
index 316896c360..f5e2160d10 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
@@ -22,14 +22,14 @@
 
 #pragma once
 
-#include "../compat.h"
+#include "compat.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
-#include "../ftdi_eve_lib/ftdi_eve_lib.h"
-#include "../language/language.h"
-#include "../theme/theme.h"
-#include "string_format.h"
+#include "ftdi_eve_lib/ftdi_eve_lib.h"
+#include "language/language.h"
+#include "theme/theme.h"
+#include "generic/string_format.h"
 
 #ifndef BED_LEVELING_COMMANDS
   #define BED_LEVELING_COMMANDS "G29"
@@ -132,9 +132,9 @@ enum {
 
 /************************* MENU SCREEN DECLARATIONS *************************/
 
-#include "base_screen.h"
-#include "base_numeric_adjustment_screen.h"
-#include "dialog_box_base_class.h"
+#include "generic/base_screen.h"
+#include "generic/base_numeric_adjustment_screen.h"
+#include "generic/dialog_box_base_class.h"
 
 #if ENABLED(TOUCH_UI_LULZBOT_BIO)
   #include "bio_status_screen.h"
@@ -146,128 +146,128 @@ enum {
   #include "bio_confirm_home_e.h"
 
 #elif ENABLED(TOUCH_UI_COCOA_PRESS)
-  #include "cocoa_press_status_screen.h"
-  #include "cocoa_press_main_menu.h"
-  #include "cocoa_press_advanced_settings_menu.h"
-  #include "cocoa_press_preheat_menu.h"
-  #include "cocoa_press_preheat_screen.h"
-  #include "cocoa_press_load_chocolate.h"
-  #include "move_axis_screen.h"
-  #include "flow_percent_screen.h"
-  #include "cocoa_press_move_xyz_screen.h"
-  #include "cocoa_press_move_e_screen.h"
-  #include "tune_menu.h"
+  #include "generic/move_axis_screen.h"
+  #include "generic/flow_percent_screen.h"
+  #include "generic/tune_menu.h"
+  #include "cocoa_press/status_screen.h"
+  #include "cocoa_press/main_menu.h"
+  #include "cocoa_press/advanced_settings_menu.h"
+  #include "cocoa_press/preheat_menu.h"
+  #include "cocoa_press/preheat_screen.h"
+  #include "cocoa_press/load_chocolate.h"
+  #include "cocoa_press/move_xyz_screen.h"
+  #include "cocoa_press/move_e_screen.h"
 
 #else
-  #include "status_screen.h"
-  #include "main_menu.h"
-  #include "advanced_settings_menu.h"
-  #include "tune_menu.h"
+  #include "generic/status_screen.h"
+  #include "generic/main_menu.h"
+  #include "generic/advanced_settings_menu.h"
+  #include "generic/tune_menu.h"
 #endif
 
-#include "boot_screen.h"
-#include "about_screen.h"
-#include "kill_screen.h"
-#include "alert_dialog_box.h"
-#include "spinner_dialog_box.h"
-#include "restore_failsafe_dialog_box.h"
-#include "save_settings_dialog_box.h"
-#include "confirm_start_print_dialog_box.h"
-#include "confirm_abort_print_dialog_box.h"
-#include "confirm_user_request_alert_box.h"
-#include "touch_calibration_screen.h"
-#include "touch_registers_screen.h"
-#include "change_filament_screen.h"
-#include "move_axis_screen.h"
-#include "steps_screen.h"
-#include "feedrate_percent_screen.h"
-#include "max_velocity_screen.h"
-#include "max_acceleration_screen.h"
-#include "default_acceleration_screen.h"
-#include "temperature_screen.h"
-#include "interface_sounds_screen.h"
-#include "interface_settings_screen.h"
-#include "lock_screen.h"
-#include "endstop_state_screen.h"
-#include "display_tuning_screen.h"
-#include "media_player_screen.h"
+#include "generic/boot_screen.h"
+#include "generic/about_screen.h"
+#include "generic/kill_screen.h"
+#include "generic/alert_dialog_box.h"
+#include "generic/spinner_dialog_box.h"
+#include "generic/restore_failsafe_dialog_box.h"
+#include "generic/save_settings_dialog_box.h"
+#include "generic/confirm_start_print_dialog_box.h"
+#include "generic/confirm_abort_print_dialog_box.h"
+#include "generic/confirm_user_request_alert_box.h"
+#include "generic/touch_calibration_screen.h"
+#include "generic/touch_registers_screen.h"
+#include "generic/change_filament_screen.h"
+#include "generic/move_axis_screen.h"
+#include "generic/steps_screen.h"
+#include "generic/feedrate_percent_screen.h"
+#include "generic/max_velocity_screen.h"
+#include "generic/max_acceleration_screen.h"
+#include "generic/default_acceleration_screen.h"
+#include "generic/temperature_screen.h"
+#include "generic/interface_sounds_screen.h"
+#include "generic/interface_settings_screen.h"
+#include "generic/lock_screen.h"
+#include "generic/endstop_state_screen.h"
+#include "generic/display_tuning_screen.h"
+#include "generic/media_player_screen.h"
 
 #if ENABLED(PRINTCOUNTER)
-  #include "statistics_screen.h"
+  #include "generic/statistics_screen.h"
 #endif
 
 #if HAS_TRINAMIC_CONFIG
-  #include "stepper_current_screen.h"
-  #include "stepper_bump_sensitivity_screen.h"
+  #include "generic/stepper_current_screen.h"
+  #include "generic/stepper_bump_sensitivity_screen.h"
 #endif
 
 #if HAS_MULTI_HOTEND
-  #include "nozzle_offsets_screen.h"
+  #include "generic/nozzle_offsets_screen.h"
 #endif
 
 #if HAS_LEVELING
-  #include "leveling_menu.h"
+  #include "generic/leveling_menu.h"
   #if HAS_BED_PROBE
-    #include "z_offset_screen.h"
+    #include "generic/z_offset_screen.h"
   #endif
   #if HAS_MESH
-    #include "bed_mesh_base.h"
-    #include "bed_mesh_view_screen.h"
-    #include "bed_mesh_edit_screen.h"
+    #include "generic/bed_mesh_base.h"
+    #include "generic/bed_mesh_view_screen.h"
+    #include "generic/bed_mesh_edit_screen.h"
   #endif
 #endif
 
 #if ENABLED(CALIBRATION_GCODE)
-  #include "confirm_auto_calibration_dialog_box.h"
+  #include "generic/confirm_auto_calibration_dialog_box.h"
 #endif
 
 #if ENABLED(BABYSTEPPING)
-  #include "nudge_nozzle_screen.h"
+  #include "generic/nudge_nozzle_screen.h"
 #endif
 
 #if ENABLED(BACKLASH_GCODE)
-  #include "backlash_compensation_screen.h"
+  #include "generic/backlash_compensation_screen.h"
 #endif
 
 #if HAS_JUNCTION_DEVIATION
-  #include "junction_deviation_screen.h"
+  #include "generic/junction_deviation_screen.h"
 #else
-  #include "jerk_screen.h"
+  #include "generic/jerk_screen.h"
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE)
-  #include "case_light_screen.h"
+  #include "generic/case_light_screen.h"
 #endif
 
 #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
-  #include "filament_menu.h"
+  #include "generic/filament_menu.h"
 #endif
 
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #include "filament_runout_screen.h"
+  #include "generic/filament_runout_screen.h"
 #endif
 
 #if ENABLED(LIN_ADVANCE)
-  #include "linear_advance_screen.h"
+  #include "generic/linear_advance_screen.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
-  #include "files_screen.h"
+  #include "generic/files_screen.h"
 #endif
 
 #if ENABLED(CUSTOM_MENU_MAIN)
-  #include "custom_user_menus.h"
+  #include "generic/custom_user_menus.h"
 #endif
 
 #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
-  #include "developer_menu.h"
-  #include "confirm_erase_flash_dialog_box.h"
-  #include "widget_demo_screen.h"
-  #include "stress_test_screen.h"
+  #include "generic/developer_menu.h"
+  #include "generic/confirm_erase_flash_dialog_box.h"
+  #include "generic/widget_demo_screen.h"
+  #include "generic/stress_test_screen.h"
 #endif
 
 #if NUM_LANGUAGES > 1
-  #include "language_menu.h"
+  #include "generic/language_menu.h"
 #endif
 
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
deleted file mode 100644
index 3428c38bb1..0000000000
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/************************************
- * cocoa_press_unload_cartridge.cpp *
- ************************************/
-
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2020 - Cocoa Press                          *
- *                                                                          *
- *   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.                           *
- *                                                                          *
- *   To view a copy of the GNU General Public License, go to the following  *
- *   location: <https://www.gnu.org/licenses/>.                              *
- ****************************************************************************/
-
-#include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
-
-#ifdef FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN
-
-using namespace ExtUI;
-using namespace FTDI;
-using namespace Theme;
-
-#define GRID_COLS 2
-#define GRID_ROWS 6
-
-#define TITLE_POS             BTN_POS(1,1), BTN_SIZE(2,1)
-#define DESCRIPTION_POS       BTN_POS(1,2), BTN_SIZE(2,3)
-#define CARTRIDGE_OUT_BTN_POS BTN_POS(1,5), BTN_SIZE(1,1)
-#define CARTRIDGE_IN_BTN_POS  BTN_POS(2,5), BTN_SIZE(1,1)
-#define BACK_BTN_POS          BTN_POS(1,6), BTN_SIZE(2,1)
-
-void UnloadCartridgeScreen::onRedraw(draw_mode_t what) {
-  CommandProcessor cmd;
-
-  if (what & BACKGROUND) {
-    cmd.cmd(CLEAR_COLOR_RGB(bg_color))
-       .cmd(CLEAR(true,true,true))
-       .cmd(COLOR_RGB(bg_text_enabled))
-       .tag(0)
-       .font(font_large)
-       .text(TITLE_POS, GET_TEXT_F(MSG_UNLOAD_CARTRIDGE));
-       draw_text_box(cmd, DESCRIPTION_POS, F(
-        "Press and hold the buttons below to help "
-        "you unlock the cartridge. After unlocking, "
-        "press and hold the Cartridge Out button "
-        "until the cartridge is sticking out of the "
-        "extruder enough to grip and remove. After "
-        "removing the cartridge, continue holding the "
-        "Cartridge Out button until the plunger adapter is "
-        "visible at the bottom of the extruder."
-       ),
-       OPT_CENTERY, font_medium);
-  }
-
-  if (what & FOREGROUND) {
-    cmd.font(font_medium)
-       .colors(normal_btn)
-       .tag(2).button(CARTRIDGE_OUT_BTN_POS, GET_TEXT_F(MSG_CARTRIDGE_OUT))
-       .tag(3).button(CARTRIDGE_IN_BTN_POS,  GET_TEXT_F(MSG_CARTRIDGE_IN))
-              .colors(action_btn)
-       .tag(1).button(BACK_BTN_POS,    GET_TEXT_F(MSG_BACK));
-  }
-}
-
-bool UnloadCartridgeScreen::onTouchEnd(uint8_t tag) {
-  using namespace ExtUI;
-  switch (tag) {
-    case 1: GOTO_PREVIOUS(); break;
-  }
-  return true;
-}
-
-bool UnloadCartridgeScreen::onTouchHeld(uint8_t tag) {
-  if (ExtUI::isMoving()) return false; // Don't allow moves to accumulate
-  constexpr float increment = 0.25;
-  MoveAxisScreen::setManualFeedrate(E0, increment);
-  #define UI_INCREMENT_AXIS(axis) UI_INCREMENT(AxisPosition_mm, axis);
-  #define UI_DECREMENT_AXIS(axis) UI_DECREMENT(AxisPosition_mm, axis);
-  switch (tag) {
-    case 2: UI_DECREMENT_AXIS(E0); break;
-    case 3: UI_INCREMENT_AXIS(E0); break;
-    default: return false;
-  }
-  #undef UI_DECREMENT_AXIS
-  #undef UI_INCREMENT_AXIS
-  return false;
-}
-
-#endif // FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
deleted file mode 100644
index 95a9ee47ec..0000000000
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**********************************
- * cocoa_press_unload_cartridge.h *
- **********************************/
-
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2020 - Cocoa Press                          *
- *                                                                          *
- *   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.                           *
- *                                                                          *
- *   To view a copy of the GNU General Public License, go to the following  *
- *   location: <https://www.gnu.org/licenses/>.                              *
- ****************************************************************************/
-
-#pragma once
-
-#define FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN
-#define FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN_CLASS UnloadCartridgeScreen
-
-class UnloadCartridgeScreen : public BaseScreen, public CachedScreen<UNLOAD_CARTRIDGE_SCREEN_CACHE> {
-  public:
-    static void onRedraw(draw_mode_t);
-    static bool onTouchEnd(uint8_t tag);
-    static bool onTouchHeld(uint8_t tag);
-};
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index fff31f099b..b0def618fd 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -767,6 +767,10 @@ namespace ExtUI {
       return steps > 0 ? CEIL(steps) : FLOOR(steps);
     }
 
+    float mmFromWholeSteps(int16_t steps, const axis_t axis) {
+      return steps * planner.steps_to_mm[axis];
+    }
+
   #endif // BABYSTEPPING
 
   float getZOffset_mm() {
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 5603169626..9922fa6799 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -239,6 +239,7 @@ namespace ExtUI {
 
   #if ENABLED(BABYSTEPPING)
     int16_t mmToWholeSteps(const_float_t mm, const axis_t axis);
+    float mmFromWholeSteps(int16_t steps, const axis_t axis);
 
     bool babystepAxis_steps(const int16_t steps, const axis_t axis);
     void smartAdjustAxis_steps(const int16_t steps, const axis_t axis, bool linked_nozzles);
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index b2c1d30f33..f29a7b76b9 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: 21/03/2021 - 21:00
+ * Translation last updated: 23/05/2021 - 20:45
  *
  * 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.03.21. - 21:00
+ * A Fordítás utolsó frissítése: 2021.05.23. - 20:45
  */
 
 namespace Language_hu {
@@ -76,6 +76,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Szintezés kész!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Szint csökkentés");
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Kezdöpont eltolás");
+  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Kezdö eltol.");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Kezdö eltol.");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Kezdö eltol.");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Eltolás beállítva.");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Eredeti Be");
   PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Elektromos segéd");
@@ -108,12 +111,15 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Lézer telj.");
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Orsó telj.");
   PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Lézer váltás");
+  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Hütés váltás");
+  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Levegö segéd");
   PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Impulzus teszt ms");
   PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Tüz impulzus");
+  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Áramlási hiba");
   PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Orsóváltás");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Orsó előre");
+  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Vákuum váltás");
+  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Orsó elöre");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Orsó hátra");
-
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Bekapcsolás");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Kikapcsolás");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Adagol");
@@ -134,7 +140,7 @@ namespace Language_hu {
   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");
-  PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("Egyéni parancs");
+  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Egyéni parancs");
   PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Szonda teszt");
   PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Pont");
   PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Szonda határon kívül");
@@ -154,6 +160,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Egységes ágy szint");
   PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Döntési pont");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Kézi háló építés");
+  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("UBL Háló varázsló");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Tégy alátétet és mérj");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Mérés");
   PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Üres ágyat mérj");
@@ -161,9 +168,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("UBL aktívál");
   PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("UBL deaktívál");
   PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Ágy höfok");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Ágy höfok");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Fej höfok");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Fej höfok");
+  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Egyéni ágy höfok");
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Fejhöfok");
+  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Egyéni fejhöfok");
   PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Háló szerkesztés");
   PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Egyéni háló szerkesztés");
   PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Finomított háló");
@@ -239,7 +246,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Csatorna =");
   PROGMEM Language_Str MSG_LEDS2                           = _UxGT("LED-ek #2");
   PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Fény #2 megadott");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Fényerő");
+  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Fényerö");
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Egyéni szín");
   PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Piros intenzitás");
   PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Zöld intenzitás");
@@ -272,6 +279,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Burkolat");
   PROGMEM Language_Str MSG_COOLER                          = _UxGT("Lézer hütövíz");
   PROGMEM Language_Str MSG_COOLER_TOGGLE                   = _UxGT("Hütö kapcsoló");
+  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Áramlásbiztonság");
   PROGMEM Language_Str MSG_LASER                           = _UxGT("Lézer");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Hütés sebesség");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Hütés sebesség =");
@@ -298,6 +306,16 @@ namespace Language_hu {
   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.");
   PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Hangolási hiba! Idötúllépés.");
+  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");
+  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
+  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");
+  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
+  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");
+  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
+  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");
+  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
+  PROGMEM Language_Str MSG_PID_F                           = _UxGT("PID-F");
+  PROGMEM Language_Str MSG_PID_F_E                         = _UxGT("PID-F *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("Kiválaszt");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Kiválaszt *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Gyorsítás");
@@ -505,6 +523,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Lineáris szintezés");
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineáris szintezés");
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Egységes ágy szintezés");
+  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Mesh probing done");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Háló szintezés");
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statisztikák");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Alaplap infó");
@@ -566,17 +585,17 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Szál betöltése");
   PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Összes betöltése");
   PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Fej betöltése");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Szál kiadása");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Szál kiadása ~");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Szál kidobás");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Szál kidobás ~");
   PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Kiadja a szálat");
   PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Szál betölt. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Szál kiadás....");
+  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Szál kidobás. ...");
   PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Szál kiadása....");
   PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Mind");
   PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Nyomtatószál ~");
   PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("MMU újraindítás");
   PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU újraindul...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Eltávolít, kattint");
+  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Kidob, kattint");
 
   PROGMEM Language_Str MSG_MIX                             = _UxGT("Kever");
   PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Összetevö =");
@@ -632,7 +651,7 @@ namespace Language_hu {
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Várj a", "szál betöltésére"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Várj a", "szál tisztításra"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Kattints a készre", "szál tiszta"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Várj a nyomtatóra", "majd foltyat..."));
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Várj a nyomtatóra", "majd folytat..."));
   #else
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Katt a folytatáshoz"));
     PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkolás..."));
@@ -683,6 +702,8 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Jobb alsó");
   PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibrálás befejezve");
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrálási hiba");
+
+  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" meghajtók hátra");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index 008db6a8b8..5ed217131a 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -42,7 +42,7 @@
 // Global storage
 float z_offset_backup, calculated_z_offset, z_offset_ref;
 
-#if ENABLED(HAS_LEVELING)
+#if HAS_LEVELING
   bool leveling_was_active;
 #endif
 
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index da7afd86ef..7ccb320f31 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -92,7 +92,7 @@ void goto_tramming_wizard() {
 
   // Inject G28, wait for homing to complete,
   set_all_unhomed();
-  queue.inject_P(TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
+  queue.inject_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
 
   ui.goto_screen([]{
     _lcd_draw_homing();
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index aae0f97361..0a88d63e8c 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1175,7 +1175,7 @@ void MarlinSettings::postprocess() {
         const tmc_hybrid_threshold_t tmc_hybrid_threshold = {
           LINEAR_AXIS_LIST(.X = 100, .Y = 100, .Z = 3, .I = 3, .J = 3, .K = 3),
           .X2 = 100, .Y2 = 100, .Z2 = 3, .Z3 = 3, .Z4 = 3
-          REPEAT(EXTRUDERS, _EN_ITEM)
+          REPEAT(E_STEPPERS, _EN_ITEM)
         };
         #undef _EN_ITEM
       #endif
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 a347b91686..ae7d46b9d5 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -1,4 +1,4 @@
-/**
+sd/**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
@@ -30,14 +30,26 @@
 #ifndef BOARD_CUSTOM_BUILD_FLAGS
   #define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
 #endif
-
-//
 // SD Connection
 //
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION ONBOARD
 #endif
 
+//
+// EEPROM
+//
+#if NO_EEPROM_SELECTED
+  //#define I2C_EEPROM                            // EEPROM on I2C-0
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
+#if ENABLED(I2C_EEPROM)
+  #define MARLIN_EEPROM_SIZE              0x8000  // 32Kb
+#elif ENABLED(SDCARD_EEPROM_EMULATION)
+  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
+#endif
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 514665d826..88dd170a9e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -216,7 +216,7 @@
 #elif MB(CNCONTROLS_15)
   #include "mega/pins_CNCONTROLS_15.h"          // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
 #elif MB(MIGHTYBOARD_REVE)
-  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega2560, ATmega1280                 env:mega2560ext env:mega1280
+  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega2560, ATmega1280                 env:mega2560ext env:mega1280 env:MightyBoard1280 env:MightyBoard2560
 #elif MB(CHEAPTRONIC)
   #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:mega2560
 #elif MB(CHEAPTRONIC_V2)
@@ -508,17 +508,17 @@
 #elif MB(MKS_ROBIN_E3P)
   #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p
 #elif MB(BTT_SKR_MINI_V1_1)
-  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V1_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V1_2)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V2_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_E3_DIP)
-  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple env:STM32F103RC_btt env:STM32F103RC_btt_512K
+  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(BTT_SKR_CR6)
   #include "stm32f1/pins_BTT_SKR_CR6.h"         // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(JGAURORA_A5S_A1)
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 33b78a4d11..bd52e30454 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -809,6 +809,8 @@
     #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
@@ -876,6 +878,9 @@
     #endif
     #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
@@ -891,6 +896,213 @@
   #define Z4_MS3_PIN -1
 #endif
 
+#if LINEAR_AXES >= 4
+  #ifndef I_STEP_PIN
+    #define I_STEP_PIN   _EPIN(I_E_INDEX, STEP)
+    #define I_DIR_PIN    _EPIN(I_E_INDEX, DIR)
+    #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!"
+    #endif
+  #endif
+  #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)
+  #endif
+  #ifndef I_MS2_PIN
+    #define I_MS2_PIN    _EPIN(I_E_INDEX, MS2)
+  #endif
+  #ifndef I_MS3_PIN
+    #define I_MS3_PIN    _EPIN(I_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(I)
+    #ifndef I_SERIAL_TX_PIN
+      #define I_SERIAL_TX_PIN _EPIN(I_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef I_SERIAL_RX_PIN
+      #define I_SERIAL_RX_PIN _EPIN(I_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #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_
+    #elif DIAG_REMAPPED(I, Y_MIN)
+      #define I_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(I, Z_MIN)
+      #define I_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(I, X_MAX)
+      #define I_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(I, Y_MAX)
+      #define I_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(I, Z_MAX)
+      #define I_USE_ENDSTOP _ZMAX_
+    #else
+      #define _I_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define I_USE_ENDSTOP _I_USE_ENDSTOP(I_E_INDEX)
+    #endif
+    #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
+  #define I_CS_PIN  -1
+#endif
+#ifndef I_MS1_PIN
+  #define I_MS1_PIN -1
+#endif
+#ifndef I_MS2_PIN
+  #define I_MS2_PIN -1
+#endif
+#ifndef I_MS3_PIN
+  #define I_MS3_PIN -1
+#endif
+
+#if LINEAR_AXES >= 5
+  #ifndef J_STEP_PIN
+    #define J_STEP_PIN   _EPIN(J_E_INDEX, STEP)
+    #define J_DIR_PIN    _EPIN(J_E_INDEX, DIR)
+    #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!"
+    #endif
+  #endif
+  #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)
+  #endif
+  #ifndef J_MS2_PIN
+    #define J_MS2_PIN    _EPIN(J_E_INDEX, MS2)
+  #endif
+  #ifndef J_MS3_PIN
+    #define J_MS3_PIN    _EPIN(J_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(J)
+    #ifndef J_SERIAL_TX_PIN
+      #define J_SERIAL_TX_PIN _EPIN(J_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef J_SERIAL_RX_PIN
+      #define J_SERIAL_RX_PIN _EPIN(J_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #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_
+    #elif DIAG_REMAPPED(J, Y_MIN)
+      #define J_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(J, Z_MIN)
+      #define J_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(J, X_MAX)
+      #define J_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(J, Y_MAX)
+      #define J_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(I, Z_MAX)
+      #define J_USE_ENDSTOP _ZMAX_
+    #else
+      #define _J_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define J_USE_ENDSTOP _J_USE_ENDSTOP(J_E_INDEX)
+    #endif
+    #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
+  #define J_CS_PIN  -1
+#endif
+#ifndef J_MS1_PIN
+  #define J_MS1_PIN -1
+#endif
+#ifndef J_MS2_PIN
+  #define J_MS2_PIN -1
+#endif
+#ifndef J_MS3_PIN
+  #define J_MS3_PIN -1
+#endif
+
+#if LINEAR_AXES >= 6
+  #ifndef K_STEP_PIN
+    #define K_STEP_PIN   _EPIN(K_E_INDEX, STEP)
+    #define K_DIR_PIN    _EPIN(K_E_INDEX, DIR)
+    #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!"
+    #endif
+  #endif
+  #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)
+  #endif
+  #ifndef K_MS2_PIN
+    #define K_MS2_PIN    _EPIN(K_E_INDEX, MS2)
+  #endif
+  #ifndef K_MS3_PIN
+    #define K_MS3_PIN    _EPIN(K_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(K)
+    #ifndef K_SERIAL_TX_PIN
+      #define K_SERIAL_TX_PIN _EPIN(K_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef K_SERIAL_RX_PIN
+      #define K_SERIAL_RX_PIN _EPIN(K_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #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_
+    #elif DIAG_REMAPPED(K, Y_MIN)
+      #define K_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(K, Z_MIN)
+      #define K_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(K, X_MAX)
+      #define K_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(K, Y_MAX)
+      #define K_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(K, Z_MAX)
+      #define K_USE_ENDSTOP _ZMAX_
+    #else
+      #define _K_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define K_USE_ENDSTOP _K_USE_ENDSTOP(K_E_INDEX)
+    #endif
+    #undef K_DIAG_PIN
+  #endif
+#endif
+
+#ifndef K_CS_PIN
+  #define K_CS_PIN  -1
+#endif
+#ifndef K_MS1_PIN
+  #define K_MS1_PIN -1
+#endif
+#ifndef K_MS2_PIN
+  #define K_MS2_PIN -1
+#endif
+#ifndef K_MS3_PIN
+  #define K_MS3_PIN -1
+#endif
+
 //
 // Disable unused endstop / probe pins
 //
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index e304901940..9102bbab7b 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -187,8 +187,13 @@
   #else
     #define _I_MS3
   #endif
+  #if PIN_EXISTS(I_ENABLE)
+    #define _I_ENABLE_PIN I_ENABLE_PIN,
+  #else
+    #define _I_ENABLE_PIN
+  #endif
 
-  #define _I_PINS I_STEP_PIN, I_DIR_PIN, I_ENABLE_PIN, _I_MIN _I_MAX _I_MS1 _I_MS2 _I_MS3 _I_CS
+  #define _I_PINS I_STEP_PIN, I_DIR_PIN, _I_ENABLE_PIN _I_MIN _I_MAX _I_MS1 _I_MS2 _I_MS3 _I_CS
 
 #else
 
@@ -228,8 +233,13 @@
   #else
     #define _J_MS3
   #endif
+  #if PIN_EXISTS(J_ENABLE)
+    #define _J_ENABLE_PIN J_ENABLE_PIN,
+  #else
+    #define _J_ENABLE_PIN
+  #endif
 
-  #define _J_PINS J_STEP_PIN, J_DIR_PIN, J_ENABLE_PIN, _J_MIN _J_MAX _J_MS1 _J_MS2 _J_MS3 _J_CS
+  #define _J_PINS J_STEP_PIN, J_DIR_PIN, _J_ENABLE_PIN _J_MIN _J_MAX _J_MS1 _J_MS2 _J_MS3 _J_CS
 
 #else
 
@@ -269,8 +279,13 @@
   #else
     #define _K_MS3
   #endif
+  #if PIN_EXISTS(K_ENABLE)
+    #define _K_ENABLE_PIN K_ENABLE_PIN,
+  #else
+    #define _K_ENABLE_PIN
+  #endif
 
-  #define _K_PINS K_STEP_PIN, K_DIR_PIN, K_ENABLE_PIN, _K_MIN _K_MAX _K_MS1 _K_MS2 _K_MS3 _K_CS
+  #define _K_PINS K_STEP_PIN, K_DIR_PIN, _K_ENABLE_PIN _K_MIN _K_MAX _K_MS1 _K_MS2 _K_MS3 _K_CS
 
 #else
 
@@ -577,30 +592,32 @@
 #define _H6_PINS
 #define _H7_PINS
 
+#define DIO_PIN(P) TERN(TARGET_LPC1768, P, analogInputToDigitalPin(P))
+
 #if HAS_HOTEND
   #undef _H0_PINS
-  #define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_0_PIN),
+  #define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, DIO_PIN(TEMP_0_PIN),
   #if HAS_MULTI_HOTEND
     #undef _H1_PINS
-    #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_1_PIN),
+    #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, DIO_PIN(TEMP_1_PIN),
     #if HOTENDS > 2
       #undef _H2_PINS
-      #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_2_PIN),
+      #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, DIO_PIN(TEMP_2_PIN),
       #if HOTENDS > 3
         #undef _H3_PINS
-        #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_3_PIN),
+        #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, DIO_PIN(TEMP_3_PIN),
         #if HOTENDS > 4
           #undef _H4_PINS
-          #define _H4_PINS HEATER_4_PIN, E4_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_4_PIN),
+          #define _H4_PINS HEATER_4_PIN, E4_AUTO_FAN_PIN, DIO_PIN(TEMP_4_PIN),
           #if HOTENDS > 5
             #undef _H5_PINS
-            #define _H5_PINS HEATER_5_PIN, E5_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_5_PIN),
+            #define _H5_PINS HEATER_5_PIN, E5_AUTO_FAN_PIN, DIO_PIN(TEMP_5_PIN),
             #if HOTENDS > 6
               #undef _H6_PINS
-              #define _H6_PINS HEATER_6_PIN, E6_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_6_PIN),
+              #define _H6_PINS HEATER_6_PIN, E6_AUTO_FAN_PIN, DIO_PIN(TEMP_6_PIN),
               #if HOTENDS > 7
                 #undef _H7_PINS
-                #define _H7_PINS HEATER_7_PIN, E7_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_7_PIN),
+                #define _H7_PINS HEATER_7_PIN, E7_AUTO_FAN_PIN, DIO_PIN(TEMP_7_PIN),
               #endif // HOTENDS > 7
             #endif // HOTENDS > 6
           #endif // HOTENDS > 5
@@ -809,13 +826,13 @@
 #endif
 
 #if TEMP_SENSOR_BED && PINS_EXIST(TEMP_BED, HEATER_BED)
-  #define _BED_PINS HEATER_BED_PIN, analogInputToDigitalPin(TEMP_BED_PIN),
+  #define _BED_PINS HEATER_BED_PIN, DIO_PIN(TEMP_BED_PIN),
 #else
   #define _BED_PINS
 #endif
 
 #if TEMP_SENSOR_CHAMBER && PIN_EXISTS(TEMP_CHAMBER)
-  #define _CHAMBER_TEMP analogInputToDigitalPin(TEMP_CHAMBER_PIN),
+  #define _CHAMBER_TEMP DIO_PIN(TEMP_CHAMBER_PIN),
 #else
   #define _CHAMBER_TEMP
 #endif
@@ -831,17 +848,15 @@
 #endif
 
 #if TEMP_SENSOR_COOLER && PIN_EXISTS(TEMP_COOLER)
-  #define _COOLER_TEMP analogInputToDigitalPin(TEMP_COOLER_PIN),
+  #define _COOLER_TEMP DIO_PIN(TEMP_COOLER_PIN),
 #else
   #define _COOLER_TEMP
 #endif
-
 #if TEMP_SENSOR_COOLER && PIN_EXISTS(COOLER)
   #define _COOLER COOLER_PIN,
 #else
   #define _COOLER
 #endif
-
 #if TEMP_SENSOR_COOLER && PINS_EXIST(TEMP_COOLER, COOLER_AUTO_FAN)
   #define _COOLER_FAN COOLER_AUTO_FAN_PIN,
 #else
@@ -852,11 +867,30 @@
   #define HAL_SENSITIVE_PINS
 #endif
 
-#define SENSITIVE_PINS { \
+#ifdef RUNTIME_ONLY_ANALOG_TO_DIGITAL
+  #define _SP_END
+#else
+  #define _SP_END -2
+
+  // Move a regular pin in front to the end
+  template<pin_t F, pin_t ...D>
+  struct OnlyPins : OnlyPins<D..., F> { };
+
+  // Remove a -1 from the front
+  template<pin_t ...D>
+  struct OnlyPins<-1, D...> : OnlyPins<D...> { };
+
+  // Remove -2 from the front, emit the rest, cease propagation
+  template<pin_t ...D>
+  struct OnlyPins<_SP_END, D...> { static constexpr pin_t table[sizeof...(D)] PROGMEM = { D... }; };
+#endif
+
+#define SENSITIVE_PINS \
   _X_PINS _Y_PINS _Z_PINS _I_PINS _J_PINS _K_PINS \
   _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
   _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS \
   _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS _H6_PINS _H7_PINS \
   _PS_ON _FAN0 _FAN1 _FAN2 _FAN3 _FAN4 _FAN5 _FAN6 _FAN7 _FANC \
-  _BED_PINS _COOLER _CHAMBER_TEMP _CHAMBER_HEATER _CHAMBER_FAN HAL_SENSITIVE_PINS \
-}
+  _BED_PINS _CHAMBER_TEMP _CHAMBER_HEATER _CHAMBER_FAN \
+  _COOLER_TEMP _COOLER _COOLER_FAN HAL_SENSITIVE_PINS \
+  _SP_END
diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280
index 8b16b1dbc8..d8cefbaf81 100755
--- a/buildroot/tests/mega1280
+++ b/buildroot/tests/mega1280
@@ -47,7 +47,9 @@ exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBR
 #
 # Delta Config (generic) + ABL bilinear + BLTOUCH
 use_example_configs delta/generic
-opt_set LCD_LANGUAGE cz
+opt_set LCD_LANGUAGE cz \
+        Z_MIN_PROBE_ENDSTOP_INVERTING false \
+        Z_MIN_ENDSTOP_INVERTING false
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
 exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"
 
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index ecf82267f4..3ddb68fe88 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -193,7 +193,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER
+           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER I2C_AMMETER
 
 exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 
diff --git a/ini/features.ini b/ini/features.ini
index fd716aa8c5..fcdcc9b51f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -30,6 +30,7 @@ HAS_L64XX                              = Arduino-L6470@0.8.0
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
                                          src_filter=+<src/feature/leds/neopixel.cpp>
 TEMP_.+_IS_MAX31865                    = Adafruit MAX31865 library@~1.1.0
+I2C_AMMETER                            = peterus/INA226Lib@1.1.2
 USES_LIQUIDCRYSTAL                     = fmalpartida/LiquidCrystal@1.5.0
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 349016145c..25ebfb64b6 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -85,19 +85,11 @@ debug_tool        = stlink
 upload_protocol   = serial
 
 #
-# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
+# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
 #
 #   STM32F103RC_btt_maple ............. RCT6 with 256K
 #   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
-#   STM32F103RC_btt_512K_maple ........ RCT6 with 512K
-#   STM32F103RC_btt_512K_USB_maple .... RCT6 with 512K (USB mass storage)
 #
-# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP
-# and experience a printer freeze, re-flash Marlin using the regular (non-512K)
-# build option. 256K chips may be re-branded 512K chips, but this means the
-# upper 256K is sketchy, and failure is very likely.
-#
-
 [env:STM32F103RC_btt_maple]
 platform             = ${common_stm32f1.platform}
 extends              = common_STM32F103RC_maple
@@ -116,20 +108,6 @@ build_flags       = ${env:STM32F103RC_btt_maple.build_flags} -DUSE_USB_COMPOSITE
 lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
   USBComposite for STM32F1@0.91
 
-[env:STM32F103RC_btt_512K_maple]
-platform                  = ${common_stm32f1.platform}
-extends                   = env:STM32F103RC_btt_maple
-board_build.ldscript      = STM32F103RE_SKR_MINI_512K.ld
-board_upload.maximum_size = 524288
-build_flags               = ${env:STM32F103RC_btt_maple.build_flags} -DSTM32_FLASH_SIZE=512
-
-[env:STM32F103RC_btt_512K_USB_maple]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RC_btt_512K_maple
-build_flags       = ${env:STM32F103RC_btt_512K_maple.build_flags} -DUSE_USB_COMPOSITE
-lib_deps          = ${env:STM32F103RC_btt_512K_maple.lib_deps}
-  USBComposite for STM32F1@0.91
-
 #
 # Generic STM32F103RE environment
 #
@@ -155,7 +133,7 @@ debug_tool           = jlink
 upload_protocol      = jlink
 
 #
-# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
+# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt_maple ............. RET6
 #   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 150ddba01e..9954411c14 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -34,19 +34,6 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
 extra_scripts = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
 
-#
-# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
-#
-#   STM32F103RC_btt ............. RCT6 with 256K
-#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
-#   STM32F103RC_btt_512K ........ RCT6 with 512K
-#   STM32F103RC_btt_512K_USB .... RCT6 with 512K (USB mass storage)
-#
-# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP
-# and experience a printer freeze, re-flash Marlin using the regular (non-512K)
-# build option. 256K chips may be re-branded 512K chips, but this means the
-# upper 256K is sketchy, and failure is very likely.
-#
 [common_STM32F103RC]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
@@ -86,6 +73,12 @@ extends           = common_stm32
 board             = genericSTM32F103ZE
 monitor_speed     = 115200
 
+#
+# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
+#
+#   STM32F103RC_btt ............. RCT6 with 256K
+#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
+#
 [env:STM32F103RC_btt]
 platform             = ${common_stm32.platform}
 extends              = common_STM32F103RC
@@ -108,18 +101,6 @@ build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.b
   -DUSE_USB_HS_IN_FS
   -DUSBD_USE_CDC_MSC
 
-[env:STM32F103RC_btt_512K]
-platform          = ${common_stm32.platform}
-extends           = env:STM32F103RC_btt
-board_upload.maximum_size = 524288
-build_flags       = ${env:STM32F103RC_btt.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
-
-[env:STM32F103RC_btt_512K_USB]
-platform          = ${common_stm32.platform}
-extends           = env:STM32F103RC_btt_USB
-board_upload.maximum_size = 524288
-build_flags       = ${env:STM32F103RC_btt_USB.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
-
 #
 # MKS Robin (STM32F103ZET6)
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
@@ -185,7 +166,7 @@ debug_tool           = jlink
 upload_protocol      = jlink
 
 #
-# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
+# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt ............. RET6
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)