diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 59722e3ca5a3..b92b01528781 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -29,7 +29,7 @@ jobs:
         - DUE
         - esp32
         - linux_native
-        - megaatmega2560
+        - mega2560
         - teensy31
         - teensy35
         - SAMD51_grandcentral_m4
@@ -37,22 +37,23 @@ jobs:
         # Extended AVR Environments
 
         - FYSETC_F6_13
-        - megaatmega1280
+        - mega1280
         - rambo
-        - sanguino_atmega1284p
-        - sanguino_atmega644p
+        - sanguino1284p
+        - sanguino644p
 
         # Extended STM32 Environments
 
-        - STM32F103RC_bigtree
-        - STM32F103RC_bigtree_USB
-        - STM32F103RE_bigtree
-        - STM32F103RE_bigtree_USB
+        - STM32F103RC_btt
+        - STM32F103RC_btt_USB
+        - STM32F103RE_btt
+        - STM32F103RE_btt_USB
         - STM32F103RC_fysetc
         - jgaurora_a5s_a1
         - STM32F103VE_longer
         - STM32F407VE_black
         - BIGTREE_SKR_PRO
+        - BIGTREE_GTR_V1_0
         - mks_robin
         - ARMED
         - FYSETC_S6
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5679aa3093f7..f02e69ee5a6f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -36,7 +36,7 @@
  * Advanced settings can be found in Configuration_adv.h
  *
  */
-#define CONFIGURATION_H_VERSION 020004
+#define CONFIGURATION_H_VERSION 020005
 
 //===========================================================================
 //============================= Getting Started =============================
@@ -99,6 +99,7 @@
 /**
  * Select the serial port on the board to use for communication with the host.
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
+ * Serial port -1 is the USB emulated serial port, if available.
  * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
  *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
@@ -107,9 +108,6 @@
 
 /**
  * Select a secondary serial port on the board to use for communication with the host.
- * This allows the connection of wireless adapters (for instance) to non-default port pins.
- * Serial port -1 is the USB emulated serial port, if available.
- *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define SERIAL_PORT_2 -1
@@ -363,6 +361,7 @@
  *   331 : (3.3V scaled thermistor 1 table for MEGA)
  *   332 : (3.3V scaled thermistor 1 table for DUE)
  *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
+ *   202 : 200k thermistor - Copymaster 3D
  *     3 : Mendel-parts thermistor (4.7k pullup)
  *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
  *     5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)
@@ -474,7 +473,7 @@
 #if ENABLED(PIDTEMP)
   //#define PID_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
-  //#define PID_DEBUG             // Sends debug data to the serial port.
+  //#define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
   //#define PID_OPENLOOP 1        // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
@@ -925,6 +924,14 @@
   #define SMART_EFFECTOR_MOD_PIN  -1  // Connect a GPIO pin to the Smart Effector MOD pin
 #endif
 
+/**
+ * Use StallGuard2 to probe the bed with the nozzle.
+ * Requires stallGuard-capable Trinamic stepper drivers.
+ * CAUTION: This can damage machines with Z lead screws.
+ *          Take extreme care when setting up this feature.
+ */
+//#define SENSORLESS_PROBING
+
 //
 // For Z_PROBE_ALLEN_KEY see the Delta example configurations.
 //
@@ -1438,6 +1445,7 @@
 //#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
+#define EEPROM_BOOT_SILENT    // Keep M503 quiet and only give errors during first load
 #if ENABLED(EEPROM_SETTINGS)
   //#define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
 #endif
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ede35a561e08..00f89662c785 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -31,7 +31,7 @@
  * Basic settings can be found in Configuration.h
  *
  */
-#define CONFIGURATION_ADV_H_VERSION 020004
+#define CONFIGURATION_ADV_H_VERSION 020005
 
 // @section temperature
 
@@ -276,8 +276,10 @@
   #define AUTOTEMP_OLDWEIGHT 0.98
 #endif
 
-// Show extra position information with 'M114 D'
-//#define M114_DETAIL
+// Extra options for the M114 "Current Position" report
+//#define M114_DETAIL         // Use 'M114` for details to check planner calculations
+//#define M114_REALTIME       // Real current position based on forward kinematics
+//#define M114_LEGACY         // M114 used to synchronize on every call. Enable if needed.
 
 // Show Temperature ADC value
 // Enable for M105 to include ADC values read from temperature sensors.
@@ -336,15 +338,22 @@
  * Controller Fan
  * To cool down the stepper drivers and MOSFETs.
  *
- * The fan will turn on automatically whenever any stepper is enabled
- * and turn off after a set period after all steppers are turned off.
+ * The fan turns on automatically whenever any driver is enabled and turns
+ * off (or reduces to idle speed) shortly after drivers are turned off.
+ *
  */
 //#define USE_CONTROLLER_FAN
 #if ENABLED(USE_CONTROLLER_FAN)
-  //#define CONTROLLER_FAN_PIN -1           // Set a custom pin for the controller fan
-  #define CONTROLLERFAN_SECS 60             // Duration in seconds for the fan to run after all motors are disabled
-  #define CONTROLLERFAN_SPEED 255           // 255 == full speed
-  //#define CONTROLLERFAN_SPEED_Z_ONLY 127  // Reduce noise on machines that keep Z enabled
+  //#define CONTROLLER_FAN_PIN -1        // Set a custom pin for the controller fan
+  //#define CONTROLLER_FAN_USE_Z_ONLY    // With this option only the Z axis is considered
+  #define CONTROLLERFAN_SPEED_MIN      0 // (0-255) Minimum speed. (If set below this value the fan is turned off.)
+  #define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled
+  #define CONTROLLERFAN_SPEED_IDLE     0 // (0-255) Idle speed, used when motors are disabled
+  #define CONTROLLERFAN_IDLE_TIME     60 // (seconds) Extra time to keep the fan running after disabling motors
+  //#define CONTROLLER_FAN_EDITABLE      // Enable M710 configurable settings
+  #if ENABLED(CONTROLLER_FAN_EDITABLE)
+    #define CONTROLLER_FAN_MENU          // Enable the Controller Fan submenu
+  #endif
 #endif
 
 // When first starting the main fan, run it at full speed for the
@@ -716,6 +725,9 @@
   #define Z_STEPPER_ALIGN_ITERATIONS 5    // Number of iterations to apply during alignment
   #define Z_STEPPER_ALIGN_ACC        0.02 // Stop iterating early if the accuracy is better than this
   #define RESTORE_LEVELING_AFTER_G34      // Restore leveling after G34 is done?
+  // After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
+  // Re-homing might be more precise in reproducing the actual 'G28 Z' homing height, especially on an uneven bed.
+  #define HOME_AFTER_G34
 #endif
 
 // @section motion
@@ -748,8 +760,12 @@
 // Minimum time that a segment needs to take if the buffer is emptied
 #define DEFAULT_MINSEGMENTTIME        20000   // (ms)
 
-// If defined the movements slow down when the look ahead buffer is only half full
+// Slow down the machine if the look ahead buffer is (by default) half full.
+// Increase the slowdown divisor for larger buffer sizes.
 #define SLOWDOWN
+#if ENABLED(SLOWDOWN)
+  #define SLOWDOWN_DIVISOR 2
+#endif
 
 // Frequency limit
 // See nophead's blog for more info
@@ -990,7 +1006,11 @@
 // Show the E position (filament used) during printing
 //#define LCD_SHOW_E_TOTAL
 
-#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
+#if ENABLED(SHOW_BOOTSCREEN)
+  #define BOOTSCREEN_TIMEOUT 4000        // (ms) Total Duration to display the boot screen(s)
+#endif
+
+#if HAS_GRAPHICAL_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
   //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
   //#define SHOW_REMAINING_TIME          // Display estimated time to completion
   #if ENABLED(SHOW_REMAINING_TIME)
@@ -999,7 +1019,7 @@
   #endif
 #endif
 
-#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
+#if HAS_CHARACTER_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
   #if ENABLED(LCD_PROGRESS_BAR)
     #define PROGRESS_BAR_BAR_TIME 2000    // (ms) Amount of time to show the bar
@@ -1012,12 +1032,9 @@
 
 #if ENABLED(SDSUPPORT)
 
-  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
-  // around this by connecting a push button or single throw switch to the pin defined
-  // as SD_DETECT_PIN in your board's pins definitions.
-  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
-  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
-  #define SD_DETECT_INVERTED
+  // The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
+  // Enable this option and set to HIGH if your SD cards are incorrectly detected.
+  //#define SD_DETECT_STATE HIGH
 
   #define SD_FINISHED_STEPPERRELEASE true          // Disable steppers when SD Print is finished
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place.
@@ -1032,6 +1049,10 @@
 
   #define EVENT_GCODE_SD_STOP "G28XY"       // G-code to run on Stop Print (e.g., "G28XY" or "G27")
 
+  #if ENABLED(PRINTER_EVENT_LEDS)
+    #define PE_LEDS_COMPLETED_TIME  (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
+  #endif
+
   /**
    * Continue after Power-Loss (Creality3D)
    *
@@ -1039,9 +1060,13 @@
    * during SD printing. If the recovery file is found at boot time, present
    * an option on the LCD screen to continue the print from the last-known
    * point in the file.
+   *
+   * If the machine reboots when resuming a print you may need to replace or
+   * reformat the SD card. (Bad sectors delay startup triggering the watchdog.)
    */
   //#define POWER_LOSS_RECOVERY
   #if ENABLED(POWER_LOSS_RECOVERY)
+    #define PLR_ENABLED_DEFAULT   false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
     //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
     //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
     //#define POWER_LOSS_PIN         44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
@@ -1221,10 +1246,6 @@
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   //#define USE_SMALL_INFOFONT
 
-  // Enable this option and reduce the value to optimize screen updates.
-  // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
-  //#define DOGM_SPI_DELAY_US 5
-
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
@@ -1241,6 +1262,10 @@
    * This will prevent position updates from being displayed.
    */
   #if ENABLED(U8GLIB_ST7920)
+    // Enable this option and reduce the value to optimize screen updates.
+    // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
+    //#define DOGM_SPI_DELAY_US 5
+
     //#define LIGHTWEIGHT_UI
     #if ENABLED(LIGHTWEIGHT_UI)
       #define STATUS_EXPIRE_SECONDS 20
@@ -1278,7 +1303,7 @@
 // Additional options for DGUS / DWIN displays
 //
 #if HAS_DGUS_LCD
-  #define DGUS_SERIAL_PORT 2
+  #define DGUS_SERIAL_PORT 3
   #define DGUS_BAUDRATE 115200
 
   #define DGUS_RX_BUFFER_SIZE 128
@@ -1286,16 +1311,15 @@
   //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS  // Fix Rx overrun situation (Currently only for AVR)
 
   #define DGUS_UPDATE_INTERVAL_MS  500    // (ms) Interval between automatic screen updates
-  #define BOOTSCREEN_TIMEOUT      3000    // (ms) Duration to display the boot screen
 
   #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
     #define DGUS_PRINT_FILENAME           // Display the filename during printing
     #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
 
     #if ENABLED(DGUS_LCD_UI_FYSETC)
-      //#define DUGS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
+      //#define DGUS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
     #else
-      #define DUGS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
+      #define DGUS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
     #endif
 
     #define DGUS_FILAMENT_LOADUNLOAD
@@ -1578,7 +1602,7 @@
   #if ENABLED(PROBE_TEMP_COMPENSATION)
     // Max temperature that can be reached by heated bed.
     // This is required only for the calibration process.
-    #define PTC_MAX_BED_TEMP 110
+    #define PTC_MAX_BED_TEMP BED_MAXTEMP
 
     // Park position to wait for probe cooldown
     #define PTC_PARK_POS_X 0.0F
@@ -2015,7 +2039,7 @@
  * TMCStepper library is required to use TMC stepper drivers.
  * https://github.com/teemuatlut/TMCStepper
  */
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
   #define HOLD_MULTIPLIER    0.5  // Scales down the holding current from run current
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256
@@ -2302,14 +2326,6 @@
    */
   //#define SENSORLESS_HOMING // StallGuard capable drivers only
 
-  /**
-   * Use StallGuard2 to probe the bed with the nozzle.
-   *
-   * CAUTION: This could cause damage to machines that use a lead screw or threaded rod
-   *          to move the Z axis. Take extreme care when attempting to enable this feature.
-   */
-  //#define SENSORLESS_PROBING // StallGuard capable drivers only
-
   #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
     // TMC2209: 0...255. TMC2130: -64...63
     #define X_STALL_SENSITIVITY  8
@@ -2345,7 +2361,7 @@
    */
   #define TMC_ADV() {  }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
 
 // @section L64XX
 
@@ -2991,7 +3007,7 @@
   #define MAX7219_LOAD_PIN  44
 
   //#define MAX7219_GCODE          // Add the M7219 G-code to control the LED matrix
-  #define MAX7219_INIT_TEST    2   // Do a test pattern at initialization (Set to 2 for spiral)
+  #define MAX7219_INIT_TEST    2   // Test pattern at startup: 0=none, 1=sweep, 2=spiral
   #define MAX7219_NUMBER_UNITS 1   // Number of Max7219 units in chain.
   #define MAX7219_ROTATE       0   // Rotate the display clockwise (in multiples of +/- 90°)
                                    // connector at:  right=0   bottom=-90  top=90  left=180
diff --git a/Marlin/Makefile b/Marlin/Makefile
index fcd763881eef..0a9b3a45d708 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -267,6 +267,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1147)
 else ifeq ($(HARDWARE_MOTHERBOARD),1148)
 # MKS GEN L V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+# Copymaster 3D
+else ifeq ($(HARDWARE_MOTHERBOARD),1150)
 
 #
 # RAMBo and derivatives
diff --git a/Marlin/Version.h b/Marlin/Version.h
index b0ea5024acc3..30f339c6873c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,11 +28,7 @@
 /**
  * Marlin release version identifier
  */
-<<<<<<< HEAD
-//#define SHORT_BUILD_VERSION "2.0.2"
-=======
-//#define SHORT_BUILD_VERSION "2.0.4.4"
->>>>>>> pr/19
+//#define SHORT_BUILD_VERSION "2.0.5.3"
 
 /**
  * Verbose version identifier which should contain a reference to the location
@@ -45,11 +41,6 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-<<<<<<< HEAD
-//#define STRING_DISTRIBUTION_DATE "2020-01-27"
-=======
-//#define STRING_DISTRIBUTION_DATE "2020-01-31"
->>>>>>> pr/19
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/HAL.cpp
rename to Marlin/src/HAL/AVR/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/HAL.h
rename to Marlin/src/HAL/AVR/HAL.h
diff --git a/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
rename to Marlin/src/HAL/AVR/HAL_SPI.cpp
index 29d5e3870027..f1f9654c4e90 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/AVR/HAL_SPI.cpp
@@ -197,7 +197,7 @@ void spiBegin() {
     // output pin high - like sending 0xFF
     WRITE(MOSI_PIN, HIGH);
 
-    for (uint8_t i = 0; i < 8; i++) {
+    LOOP_L_N(i, 8) {
       WRITE(SCK_PIN, HIGH);
 
       nop; // adjust so SCK is nice
@@ -224,7 +224,7 @@ void spiBegin() {
   void spiSend(uint8_t data) {
     // no interrupts during byte send - about 8µs
     cli();
-    for (uint8_t i = 0; i < 8; i++) {
+    LOOP_L_N(i, 8) {
       WRITE(SCK_PIN, LOW);
       WRITE(MOSI_PIN, data & 0x80);
       data <<= 1;
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
rename to Marlin/src/HAL/AVR/MarlinSerial.cpp
index a0c636a9f976..350d0f302d19 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -55,7 +55,7 @@
   // A SW memory barrier, to ensure GCC does not overoptimize loops
   #define sw_barrier() asm volatile("": : :"memory");
 
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 
   // "Atomically" read the RX head index value without disabling interrupts:
   // This MUST be called with RX interrupts enabled, and CAN'T be called
@@ -682,7 +682,7 @@
 
     // Round correctly so that print(1.999, 2) prints as "2.00"
     double rounding = 0.5;
-    for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
+    LOOP_L_N(i, digits) rounding *= 0.1;
     number += rounding;
 
     // Extract the integer part of the number and print it
diff --git a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
similarity index 94%
rename from Marlin/src/HAL/HAL_AVR/MarlinSerial.h
rename to Marlin/src/HAL/AVR/MarlinSerial.h
index 33870e2ca657..cd7aad90a997 100644
--- a/Marlin/src/HAL/HAL_AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -31,10 +31,10 @@
  * Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
  */
 
-#include "../shared/MarlinSerial.h"
-
 #include <WString.h>
 
+#include "../../inc/MarlinConfigPre.h"
+
 #ifndef SERIAL_PORT
   #define SERIAL_PORT 0
 #endif
@@ -261,12 +261,12 @@
     static constexpr int PORT               = serial;
     static constexpr unsigned int RX_SIZE   = RX_BUFFER_SIZE;
     static constexpr unsigned int TX_SIZE   = TX_BUFFER_SIZE;
-    static constexpr bool XONOFF            = bSERIAL_XON_XOFF;
-    static constexpr bool EMERGENCYPARSER   = bEMERGENCY_PARSER;
-    static constexpr bool DROPPED_RX        = bSERIAL_STATS_DROPPED_RX;
-    static constexpr bool RX_OVERRUNS       = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
-    static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
-    static constexpr bool MAX_RX_QUEUED     = bSERIAL_STATS_MAX_RX_QUEUED;
+    static constexpr bool XONOFF            = ENABLED(SERIAL_XON_XOFF);
+    static constexpr bool EMERGENCYPARSER   = ENABLED(EMERGENCY_PARSER);
+    static constexpr bool DROPPED_RX        = ENABLED(SERIAL_STATS_DROPPED_RX);
+    static constexpr bool RX_OVERRUNS       = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
+    static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
+    static constexpr bool MAX_RX_QUEUED     = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
   };
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
 
@@ -304,7 +304,7 @@
     static constexpr bool XONOFF            = false;
     static constexpr bool EMERGENCYPARSER   = false;
     static constexpr bool DROPPED_RX        = false;
-    static constexpr bool RX_OVERRUNS       = bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS;
+    static constexpr bool RX_OVERRUNS       = HAS_DGUS_LCD && ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS);
     static constexpr bool RX_FRAMING_ERRORS = false;
     static constexpr bool MAX_RX_QUEUED     = false;
   };
diff --git a/Marlin/src/HAL/HAL_AVR/Servo.cpp b/Marlin/src/HAL/AVR/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/Servo.cpp
rename to Marlin/src/HAL/AVR/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/ServoTimers.h b/Marlin/src/HAL/AVR/ServoTimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/ServoTimers.h
rename to Marlin/src/HAL/AVR/ServoTimers.h
diff --git a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp b/Marlin/src/HAL/AVR/eeprom.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/AVR/eeprom.cpp
index 1ae37f892aa6..ee416b7a12f3 100644
--- a/Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/AVR/eeprom.cpp
@@ -25,7 +25,7 @@
 
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() { return true; }
 bool PersistentStore::access_finish() { return true; }
diff --git a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
rename to Marlin/src/HAL/AVR/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
rename to Marlin/src/HAL/AVR/fast_pwm.cpp
index 78a7ad883bd8..42e7cc3f107e 100644
--- a/Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -167,7 +167,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
     uint16_t prescaler[] = { 0, 1, 8, /*TIMER2 ONLY*/32, 64, /*TIMER2 ONLY*/128, 256, 1024 };
 
     // loop over prescaler values
-    for (uint8_t i = 1; i < 8; i++) {
+    LOOP_S_L_N(i, 1, 8) {
       uint16_t res_temp_fast = 255, res_temp_phase_correct = 255;
       if (timer.n == 2) {
         // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio.cpp
rename to Marlin/src/HAL/AVR/fastio.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio.h
rename to Marlin/src/HAL/AVR/fastio.h
index 2246a0f9d09f..a45e0f2bebb7 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -98,9 +98,9 @@
 
 #define SET_INPUT(IO)         _SET_INPUT(IO)
 #define SET_INPUT_PULLUP(IO)  do{ _SET_INPUT(IO); _WRITE(IO, HIGH); }while(0)
+#define SET_INPUT_PULLDOWN    SET_INPUT
 #define SET_OUTPUT(IO)        _SET_OUTPUT(IO)
-
-#define SET_PWM(IO)           SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 #define IS_INPUT(IO)          _IS_INPUT(IO)
 #define IS_OUTPUT(IO)         _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h b/Marlin/src/HAL/AVR/fastio/fastio_1280.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
rename to Marlin/src/HAL/AVR/fastio/fastio_1280.h
index f9f0d3ceee10..b62156caa774 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_1280.h
@@ -26,7 +26,7 @@
  *
  *   Hardware Pin  : 02 03 06 07 01 05 15 16 17 18 23 24 25 26 64 63 13 12 46 45 44 43 78 77 76 75 74 73 72 71 60 59 58 57 56 55 54 53 50 70 52 51 42 41 40 39 38 37 36 35 22 21 20 19 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 | 04 08 09 10 11 14 27 28 29 30 31 32 33 34 47 48 49 61 62 65 66 67 68 69 79 80 81 98 99 100
  *   Port          : E0 E1 E4 E5 G5 E3 H3 H4 H5 H6 B4 B5 B6 B7 J1 J0 H1 H0 D3 D2 D1 D0 A0 A1 A2 A3 A4 A5 A6 A7 C7 C6 C5 C4 C3 C2 C1 C0 D7 G2 G1 G0 L7 L6 L5 L4 L3 L2 L1 L0 B3 B2 B1 B0 F0 F1 F2 F3 F4 F5 F6 F7 K0 K1 K2 K3 K4 K5 K6 K7 | E2 E6 E7 xx xx H2 H7 G3 G4 xx xx xx xx xx D4 D5 D6 xx xx J2 J3 J4 J5 J6 J7 xx xx xx xx xx
- *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 72 75 76 77 74 xx xx xx xx xx
+ *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 73 75 76 77 74 xx xx xx xx xx
  */
 
 #include "../fastio.h"
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h b/Marlin/src/HAL/AVR/fastio/fastio_1281.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
rename to Marlin/src/HAL/AVR/fastio/fastio_1281.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h b/Marlin/src/HAL/AVR/fastio/fastio_168.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
rename to Marlin/src/HAL/AVR/fastio/fastio_168.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h b/Marlin/src/HAL/AVR/fastio/fastio_644.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
rename to Marlin/src/HAL/AVR/fastio/fastio_644.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h b/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
rename to Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h b/Marlin/src/HAL/AVR/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h b/Marlin/src/HAL/AVR/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
rename to Marlin/src/HAL/AVR/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
similarity index 97%
rename from Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
rename to Marlin/src/HAL/AVR/inc/SanityCheck.h
index 87864bcaf67b..1c7c68f2169c 100644
--- a/Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -56,7 +56,7 @@
 /**
  * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
  */
-#if HAS_TRINAMIC && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
+#if HAS_TRINAMIC_CONFIG && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
   #error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
 #endif
 
diff --git a/Marlin/src/HAL/HAL_AVR/math.h b/Marlin/src/HAL/AVR/math.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/math.h
rename to Marlin/src/HAL/AVR/math.h
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug.h
rename to Marlin/src/HAL/AVR/pinsDebug.h
index cea82ef3fa28..fbd2e084fad7 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -70,12 +70,12 @@
 
 void PRINT_ARRAY_NAME(uint8_t x) {
   char *name_mem_pointer = (char*)pgm_read_ptr(&pin_array[x].name);
-  for (uint8_t y = 0; y < MAX_NAME_LENGTH; y++) {
+  LOOP_L_N(y, MAX_NAME_LENGTH) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
     if (temp_char != 0)
       SERIAL_CHAR(temp_char);
     else {
-      for (uint8_t i = 0; i < MAX_NAME_LENGTH - y; i++) SERIAL_CHAR(' ');
+      LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
       break;
     }
   }
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
rename to Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
rename to Marlin/src/HAL/AVR/pinsDebug_plus_70.h
diff --git a/Marlin/src/HAL/HAL_AVR/spi_pins.h b/Marlin/src/HAL/AVR/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/spi_pins.h
rename to Marlin/src/HAL/AVR/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
rename to Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
index 60b4e8310496..fab79646f06b 100644
--- a/Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
+++ b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
@@ -88,7 +88,7 @@ void u8g_spiSend_sw_AVR_mode_0(uint8_t val) {
   volatile uint8_t *outData = u8g_outData,
                    *outClock = u8g_outClock;
   U8G_ATOMIC_START();
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (val & 0x80)
       *outData |= bitData;
     else
@@ -108,7 +108,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
   volatile uint8_t *outData = u8g_outData,
                    *outClock = u8g_outClock;
   U8G_ATOMIC_START();
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     *outClock &= bitNotClock;
     if (val & 0x80)
       *outData |= bitData;
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.cpp b/Marlin/src/HAL/AVR/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/watchdog.cpp
rename to Marlin/src/HAL/AVR/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog.h b/Marlin/src/HAL/AVR/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/watchdog.h
rename to Marlin/src/HAL/AVR/watchdog.h
diff --git a/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp b/Marlin/src/HAL/DUE/DebugMonitor.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
rename to Marlin/src/HAL/DUE/DebugMonitor.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp b/Marlin/src/HAL/DUE/EepromEmulation.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
rename to Marlin/src/HAL/DUE/EepromEmulation.cpp
index 926307935863..66af50cfd2e0 100644
--- a/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
+++ b/Marlin/src/HAL/DUE/EepromEmulation.cpp
@@ -54,10 +54,10 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && NONE(I2C_EEPROM, SPI_EEPROM)
+#if ENABLED(FLASH_EEPROM_EMULATION)
 
 #include "../shared/Marduino.h"
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #define EEPROMSize     4096
 #define PagesPerGroup   128
@@ -1016,5 +1016,5 @@ void eeprom_flush() {
   ee_Flush();
 }
 
-#endif // EEPROM_SETTINGS && (!I2C_EEPROM && !SPI_EEPROM)
+#endif // FLASH_EEPROM_EMULATION
 #endif // ARDUINO_ARCH_AVR
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/HAL.cpp
rename to Marlin/src/HAL/DUE/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/HAL.h
rename to Marlin/src/HAL/DUE/HAL.h
index 97b94b5db234..42f6f175fb35 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -39,7 +39,7 @@
 #include <stdint.h>
 
 // Define MYSERIAL0/1 before MarlinSerial includes!
-#if SERIAL_PORT == -1
+#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
   #define MYSERIAL0 customizedSerial1
 #elif SERIAL_PORT == 0
   #define MYSERIAL0 Serial
@@ -56,7 +56,7 @@
 #ifdef SERIAL_PORT_2
   #if SERIAL_PORT_2 == SERIAL_PORT
     #error "SERIAL_PORT_2 must be different from SERIAL_PORT. Please update your configuration."
-  #elif SERIAL_PORT_2 == -1
+  #elif SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER)
     #define MYSERIAL1 customizedSerial2
   #elif SERIAL_PORT_2 == 0
     #define MYSERIAL1 Serial
@@ -94,7 +94,6 @@
   #endif
 #endif
 
-
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
 
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
rename to Marlin/src/HAL/DUE/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp b/Marlin/src/HAL/DUE/InterruptVectors.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
rename to Marlin/src/HAL/DUE/InterruptVectors.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors.h b/Marlin/src/HAL/DUE/InterruptVectors.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors.h
rename to Marlin/src/HAL/DUE/InterruptVectors.h
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
rename to Marlin/src/HAL/DUE/MarlinSerial.cpp
index 3cd6f7d5ed34..d114c75989c4 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -45,7 +45,7 @@ template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSeria
 // A SW memory barrier, to ensure GCC does not overoptimize loops
 #define sw_barrier() asm volatile("": : :"memory");
 
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
 
 // (called with RX interrupts disabled)
 template<typename Cfg>
@@ -606,7 +606,7 @@ void MarlinSerial<Cfg>::printFloat(double number, uint8_t digits) {
 
   // Round correctly so that print(1.999, 2) prints as "2.00"
   double rounding = 0.5;
-  for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
+  LOOP_L_N(i, digits) rounding *= 0.1;
   number += rounding;
 
   // Extract the integer part of the number and print it
@@ -629,23 +629,13 @@ void MarlinSerial<Cfg>::printFloat(double number, uint8_t digits) {
 
 // If not using the USB port as serial port
 #if SERIAL_PORT >= 0
-
-  // Preinstantiate
-  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT>>;
-
-  // Instantiate
-  MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
-
+  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT>>;      // Define
+  MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;   // Instantiate
 #endif
 
-#ifdef SERIAL_PORT_2
-
-  // Preinstantiate
-  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>>;
-
-  // Instantiate
-  MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2;
-
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
+  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>>;    // Define
+  MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2; // Instantiate
 #endif
 
 #endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h b/Marlin/src/HAL/DUE/MarlinSerial.h
similarity index 92%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial.h
rename to Marlin/src/HAL/DUE/MarlinSerial.h
index af7d2b7adeef..fa6a2c7d157a 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/DUE/MarlinSerial.h
@@ -27,10 +27,10 @@
  * Based on MarlinSerial for AVR, copyright (c) 2006 Nicholas Zambetti.  All right reserved.
  */
 
-#include "../shared/MarlinSerial.h"
-
 #include <WString.h>
 
+#include "../../inc/MarlinConfigPre.h"
+
 #define DEC 10
 #define HEX 16
 #define OCT 8
@@ -163,22 +163,18 @@ struct MarlinSerialCfg {
   static constexpr int PORT               = serial;
   static constexpr unsigned int RX_SIZE   = RX_BUFFER_SIZE;
   static constexpr unsigned int TX_SIZE   = TX_BUFFER_SIZE;
-  static constexpr bool XONOFF            = bSERIAL_XON_XOFF;
-  static constexpr bool EMERGENCYPARSER   = bEMERGENCY_PARSER;
-  static constexpr bool DROPPED_RX        = bSERIAL_STATS_DROPPED_RX;
-  static constexpr bool RX_OVERRUNS       = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
-  static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
-  static constexpr bool MAX_RX_QUEUED     = bSERIAL_STATS_MAX_RX_QUEUED;
+  static constexpr bool XONOFF            = ENABLED(SERIAL_XON_XOFF);
+  static constexpr bool EMERGENCYPARSER   = ENABLED(EMERGENCY_PARSER);
+  static constexpr bool DROPPED_RX        = ENABLED(SERIAL_STATS_DROPPED_RX);
+  static constexpr bool RX_OVERRUNS       = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
+  static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
+  static constexpr bool MAX_RX_QUEUED     = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
 };
 
 #if SERIAL_PORT >= 0
-
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
+#endif
 
-#endif // SERIAL_PORT >= 0
-
-#ifdef SERIAL_PORT_2
-
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2;
-
 #endif
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
rename to Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index 38cdd8f8a15f..7a020bbaf0b1 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -29,12 +29,12 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
 
 #include "MarlinSerialUSB.h"
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 // Imports from Atmel USB Stack/CDC implementation
@@ -259,7 +259,7 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
 
   // Round correctly so that print(1.999, 2) prints as "2.00"
   double rounding = 0.5;
-  for (uint8_t i = 0; i < digits; ++i)
+  LOOP_L_N(i, digits)
     rounding *= 0.1;
 
   number += rounding;
@@ -283,8 +283,12 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
 }
 
 // Preinstantiate
-MarlinSerialUSB customizedSerial1;
-
-#endif // SERIAL_PORT == -1
+#if SERIAL_PORT == -1
+  MarlinSerialUSB customizedSerial1;
+#endif
+#if SERIAL_PORT_2 == -1
+  MarlinSerialUSB customizedSerial2;
+#endif
 
+#endif // HAS_USB_SERIAL
 #endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
similarity index 94%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
rename to Marlin/src/HAL/DUE/MarlinSerialUSB.h
index d8b051d37e01..9aece901b12b 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
@@ -28,7 +28,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
 
 #include <WString.h>
 
@@ -88,6 +88,12 @@ class MarlinSerialUSB {
   static void printFloat(double, uint8_t);
 };
 
-extern MarlinSerialUSB customizedSerial1;
+#if SERIAL_PORT == -1
+  extern MarlinSerialUSB customizedSerial1;
+#endif
+
+#if SERIAL_PORT_2 == -1
+  extern MarlinSerialUSB customizedSerial2;
+#endif
 
-#endif // SERIAL_PORT == -1
+#endif // HAS_USB_SERIAL
diff --git a/Marlin/src/HAL/HAL_DUE/Servo.cpp b/Marlin/src/HAL/DUE/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/Servo.cpp
rename to Marlin/src/HAL/DUE/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/ServoTimers.h b/Marlin/src/HAL/DUE/ServoTimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/ServoTimers.h
rename to Marlin/src/HAL/DUE/ServoTimers.h
diff --git a/Marlin/src/HAL/HAL_DUE/Tone.cpp b/Marlin/src/HAL/DUE/Tone.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/Tone.cpp
rename to Marlin/src/HAL/DUE/Tone.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
index 2563cf110fa8..96b7a1f61eb8 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
@@ -80,7 +80,7 @@ Pio *SCK_pPio, *MOSI_pPio;
 uint32_t SCK_dwMask, MOSI_dwMask;
 
 void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (val & 0x80)
       MOSI_pPio->PIO_SODR = MOSI_dwMask;
     else
@@ -94,7 +94,7 @@ void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
 }
 
 void u8g_spiSend_sw_DUE_mode_3(uint8_t val) { // 3.5MHz
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     SCK_pPio->PIO_CODR = SCK_dwMask;
     DELAY_NS(50);
     if (val & 0x80)
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
rename to Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
diff --git a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp b/Marlin/src/HAL/DUE/eeprom.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/DUE/eeprom.cpp
index 9fdcca7850f1..ec9ef51ffcad 100644
--- a/Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/DUE/eeprom.cpp
@@ -27,9 +27,9 @@
 #if ENABLED(EEPROM_SETTINGS)
 
 #include "../../inc/MarlinConfig.h"
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
-#if !defined(E2END) && NONE(I2C_EEPROM, SPI_EEPROM)
+#if !defined(E2END) && ENABLED(FLASH_EEPROM_EMULATION)
   #define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp)
 #endif
 
@@ -38,7 +38,7 @@ extern void eeprom_flush();
 bool PersistentStore::access_start() { return true; }
 
 bool PersistentStore::access_finish() {
-  #if NONE(I2C_EEPROM, SPI_EEPROM)
+  #if ENABLED(FLASH_EEPROM_EMULATION)
     eeprom_flush();
   #endif
   return true;
diff --git a/Marlin/src/HAL/HAL_DUE/endstop_interrupts.h b/Marlin/src/HAL/DUE/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
rename to Marlin/src/HAL/DUE/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_DUE/fastio.h b/Marlin/src/HAL/DUE/fastio.h
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/fastio.h
rename to Marlin/src/HAL/DUE/fastio.h
index 6f1f8d8bf2a8..01abd8204946 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio.h
+++ b/Marlin/src/HAL/DUE/fastio.h
@@ -166,7 +166,7 @@
 // Set pin as output (wrapper) -  reads the pin and sets the output to that value
 #define SET_OUTPUT(IO)       _SET_OUTPUT(IO)
 // Set pin as PWM
-#define SET_PWM(IO)           SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 // Check if pin is an input
 #define IS_INPUT(IO)         ((digitalPinToPort(IO)->PIO_OSR & digitalPinToBitMask(IO)) == 0)
diff --git a/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
new file mode 100644
index 000000000000..672932f56cd5
--- /dev/null
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
@@ -0,0 +1,206 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * The PWM module is only used to generate interrupts at specified times. It
+ * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
+ * that interrupt.
+ *
+ * All PWMs use the same repetition rate.  The G2 needs about 10KHz min in order to
+ * not have obvious ripple on the Vref signals.
+ *
+ * The data structures are setup to minimize the computation done by the ISR which
+ * minimizes ISR execution time.  Execution times are 0.8 to 1.1 microseconds.
+ *
+ * FIve PWM interrupt sources are used.  Channel 0 sets the base period.  All Vref
+ * signals are set active when this counter overflows and resets to zero.  The compare
+ * values in channels 1-4 are set to give the desired duty cycle for that Vref pin.
+ * When counter 0 matches the compare value then that channel generates an interrupt.
+ * The ISR checks the source of the interrupt and sets the corresponding pin inactive.
+ *
+ * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if MB(PRINTRBOARD_G2)
+
+#include "G2_PWM.h"
+
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+  #define G2_PWM_X 1
+#else
+  #define G2_PWM_X 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+  #define G2_PWM_Y 1
+#else
+  #define G2_PWM_Y 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+  #define G2_PWM_Z 1
+#else
+  #define G2_PWM_Z 0
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+  #define G2_PWM_E 1
+#else
+  #define G2_PWM_E 0
+#endif
+#define G2_MASK_X(V) (G2_PWM_X * (V))
+#define G2_MASK_Y(V) (G2_PWM_Y * (V))
+#define G2_MASK_Z(V) (G2_PWM_Z * (V))
+#define G2_MASK_E(V) (G2_PWM_E * (V))
+
+volatile uint32_t *SODR_A = &PIOA->PIO_SODR,
+                  *SODR_B = &PIOB->PIO_SODR,
+                  *CODR_A = &PIOA->PIO_CODR,
+                  *CODR_B = &PIOB->PIO_CODR;
+
+PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;
+
+void Stepper::digipot_init() {
+
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0);  // init pins
+  #endif
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
+  #endif
+  #if G2_PWM_Z
+    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
+  #endif
+  #if G2_PWM_E
+    OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
+  #endif
+
+  #define WPKEY          (0x50574D << 8) // “PWM” in ASCII
+  #define WPCMD_DIS_SW   0  // command to disable Write Protect SW
+  #define WPRG_ALL       (PWM_WPCR_WPRG0 | PWM_WPCR_WPRG1 | PWM_WPCR_WPRG2 | PWM_WPCR_WPRG3 | PWM_WPCR_WPRG4 | PWM_WPCR_WPRG5)  // all Write Protect Groups
+
+  #define PWM_CLOCK_F    F_CPU / 1000000UL   // set clock to 1MHz
+
+  PMC->PMC_PCER1 = PMC_PCER1_PID36;                       // enable PWM controller clock (disabled on power up)
+
+  PWM->PWM_WPCR = WPKEY | WPRG_ALL | WPCMD_DIS_SW;        // enable setting of all PWM registers
+  PWM->PWM_CLK = PWM_CLOCK_F;                             // enable CLK_A and set it to 1MHz, leave CLK_B disabled
+  PWM->PWM_CH_NUM[0].PWM_CMR = 0b1011;                    // set channel 0 to Clock A input & to left aligned
+  if (G2_PWM_X) PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011;      // set channel 1 to Clock A input & to left aligned
+  if (G2_PWM_Y) PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011;      // set channel 2 to Clock A input & to left aligned
+  if (G2_PWM_Z) PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011;      // set channel 3 to Clock A input & to left aligned
+  if (G2_PWM_E) PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011;      // set channel 4 to Clock A input & to left aligned
+
+  PWM->PWM_CH_NUM[0].PWM_CPRD = PWM_PERIOD_US;            // set channel 0 Period
+
+  PWM->PWM_IER2 = PWM_IER1_CHID0;                         // generate interrupt when counter0 overflows
+  PWM->PWM_IER2 = PWM_IER2_CMPM0
+    | G2_MASK_X(PWM_IER2_CMPM1)
+    | G2_MASK_Y(PWM_IER2_CMPM2)
+    | G2_MASK_Z(PWM_IER2_CMPM3)
+    | G2_MASK_E(PWM_IER2_CMPM4)
+  ; // generate interrupt on compare event
+
+  if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive
+  if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive
+  if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1])); // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive
+  if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2])); // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive
+
+  if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPM = 0x0001;  // enable compare event
+  if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPM = 0x0001;  // enable compare event
+  if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPM = 0x0001;  // enable compare event
+  if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPM = 0x0001;  // enable compare event
+
+  PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0
+    | G2_MASK_X(PWM_SCM_SYNC1)
+    | G2_MASK_Y(PWM_SCM_SYNC2)
+    | G2_MASK_Z(PWM_SCM_SYNC3)
+    | G2_MASK_E(PWM_SCM_SYNC4)
+  ; // sync 1-4 with 0, use mode 0 for updates
+
+  PWM->PWM_ENA = PWM_ENA_CHID0
+    | G2_MASK_X(PWM_ENA_CHID1)
+    | G2_MASK_Y(PWM_ENA_CHID2)
+    | G2_MASK_Z(PWM_ENA_CHID3)
+    | G2_MASK_E(PWM_ENA_CHID4)
+  ; // enable channels used by G2
+
+  PWM->PWM_IER1 = PWM_IER1_CHID0
+    | G2_MASK_X(PWM_IER1_CHID1)
+    | G2_MASK_Y(PWM_IER1_CHID2)
+    | G2_MASK_Z(PWM_IER1_CHID3)
+    | G2_MASK_E(PWM_IER1_CHID4)
+  ; // enable interrupts for channels used by G2
+
+  NVIC_EnableIRQ(PWM_IRQn);     // Enable interrupt handler
+  NVIC_SetPriority(PWM_IRQn, NVIC_EncodePriority(0, 10, 0));  // normal priority for PWM module (can stand some jitter on the Vref signals)
+}
+
+void Stepper::digipot_current(const uint8_t driver, const int16_t current) {
+
+  if (!(PWM->PWM_CH_NUM[0].PWM_CPRD == PWM_PERIOD_US)) digipot_init();  // Init PWM system if needed
+
+  switch (driver) {
+    case 0:
+      if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update X & Y
+      if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));
+      if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001;  // enable compare event
+      if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001;  // enable compare event
+      if (G2_PWM_X || G2_PWM_Y) PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+      break;
+    case 1:
+      if (G2_PWM_Z) {
+        PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update Z
+        PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001;  // enable compare event
+        PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+      }
+      break;
+    default:
+      if (G2_PWM_E) {
+        PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update E
+        PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001;  // enable compare event
+        PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
+      }
+      break;
+  }
+}
+
+volatile uint32_t PWM_ISR1_STATUS, PWM_ISR2_STATUS;
+
+void PWM_Handler() {
+  PWM_ISR1_STATUS = PWM->PWM_ISR1;
+  PWM_ISR2_STATUS = PWM->PWM_ISR2;
+  if (PWM_ISR1_STATUS & PWM_IER1_CHID0) {                                                         // CHAN_0 interrupt
+    if (G2_PWM_X) *ISR_table[0].set_register = ISR_table[0].write_mask;                           // set X to active
+    if (G2_PWM_Y) *ISR_table[1].set_register = ISR_table[1].write_mask;                           // set Y to active
+    if (G2_PWM_Z) *ISR_table[2].set_register = ISR_table[2].write_mask;                           // set Z to active
+    if (G2_PWM_E) *ISR_table[3].set_register = ISR_table[3].write_mask;                           // set E to active
+  }
+  else {
+    if (G2_PWM_X && (PWM_ISR2_STATUS & PWM_IER2_CMPM1)) *ISR_table[0].clr_register = ISR_table[0].write_mask; // set X to inactive
+    if (G2_PWM_Y && (PWM_ISR2_STATUS & PWM_IER2_CMPM2)) *ISR_table[1].clr_register = ISR_table[1].write_mask; // set Y to inactive
+    if (G2_PWM_Z && (PWM_ISR2_STATUS & PWM_IER2_CMPM3)) *ISR_table[2].clr_register = ISR_table[2].write_mask; // set Z to inactive
+    if (G2_PWM_E && (PWM_ISR2_STATUS & PWM_IER2_CMPM4)) *ISR_table[3].clr_register = ISR_table[3].write_mask; // set E to inactive
+  }
+  return;
+}
+
+#endif // PRINTRBOARD_G2
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
similarity index 96%
rename from Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
rename to Marlin/src/HAL/DUE/fastio/G2_PWM.h
index 1a802ed0f376..a94c1c527657 100644
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
@@ -63,7 +63,7 @@ extern PWM_map ISR_table[NUM_PWMS];
 extern uint32_t motor_current_setting[3];
 
 #define IR_BIT(p) (WITHIN(p, 0, 3) ? (p) : (p) + 4)
-#define COPY_ACTIVE_TABLE() do{ for (uint8_t i = 0; i < 6 ; i++) work_table[i] = active_table[i]; }while(0)
+#define COPY_ACTIVE_TABLE() do{ LOOP_L_N(i, 6) work_table[i] = active_table[i]; }while(0)
 
 #define PWM_MR0 19999         // base repetition rate minus one count - 20mS
 #define PWM_PR 24             // prescaler value - prescaler divide by 24 + 1  -  1 MHz output
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h b/Marlin/src/HAL/DUE/fastio/G2_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
rename to Marlin/src/HAL/DUE/fastio/G2_pins.h
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h b/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h b/Marlin/src/HAL/DUE/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
similarity index 87%
rename from Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
rename to Marlin/src/HAL/DUE/inc/Conditionals_post.h
index 0285c52ee365..8a305009ce27 100644
--- a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
@@ -20,3 +20,9 @@
  *
  */
 #pragma once
+
+#if USE_FALLBACK_EEPROM
+  #undef SRAM_EEPROM_EMULATION
+  #undef SDCARD_EEPROM_EMULATION
+  #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
rename to Marlin/src/HAL/DUE/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/pinsDebug.h
rename to Marlin/src/HAL/DUE/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_DUE/spi_pins.h b/Marlin/src/HAL/DUE/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/spi_pins.h
rename to Marlin/src/HAL/DUE/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_DUE/timers.cpp b/Marlin/src/HAL/DUE/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/timers.cpp
rename to Marlin/src/HAL/DUE/timers.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/timers.h
rename to Marlin/src/HAL/DUE/timers.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/arduino_due_x.h b/Marlin/src/HAL/DUE/usb/arduino_due_x.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/arduino_due_x.h
rename to Marlin/src/HAL/DUE/usb/arduino_due_x.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/compiler.h b/Marlin/src/HAL/DUE/usb/compiler.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/compiler.h
rename to Marlin/src/HAL/DUE/usb/compiler.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_access.h b/Marlin/src/HAL/DUE/usb/conf_access.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_access.h
rename to Marlin/src/HAL/DUE/usb/conf_access.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_clock.h b/Marlin/src/HAL/DUE/usb/conf_clock.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_clock.h
rename to Marlin/src/HAL/DUE/usb/conf_clock.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/conf_usb.h b/Marlin/src/HAL/DUE/usb/conf_usb.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/conf_usb.h
rename to Marlin/src/HAL/DUE/usb/conf_usb.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c b/Marlin/src/HAL/DUE/usb/ctrl_access.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c
rename to Marlin/src/HAL/DUE/usb/ctrl_access.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h b/Marlin/src/HAL/DUE/usb/ctrl_access.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h
rename to Marlin/src/HAL/DUE/usb/ctrl_access.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/genclk.h b/Marlin/src/HAL/DUE/usb/genclk.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/genclk.h
rename to Marlin/src/HAL/DUE/usb/genclk.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/mrepeat.h b/Marlin/src/HAL/DUE/usb/mrepeat.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/mrepeat.h
rename to Marlin/src/HAL/DUE/usb/mrepeat.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/osc.h b/Marlin/src/HAL/DUE/usb/osc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/osc.h
rename to Marlin/src/HAL/DUE/usb/osc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/pll.h b/Marlin/src/HAL/DUE/usb/pll.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/pll.h
rename to Marlin/src/HAL/DUE/usb/pll.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/preprocessor.h b/Marlin/src/HAL/DUE/usb/preprocessor.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/preprocessor.h
rename to Marlin/src/HAL/DUE/usb/preprocessor.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sbc_protocol.h b/Marlin/src/HAL/DUE/usb/sbc_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sbc_protocol.h
rename to Marlin/src/HAL/DUE/usb/sbc_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp
rename to Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h
rename to Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h b/Marlin/src/HAL/DUE/usb/spc_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h
rename to Marlin/src/HAL/DUE/usb/spc_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/stringz.h b/Marlin/src/HAL/DUE/usb/stringz.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/stringz.h
rename to Marlin/src/HAL/DUE/usb/stringz.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sysclk.c b/Marlin/src/HAL/DUE/usb/sysclk.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sysclk.c
rename to Marlin/src/HAL/DUE/usb/sysclk.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/sysclk.h b/Marlin/src/HAL/DUE/usb/sysclk.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/sysclk.h
rename to Marlin/src/HAL/DUE/usb/sysclk.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/tpaste.h b/Marlin/src/HAL/DUE/usb/tpaste.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/tpaste.h
rename to Marlin/src/HAL/DUE/usb/tpaste.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc.c b/Marlin/src/HAL/DUE/usb/udc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc.c
rename to Marlin/src/HAL/DUE/usb/udc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc.h b/Marlin/src/HAL/DUE/usb/udc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc.h
rename to Marlin/src/HAL/DUE/usb/udc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udc_desc.h b/Marlin/src/HAL/DUE/usb/udc_desc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udc_desc.h
rename to Marlin/src/HAL/DUE/usb/udc_desc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udd.h b/Marlin/src/HAL/DUE/usb/udd.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udd.h
rename to Marlin/src/HAL/DUE/usb/udd.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi.h b/Marlin/src/HAL/DUE/usb/udi.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi.h
rename to Marlin/src/HAL/DUE/usb/udi.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c b/Marlin/src/HAL/DUE/usb/udi_cdc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c
rename to Marlin/src/HAL/DUE/usb/udi_cdc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h b/Marlin/src/HAL/DUE/usb/udi_cdc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h
rename to Marlin/src/HAL/DUE/usb/udi_cdc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h b/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h
rename to Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_cdc_desc.c b/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_cdc_desc.c
rename to Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c b/Marlin/src/HAL/DUE/usb/udi_composite_desc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c
rename to Marlin/src/HAL/DUE/usb/udi_composite_desc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_msc.c b/Marlin/src/HAL/DUE/usb/udi_msc.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_msc.c
rename to Marlin/src/HAL/DUE/usb/udi_msc.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/udi_msc.h b/Marlin/src/HAL/DUE/usb/udi_msc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/udi_msc.h
rename to Marlin/src/HAL/DUE/usb/udi_msc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c b/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c
rename to Marlin/src/HAL/DUE/usb/uotghs_device_due.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h b/Marlin/src/HAL/DUE/usb/uotghs_device_due.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h
rename to Marlin/src/HAL/DUE/usb/uotghs_device_due.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h b/Marlin/src/HAL/DUE/usb/uotghs_otg.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h
rename to Marlin/src/HAL/DUE/usb/uotghs_otg.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol.h b/Marlin/src/HAL/DUE/usb/usb_protocol.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol_cdc.h b/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol_cdc.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_protocol_msc.h b/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_protocol_msc.h
rename to Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_task.c b/Marlin/src/HAL/DUE/usb/usb_task.c
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_task.c
rename to Marlin/src/HAL/DUE/usb/usb_task.c
diff --git a/Marlin/src/HAL/HAL_DUE/usb/usb_task.h b/Marlin/src/HAL/DUE/usb/usb_task.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/usb/usb_task.h
rename to Marlin/src/HAL/DUE/usb/usb_task.h
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.cpp b/Marlin/src/HAL/DUE/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/watchdog.cpp
rename to Marlin/src/HAL/DUE/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog.h b/Marlin/src/HAL/DUE/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/watchdog.h
rename to Marlin/src/HAL/DUE/watchdog.h
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
rename to Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h b/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
rename to Marlin/src/HAL/ESP32/FlushableHardwareSerial.h
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL.cpp
rename to Marlin/src/HAL/ESP32/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL.h
rename to Marlin/src/HAL/ESP32/HAL.h
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp b/Marlin/src/HAL/ESP32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
rename to Marlin/src/HAL/ESP32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.cpp b/Marlin/src/HAL/ESP32/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/Servo.cpp
rename to Marlin/src/HAL/ESP32/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/Servo.h b/Marlin/src/HAL/ESP32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/Servo.h
rename to Marlin/src/HAL/ESP32/Servo.h
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp b/Marlin/src/HAL/ESP32/WebSocketSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
rename to Marlin/src/HAL/ESP32/WebSocketSerial.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h b/Marlin/src/HAL/ESP32/WebSocketSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
rename to Marlin/src/HAL/ESP32/WebSocketSerial.h
diff --git a/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
rename to Marlin/src/HAL/ESP32/eeprom_impl.cpp
index 7113b684128e..dbfee14055c4 100644
--- a/Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/ESP32/eeprom_impl.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 #include "EEPROM.h"
 
 #define EEPROM_SIZE 4096
diff --git a/Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h b/Marlin/src/HAL/ESP32/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
rename to Marlin/src/HAL/ESP32/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_ESP32/fastio.h b/Marlin/src/HAL/ESP32/fastio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_ESP32/fastio.h
rename to Marlin/src/HAL/ESP32/fastio.h
index 9c4efaee9de3..09930194d616 100644
--- a/Marlin/src/HAL/HAL_ESP32/fastio.h
+++ b/Marlin/src/HAL/ESP32/fastio.h
@@ -56,7 +56,7 @@
 #define SET_OUTPUT(IO)          do{ _SET_OUTPUT(IO); }while(0)
 
 // Set pin as PWM
-#define SET_PWM(IO)             SET_OUTPUT(IO)
+#define SET_PWM                 SET_OUTPUT
 
 // Set pin as output and init
 #define OUT_WRITE(IO,V)         do{ _SET_OUTPUT(IO); WRITE(IO,V); }while(0)
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/i2s.cpp
rename to Marlin/src/HAL/ESP32/i2s.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.h b/Marlin/src/HAL/ESP32/i2s.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/i2s.h
rename to Marlin/src/HAL/ESP32/i2s.h
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h b/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h b/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
rename to Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
new file mode 100644
index 000000000000..11603c9ef41d
--- /dev/null
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h
@@ -0,0 +1,27 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
rename to Marlin/src/HAL/ESP32/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.cpp b/Marlin/src/HAL/ESP32/ota.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/ota.cpp
rename to Marlin/src/HAL/ESP32/ota.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/ota.h b/Marlin/src/HAL/ESP32/ota.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/ota.h
rename to Marlin/src/HAL/ESP32/ota.h
diff --git a/Marlin/src/HAL/HAL_ESP32/servotimers.h b/Marlin/src/HAL/ESP32/servotimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/servotimers.h
rename to Marlin/src/HAL/ESP32/servotimers.h
diff --git a/Marlin/src/HAL/HAL_ESP32/spi_pins.h b/Marlin/src/HAL/ESP32/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/spi_pins.h
rename to Marlin/src/HAL/ESP32/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.cpp b/Marlin/src/HAL/ESP32/spiffs.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/spiffs.cpp
rename to Marlin/src/HAL/ESP32/spiffs.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/spiffs.h b/Marlin/src/HAL/ESP32/spiffs.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/spiffs.h
rename to Marlin/src/HAL/ESP32/spiffs.h
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.cpp b/Marlin/src/HAL/ESP32/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/timers.cpp
rename to Marlin/src/HAL/ESP32/timers.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/timers.h
rename to Marlin/src/HAL/ESP32/timers.h
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.cpp b/Marlin/src/HAL/ESP32/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/watchdog.cpp
rename to Marlin/src/HAL/ESP32/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog.h b/Marlin/src/HAL/ESP32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/watchdog.h
rename to Marlin/src/HAL/ESP32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_ESP32/web.cpp b/Marlin/src/HAL/ESP32/web.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/web.cpp
rename to Marlin/src/HAL/ESP32/web.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/web.h b/Marlin/src/HAL/ESP32/web.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/web.h
rename to Marlin/src/HAL/ESP32/web.h
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.cpp b/Marlin/src/HAL/ESP32/wifi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/wifi.cpp
rename to Marlin/src/HAL/ESP32/wifi.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/wifi.h b/Marlin/src/HAL/ESP32/wifi.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/wifi.h
rename to Marlin/src/HAL/ESP32/wifi.h
diff --git a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
deleted file mode 100644
index fd2c6ccf9770..000000000000
--- a/Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * The PWM module is only used to generate interrupts at specified times. It
- * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
- * that interrupt.
- *
- * All PWMs use the same repetition rate.  The G2 needs about 10KHz min in order to
- * not have obvious ripple on the Vref signals.
- *
- * The data structures are setup to minimize the computation done by the ISR which
- * minimizes ISR execution time.  Execution times are 0.8 to 1.1 microseconds.
- *
- * FIve PWM interrupt sources are used.  Channel 0 sets the base period.  All Vref
- * signals are set active when this counter overflows and resets to zero.  The compare
- * values in channels 1-4 are set to give the desired duty cycle for that Vref pin.
- * When counter 0 matches the compare value then that channel generates an interrupt.
- * The ISR checks the source of the interrupt and sets the corresponding pin inactive.
- *
- * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
- */
-
-#include "../../../inc/MarlinConfig.h"
-
-#if MB(PRINTRBOARD_G2)
-
-#include "G2_PWM.h"
-
-volatile uint32_t *SODR_A = &PIOA->PIO_SODR,
-                  *SODR_B = &PIOB->PIO_SODR,
-                  *CODR_A = &PIOA->PIO_CODR,
-                  *CODR_B = &PIOB->PIO_CODR;
-
-PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;
-
-void Stepper::digipot_init() {
-
-  OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0);  // init pins
-  OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
-  OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
-  OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
-
-  #define WPKEY          (0x50574D << 8) // “PWM” in ASCII
-  #define WPCMD_DIS_SW   0  // command to disable Write Protect SW
-  #define WPRG_ALL       (PWM_WPCR_WPRG0 | PWM_WPCR_WPRG1 | PWM_WPCR_WPRG2 | PWM_WPCR_WPRG3 | PWM_WPCR_WPRG4 | PWM_WPCR_WPRG5)  // all Write Protect Groups
-
-  #define PWM_CLOCK_F    F_CPU / 1000000UL   // set clock to 1MHz
-
-  PMC->PMC_PCER1 = PMC_PCER1_PID36;                       // enable PWM controller clock (disabled on power up)
-
-  PWM->PWM_WPCR = WPKEY | WPRG_ALL | WPCMD_DIS_SW;        // enable setting of all PWM registers
-  PWM->PWM_CLK = PWM_CLOCK_F;                             // enable CLK_A and set it to 1MHz, leave CLK_B disabled
-  PWM->PWM_CH_NUM[0].PWM_CMR = 0b1011;                    // set channel 0 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011;                    // set channel 1 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011;                    // set channel 2 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011;                    // set channel 3 to Clock A input & to left aligned
-  PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011;                    // set channel 4 to Clock A input & to left aligned
-
-  PWM->PWM_CH_NUM[0].PWM_CPRD = PWM_PERIOD_US;            // set channel 0 Period
-
-  PWM->PWM_IER2 = PWM_IER1_CHID0;                         // generate interrupt when counter0 overflows
-  PWM->PWM_IER2 = PWM_IER2_CMPM0 | PWM_IER2_CMPM1 | PWM_IER2_CMPM2 | PWM_IER2_CMPM3 | PWM_IER2_CMPM4;        // generate interrupt on compare event
-
-  PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0]));   // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive
-  PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0]));   // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive
-  PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1]));   // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive
-  PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2]));   // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive
-
-  PWM->PWM_CMP[1].PWM_CMPM = 0x0001;  // enable compare event
-  PWM->PWM_CMP[2].PWM_CMPM = 0x0001;  // enable compare event
-  PWM->PWM_CMP[3].PWM_CMPM = 0x0001;  // enable compare event
-  PWM->PWM_CMP[4].PWM_CMPM = 0x0001;  // enable compare event
-
-  PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0 | PWM_SCM_SYNC1 | PWM_SCM_SYNC2 | PWM_SCM_SYNC3 | PWM_SCM_SYNC4; // sync 1-4 with 0, use mode 0 for updates
-
-  PWM->PWM_ENA = PWM_ENA_CHID0 | PWM_ENA_CHID1 | PWM_ENA_CHID2 | PWM_ENA_CHID3 | PWM_ENA_CHID4;         // enable the channels used by G2
-  PWM->PWM_IER1 = PWM_IER1_CHID0 | PWM_IER1_CHID1 | PWM_IER1_CHID2 | PWM_IER1_CHID3 | PWM_IER1_CHID4;        // enable interrupts for the channels used by G2
-
-  NVIC_EnableIRQ(PWM_IRQn);     // Enable interrupt handler
-  NVIC_SetPriority(PWM_IRQn, NVIC_EncodePriority(0, 10, 0));  // normal priority for PWM module (can stand some jitter on the Vref signals)
-}
-
-void Stepper::digipot_current(const uint8_t driver, const int16_t current) {
-
-  if (!(PWM->PWM_CH_NUM[0].PWM_CPRD == PWM_PERIOD_US)) digipot_init();  // Init PWM system if needed
-
-  switch (driver) {
-    case 0: PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update X & Y
-            PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));
-            PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
-            break;
-    case 1: PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update Z
-            PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
-            break;
-    default:PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current));    // update E
-            PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001;  // enable compare event
-            PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle
-            break;
-  }
-}
-
-volatile uint32_t PWM_ISR1_STATUS, PWM_ISR2_STATUS;
-
-void PWM_Handler() {
-  PWM_ISR1_STATUS = PWM->PWM_ISR1;
-  PWM_ISR2_STATUS = PWM->PWM_ISR2;
-  if (PWM_ISR1_STATUS & PWM_IER1_CHID0) {                           // CHAN_0 interrupt
-    *ISR_table[0].set_register = ISR_table[0].write_mask;                                          // set X to active
-    *ISR_table[1].set_register = ISR_table[1].write_mask;                                          // set Y to active
-    *ISR_table[2].set_register = ISR_table[2].write_mask;                                          // set Z to active
-    *ISR_table[3].set_register = ISR_table[3].write_mask;                                          // set E to active
-  }
-  else {
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM1)  *ISR_table[0].clr_register = ISR_table[0].write_mask;   // set X to inactive
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM2)  *ISR_table[1].clr_register = ISR_table[1].write_mask;   // set Y to inactive
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM3)  *ISR_table[2].clr_register = ISR_table[2].write_mask;   // set Z to inactive
-    if (PWM_ISR2_STATUS & PWM_IER2_CMPM4)  *ISR_table[3].clr_register = ISR_table[3].write_mask;   // set E to inactive
-  }
-  return;
-}
-
-#endif // PRINTRBOARD_G2
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
deleted file mode 100644
index a1fa34204013..000000000000
--- a/Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if PIO_PLATFORM_VERSION < 1001
-  #error "nxplpc-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries. You may need to remove the platform and let it reinstall automatically."
-#endif
-#if PIO_FRAMEWORK_VERSION < 2002
-  #error "framework-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries."
-#endif
-
-/**
- * Detect an old pins file by checking for old ADC pins values.
- */
-#define _OLD_TEMP_PIN(P) PIN_EXISTS(P) && _CAT(P,_PIN) <= 7 && _CAT(P,_PIN) != 2 && _CAT(P,_PIN) != 3
-#if _OLD_TEMP_PIN(TEMP_BED)
-  #error "TEMP_BED_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_0)
-  #error "TEMP_0_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_1)
-  #error "TEMP_1_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_2)
-  #error "TEMP_2_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_3)
-  #error "TEMP_3_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_4)
-  #error "TEMP_4_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_5)
-  #error "TEMP_5_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_6)
-  #error "TEMP_6_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#elif _OLD_TEMP_PIN(TEMP_7)
-  #error "TEMP_7_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
-#endif
-#undef _OLD_TEMP_PIN
-
-/**
- * Because PWM hardware channels all share the same frequency, along with the
- * fallback software channels, FAST_PWM_FAN is incompatible with Servos.
- */
-#if NUM_SERVOS > 0 && ENABLED(FAST_PWM_FAN)
-  #error "BLTOUCH and Servos are incompatible with FAST_PWM_FAN on LPC176x boards."
-#endif
-
-/**
- * Test LPC176x-specific configuration values for errors at compile-time.
- */
-
-//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
-//  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
-//#endif
-
-#if IS_RE_ARM_BOARD && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && HAS_DRIVER(TMC2130) && DISABLED(TMC_USE_SW_SPI)
-  #error "Re-ARM with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER and TMC2130 require TMC_USE_SW_SPI"
-#endif
-
-#if ENABLED(BAUD_RATE_GCODE)
-  #error "BAUD_RATE_GCODE is not yet supported on LPC176x."
-#endif
-
-/**
- * Flag any serial port conflicts
- *
- *   Port  |  TX   |  RX   |
- *    ---  |  ---  |  ---  |
- * Serial  | P0_02 | P0_03 |
- * Serial1 | P0_15 | P0_16 |
- * Serial2 | P0_10 | P0_11 |
- * Serial3 | P0_00 | P0_01 |
- */
-#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
-  #if  X_CS_PIN == P0_02 || TMC_SW_MISO == P0_02 || (E_STEPPERS && E_MUX1_PIN == P0_02) \
-    || Y_CS_PIN == P0_03 || TMC_SW_MOSI == P0_03 || (E_STEPPERS && E_MUX0_PIN == P0_03)
-    #error "Serial port assignment (0) conflicts with other pins!"
-  #endif
-#endif
-
-#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
-  #if TMC_SW_SCK == P0_15
-    #error "Serial port assignment (1) conflicts with other pins!"
-  #elif HAS_SPI_LCD
-    #if  BTN_EN2 == P0_15 || SCK_PIN == P0_15 || LCD_PINS_D4 == P0_15 || DOGLCD_SCK == P0_15 || LCD_RESET_PIN == P0_15 || LCD_PINS_RS == P0_15 || SHIFT_CLK == P0_15 \
-      || BTN_EN1 == P0_16 || LCD_SDSS == P0_16 || LCD_PINS_RS == P0_16 || MISO_PIN == P0_16 || DOGLCD_A0 == P0_16 || SS_PIN == P0_16 || LCD_SDSS == P0_16 || DOGLCD_CS == P0_16 || LCD_RESET_PIN == P0_16 || LCD_BACKLIGHT_PIN == P0_16
-      #error "Serial port assignment (1) conflicts with other pins!"
-    #endif
-  #endif
-#endif
-
-#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
-  #if  Y_MIN_PIN == P0_10 || Z_MIN_PROBE_PIN == P0_10 \
-    || X_ENABLE_PIN == P0_10 || Y_ENABLE_PIN == P0_10 || X2_ENABLE_PIN == P0_10 || Y2_ENABLE_PIN == P0_10 || Z2_ENABLE_PIN == P0_10 || Z3_ENABLE_PIN == P0_10 || Z4_ENABLE_PIN == P0_10 \
-    || X2_CS_PIN == P0_10 || Y2_CS_PIN == P0_10 || Z2_CS_PIN == P0_10 || Z3_CS_PIN == P0_10 || Z4_CS_PIN == P0_10 \
-    || X_DIR_PIN == P0_11 || Y_DIR_PIN == P0_11 || X2_DIR_PIN == P0_11 || Y2_DIR_PIN == P0_11 || Z2_DIR_PIN == P0_11 || Z3_DIR_PIN == P0_11 || Z4_DIR_PIN == P0_11 \
-    || X2_STEP_PIN == P0_11 || Y2_STEP_PIN == P0_11 || Z2_STEP_PIN == P0_11 || Z3_STEP_PIN == P0_11 || Z4_STEP_PIN == P0_11
-    #error "Serial port assignment (2) conflicts with other pins!"
-  #elif  (E_STEPPERS > 1 && (E1_ENABLE_PIN == P0_10 || E1_CS_PIN == P0_10)) || (E_STEPPERS > 0 && (E0_DIR_PIN == P0_11 || E0_STEP_PIN == P0_11))
-    #error "Serial port assignment (2) conflicts with other pins!"
-  #endif
-#endif
-
-#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
-  #if  X_MIN_PIN == P0_00 || Y_SERIAL_TX_PIN == P0_00 || Y_SERIAL_RX_PIN == P0_00 \
-    || X_MAX_PIN == P0_01 || X_SERIAL_TX_PIN == P0_01 || X_SERIAL_RX_PIN == P0_01
-    #error "Serial port assignment (2) conflicts with other pins!"
-  #elif E_STEPPERS > 1 && (E1_DIR_PIN == P0_00 || E1_STEP_PIN == P0_01)
-    #error "Serial port assignment (2) conflicts with other pins!"
-  #endif
-#endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp b/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
deleted file mode 100644
index c450599d7b16..000000000000
--- a/Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- *
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifdef __SAMD51__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(EEPROM_SETTINGS)
-
-#include "../shared/persistent_store_api.h"
-
-#if NONE(SPI_EEPROM, I2C_EEPROM)
-  #define NVMCTRL_CMD(c)    do{                                                 \
-                              SYNC(!NVMCTRL->STATUS.bit.READY);                 \
-                              NVMCTRL->INTFLAG.bit.DONE = true;                 \
-                              NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \
-                              SYNC(NVMCTRL->INTFLAG.bit.DONE);                  \
-                            }while(0)
-  #define NVMCTRL_FLUSH()   do{                                           \
-                              if (NVMCTRL->SEESTAT.bit.LOAD)              \
-                                NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH);  \
-                            }while(0)
-#endif
-
-bool PersistentStore::access_start() {
-  #if NONE(SPI_EEPROM, I2C_EEPROM)
-    NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED;  // Buffered mode and segment reallocation active
-  #endif
-
-  return true;
-}
-
-bool PersistentStore::access_finish() {
-  #if NONE(SPI_EEPROM, I2C_EEPROM)
-    NVMCTRL_FLUSH();
-    if (!NVMCTRL->SEESTAT.bit.LOCK)
-      NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE);    // Lock E2P data write access
-  #endif
-
-  return true;
-}
-
-bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
-  #if NONE(SPI_EEPROM, I2C_EEPROM)
-    if (NVMCTRL->SEESTAT.bit.RLOCK)
-      NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE);    // Unlock E2P data write access
-  #endif
-
-  while (size--) {
-    const uint8_t v = *value;
-    #if ANY(SPI_EEPROM, I2C_EEPROM)
-      uint8_t * const p = (uint8_t * const)pos;
-      if (v != eeprom_read_byte(p)) {
-        eeprom_write_byte(p, v);
-        delay(2);
-        if (eeprom_read_byte(p) != v) {
-          SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
-          return true;
-        }
-      }
-    #else
-      SYNC(NVMCTRL->SEESTAT.bit.BUSY);
-      if (NVMCTRL->INTFLAG.bit.SEESFULL)
-        NVMCTRL_FLUSH();      // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
-      ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
-      SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
-    #endif
-    crc16(crc, &v, 1);
-    pos++;
-    value++;
-  }
-  return false;
-}
-
-bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
-  while (size--) {
-    uint8_t c;
-    #if ANY(SPI_EEPROM, I2C_EEPROM)
-      c = eeprom_read_byte((uint8_t*)pos);
-    #else
-      SYNC(NVMCTRL->SEESTAT.bit.BUSY);
-      c = ((volatile uint8_t *)SEEPROM_ADDR)[pos];
-    #endif
-    if (writing) *value = c;
-    crc16(crc, &c, 1);
-    pos++;
-    value++;
-  }
-  return false;
-}
-
-size_t PersistentStore::capacity() {
-  #if ANY(SPI_EEPROM, I2C_EEPROM)
-    return E2END + 1;
-  #else
-    const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ,
-                  sblk = NVMCTRL->SEESTAT.bit.SBLK;
-
-         if (!psz && !sblk)         return     0;
-    else if (psz <= 2)              return (0x200 << psz);
-    else if (sblk == 1 || psz == 3) return  4096;
-    else if (sblk == 2 || psz == 4) return  8192;
-    else if (sblk <= 4 || psz == 5) return 16384;
-    else if (sblk >= 9 && psz == 7) return 65536;
-    else                            return 32768;
-  #endif
-}
-
-#endif // EEPROM_SETTINGS
-
-#endif // __SAMD51__
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
deleted file mode 100644
index 0285c52ee365..000000000000
--- a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
deleted file mode 100644
index 0285c52ee365..000000000000
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
deleted file mode 100644
index 0285c52ee365..000000000000
--- a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h b/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
deleted file mode 100644
index 0285c52ee365..000000000000
--- a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.cpp b/Marlin/src/HAL/LINUX/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/HAL.cpp
rename to Marlin/src/HAL/LINUX/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/HAL.h
rename to Marlin/src/HAL/LINUX/HAL.h
diff --git a/Marlin/src/HAL/HAL_LINUX/arduino.cpp b/Marlin/src/HAL/LINUX/arduino.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/arduino.cpp
rename to Marlin/src/HAL/LINUX/arduino.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp b/Marlin/src/HAL/LINUX/eeprom_impl.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
rename to Marlin/src/HAL/LINUX/eeprom_impl.cpp
index 660ecd56f184..4745f0567392 100644
--- a/Marlin/src/HAL/HAL_LINUX/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/LINUX/eeprom_impl.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 #include <stdio.h>
 
 #define LINUX_EEPROM_SIZE (E2END + 1)
diff --git a/Marlin/src/HAL/HAL_LINUX/fastio.h b/Marlin/src/HAL/LINUX/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/fastio.h
rename to Marlin/src/HAL/LINUX/fastio.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp b/Marlin/src/HAL/LINUX/hardware/Clock.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Clock.cpp
rename to Marlin/src/HAL/LINUX/hardware/Clock.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Clock.h b/Marlin/src/HAL/LINUX/hardware/Clock.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Clock.h
rename to Marlin/src/HAL/LINUX/hardware/Clock.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp b/Marlin/src/HAL/LINUX/hardware/Gpio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Gpio.cpp
rename to Marlin/src/HAL/LINUX/hardware/Gpio.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h b/Marlin/src/HAL/LINUX/hardware/Gpio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Gpio.h
rename to Marlin/src/HAL/LINUX/hardware/Gpio.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp b/Marlin/src/HAL/LINUX/hardware/Heater.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
rename to Marlin/src/HAL/LINUX/hardware/Heater.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.h b/Marlin/src/HAL/LINUX/hardware/Heater.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Heater.h
rename to Marlin/src/HAL/LINUX/hardware/Heater.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.cpp
rename to Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h b/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/IOLoggerCSV.h
rename to Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp b/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.cpp
rename to Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h b/Marlin/src/HAL/LINUX/hardware/LinearAxis.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/LinearAxis.h
rename to Marlin/src/HAL/LINUX/hardware/LinearAxis.h
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp b/Marlin/src/HAL/LINUX/hardware/Timer.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Timer.cpp
rename to Marlin/src/HAL/LINUX/hardware/Timer.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Timer.h b/Marlin/src/HAL/LINUX/hardware/Timer.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/hardware/Timer.h
rename to Marlin/src/HAL/LINUX/hardware/Timer.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h b/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h b/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h b/Marlin/src/HAL/LINUX/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
rename to Marlin/src/HAL/LINUX/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
rename to Marlin/src/HAL/LINUX/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h b/Marlin/src/HAL/LINUX/include/Arduino.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/include/Arduino.h
rename to Marlin/src/HAL/LINUX/include/Arduino.h
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/include/pinmapping.cpp
rename to Marlin/src/HAL/LINUX/include/pinmapping.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/include/pinmapping.h b/Marlin/src/HAL/LINUX/include/pinmapping.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/include/pinmapping.h
rename to Marlin/src/HAL/LINUX/include/pinmapping.h
diff --git a/Marlin/src/HAL/HAL_LINUX/include/serial.h b/Marlin/src/HAL/LINUX/include/serial.h
similarity index 99%
rename from Marlin/src/HAL/HAL_LINUX/include/serial.h
rename to Marlin/src/HAL/LINUX/include/serial.h
index 1036d6539df9..c881d5dbdad9 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/serial.h
+++ b/Marlin/src/HAL/LINUX/include/serial.h
@@ -23,7 +23,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../../feature/emergency_parser.h"
+  #include "../../../feature/e_parser.h"
 #endif
 
 #include <stdarg.h>
diff --git a/Marlin/src/HAL/HAL_LINUX/main.cpp b/Marlin/src/HAL/LINUX/main.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/main.cpp
rename to Marlin/src/HAL/LINUX/main.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/pinsDebug.h b/Marlin/src/HAL/LINUX/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/pinsDebug.h
rename to Marlin/src/HAL/LINUX/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_LINUX/servo_private.h b/Marlin/src/HAL/LINUX/servo_private.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/servo_private.h
rename to Marlin/src/HAL/LINUX/servo_private.h
diff --git a/Marlin/src/HAL/HAL_LINUX/spi_pins.h b/Marlin/src/HAL/LINUX/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/spi_pins.h
rename to Marlin/src/HAL/LINUX/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.cpp b/Marlin/src/HAL/LINUX/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/timers.cpp
rename to Marlin/src/HAL/LINUX/timers.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/timers.h
rename to Marlin/src/HAL/LINUX/timers.h
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.cpp b/Marlin/src/HAL/LINUX/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/watchdog.cpp
rename to Marlin/src/HAL/LINUX/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_LINUX/watchdog.h b/Marlin/src/HAL/LINUX/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/watchdog.h
rename to Marlin/src/HAL/LINUX/watchdog.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp b/Marlin/src/HAL/LPC1768/DebugMonitor.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
rename to Marlin/src/HAL/LPC1768/DebugMonitor.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/HAL.cpp
rename to Marlin/src/HAL/LPC1768/HAL.cpp
index f0559d268a1c..f206ce7adb76 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL.cpp
@@ -67,9 +67,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return ind > -1 ? ind : dval;
 }
 
-void flashFirmware(int16_t value) {
-  NVIC_SystemReset();
-}
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
 
 void HAL_clear_reset_source(void) {
   #if ENABLED(USE_WATCHDOG)
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
similarity index 99%
rename from Marlin/src/HAL/HAL_LPC1768/HAL.h
rename to Marlin/src/HAL/LPC1768/HAL.h
index c727877ff372..f5ea629f1694 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -195,7 +195,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 void HAL_idletask();
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
 
 /**
  * set_pwm_frequency
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp
rename to Marlin/src/HAL/LPC1768/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp b/Marlin/src/HAL/LPC1768/MarlinSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
rename to Marlin/src/HAL/LPC1768/MarlinSerial.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h b/Marlin/src/HAL/LPC1768/MarlinSerial.h
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
rename to Marlin/src/HAL/LPC1768/MarlinSerial.h
index cfddc28406de..b6bbf8e453f2 100644
--- a/Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.h
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 #ifndef SERIAL_PORT
diff --git a/Marlin/src/HAL/HAL_LPC1768/Servo.h b/Marlin/src/HAL/LPC1768/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/Servo.h
rename to Marlin/src/HAL/LPC1768/Servo.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h b/Marlin/src/HAL/LPC1768/eeprom_api.h
similarity index 95%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
rename to Marlin/src/HAL/LPC1768/eeprom_api.h
index 55a58fde1dfb..f874eac58a74 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_api.h
+++ b/Marlin/src/HAL/LPC1768/eeprom_api.h
@@ -21,6 +21,6 @@
  */
 #pragma once
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #define FLASH_EEPROM_EMULATION
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/LPC1768/eeprom_flash.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
rename to Marlin/src/HAL/LPC1768/eeprom_flash.cpp
index c7cad4d96c53..9225807480fe 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_flash.cpp
@@ -36,15 +36,12 @@
  * 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently
  * unused).
  */
-#include "../../inc/MarlinConfigPre.h"
-
-#if ENABLED(EEPROM_SETTINGS)
-
-#include "persistent_store_api.h"
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
+#include "eeprom_api.h"
+
 extern "C" {
   #include <lpc17xx_iap.h>
 }
@@ -128,5 +125,4 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 size_t PersistentStore::capacity() { return EEPROM_SIZE; }
 
 #endif // FLASH_EEPROM_EMULATION
-#endif // EEPROM_SETTINGS
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
index 50d52fb8607d..d982bd6268ca 100644
--- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
@@ -22,14 +22,11 @@
  */
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfigPre.h"
-
-#if ENABLED(EEPROM_SETTINGS)
-
 #include "../../inc/MarlinConfig.h"
-#include "persistent_store_api.h"
 
-#if DISABLED(FLASH_EEPROM_EMULATION)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
+
+#include "eeprom_api.h"
 
 #include <chanfs/diskio.h>
 #include <chanfs/ff.h>
@@ -178,6 +175,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return 4096; } // 4KiB of Emulated EEPROM
 
-#endif // !FLASH_EEPROM_EMULATION
-#endif // EEPROM_SETTINGS
+#endif // SDCARD_EEPROM_EMULATION
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
rename to Marlin/src/HAL/LPC1768/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/fast_pwm.cpp
rename to Marlin/src/HAL/LPC1768/fast_pwm.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/fastio.h b/Marlin/src/HAL/LPC1768/fastio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/fastio.h
rename to Marlin/src/HAL/LPC1768/fastio.h
index 48de5b8fa079..8e8e66db7225 100644
--- a/Marlin/src/HAL/HAL_LPC1768/fastio.h
+++ b/Marlin/src/HAL/LPC1768/fastio.h
@@ -104,7 +104,7 @@
 /// set pin as output wrapper  -  reads the pin and sets the output to that value
 #define SET_OUTPUT(IO)        do{ _WRITE(IO, _READ(IO)); _SET_OUTPUT(IO); }while(0)
 // set pin as PWM
-#define SET_PWM(IO)           SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 /// check if pin is an input wrapper
 #define IS_INPUT(IO)          _IS_INPUT(IO)
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
rename to Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
similarity index 87%
rename from Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
rename to Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
index 0285c52ee365..490cfd50e889 100644
--- a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
@@ -20,3 +20,7 @@
  *
  */
 #pragma once
+
+#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
new file mode 100644
index 000000000000..949c7f489991
--- /dev/null
+++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -0,0 +1,253 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if PIO_PLATFORM_VERSION < 1001
+  #error "nxplpc-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries. You may need to remove the platform and let it reinstall automatically."
+#endif
+#if PIO_FRAMEWORK_VERSION < 2002
+  #error "framework-arduino-lpc176x package is out of date, Please update the PlatformIO platforms, frameworks and libraries."
+#endif
+
+/**
+ * Detect an old pins file by checking for old ADC pins values.
+ */
+#define _OLD_TEMP_PIN(P) PIN_EXISTS(P) && _CAT(P,_PIN) <= 7 && _CAT(P,_PIN) != 2 && _CAT(P,_PIN) != 3
+#if _OLD_TEMP_PIN(TEMP_BED)
+  #error "TEMP_BED_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_0)
+  #error "TEMP_0_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_1)
+  #error "TEMP_1_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_2)
+  #error "TEMP_2_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_3)
+  #error "TEMP_3_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_4)
+  #error "TEMP_4_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_5)
+  #error "TEMP_5_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_6)
+  #error "TEMP_6_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#elif _OLD_TEMP_PIN(TEMP_7)
+  #error "TEMP_7_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
+#endif
+#undef _OLD_TEMP_PIN
+
+/**
+ * Because PWM hardware channels all share the same frequency, along with the
+ * fallback software channels, FAST_PWM_FAN is incompatible with Servos.
+ */
+static_assert(!(NUM_SERVOS && ENABLED(FAST_PWM_FAN)), "BLTOUCH and Servos are incompatible with FAST_PWM_FAN on LPC176x boards.");
+
+/**
+ * Test LPC176x-specific configuration values for errors at compile-time.
+ */
+
+//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+//  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
+//#endif
+
+#if MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && HAS_DRIVER(TMC2130) && DISABLED(TMC_USE_SW_SPI)
+    #error "Re-ARM with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER and TMC2130 requires TMC_USE_SW_SPI."
+  #endif
+#endif
+
+static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported on LPC176x.");
+
+/**
+ * Flag any serial port conflicts
+ *
+ *   Port  |  TX   |  RX   |
+ *    ---  |  ---  |  ---  |
+ * Serial  | P0_02 | P0_03 |
+ * Serial1 | P0_15 | P0_16 |
+ * Serial2 | P0_10 | P0_11 |
+ * Serial3 | P0_00 | P0_01 |
+ */
+#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
+  #define IS_TX0(P) (P == P0_02)
+  #define IS_RX0(P) (P == P0_03)
+  #if IS_TX0(TMC_SW_MISO) || IS_RX0(TMC_SW_MOSI)
+    #error "Serial port pins (0) conflict with Trinamic SPI pins!"
+  #elif ENABLED(MK2_MULTIPLEXER) && (IS_TX0(E_MUX1_PIN) || IS_RX0(E_MUX0_PIN))
+    #error "Serial port pins (0) conflict with MK2 multiplexer pins!"
+  #elif (AXIS_HAS_SPI(X) && IS_TX0(X_CS_PIN)) || (AXIS_HAS_SPI(Y) && IS_RX0(Y_CS_PIN))
+    #error "Serial port pins (0) conflict with X/Y axis SPI pins!"
+  #endif
+  #undef IS_TX0
+  #undef IS_RX0
+#endif
+
+#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
+  #define IS_TX1(P) (P == P0_15)
+  #define IS_RX1(P) (P == P0_16)
+  #if IS_TX1(TMC_SW_SCK)
+    #error "Serial port pins (1) conflict with other pins!"
+  #elif HAS_SPI_LCD
+    #if IS_TX1(BTN_EN2) || IS_RX1(BTN_EN1)
+      #error "Serial port pins (1) conflict with Encoder Buttons!"
+    #elif IS_TX1(SCK_PIN) || IS_TX1(LCD_PINS_D4) || IS_TX1(DOGLCD_SCK) || IS_TX1(LCD_RESET_PIN) || IS_TX1(LCD_PINS_RS) || IS_TX1(SHIFT_CLK) \
+      || IS_RX1(LCD_SDSS) || IS_RX1(LCD_PINS_RS) || IS_RX1(MISO_PIN) || IS_RX1(DOGLCD_A0) || IS_RX1(SS_PIN) || IS_RX1(LCD_SDSS) || IS_RX1(DOGLCD_CS) || IS_RX1(LCD_RESET_PIN) || IS_RX1(LCD_BACKLIGHT_PIN)
+      #error "Serial port pins (1) conflict with LCD pins!"
+    #endif
+  #endif
+  #undef IS_TX1
+  #undef IS_RX1
+#endif
+
+#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
+  #define IS_TX2(P) (P == P0_10)
+  #define IS_RX2(P) (P == P0_11)
+  #if  IS_TX2(X2_ENABLE_PIN) || IS_RX2(X2_DIR_PIN) || IS_RX2(X2_STEP_PIN) || (AXIS_HAS_SPI(X2) && IS_TX2(X2_CS_PIN))
+    #error "Serial port pins (2) conflict with X2 pins!"
+  #elif IS_TX2(Y2_ENABLE_PIN) || IS_RX2(Y2_DIR_PIN) || IS_RX2(Y2_STEP_PIN) || (AXIS_HAS_SPI(Y2) && IS_TX2(Y2_CS_PIN))
+    #error "Serial port pins (2) conflict with Y2 pins!"
+  #elif IS_TX2(Z2_ENABLE_PIN) || IS_RX2(Z2_DIR_PIN) || IS_RX2(Z2_STEP_PIN) || (AXIS_HAS_SPI(Z2) && IS_TX2(Z2_CS_PIN))
+    #error "Serial port pins (2) conflict with Z2 pins!"
+  #elif IS_TX2(Z3_ENABLE_PIN) || IS_RX2(Z3_DIR_PIN) || IS_RX2(Z3_STEP_PIN) || (AXIS_HAS_SPI(Z3) && IS_TX2(Z3_CS_PIN))
+    #error "Serial port pins (2) conflict with Z3 pins!"
+  #elif IS_TX2(Z4_ENABLE_PIN) || IS_RX2(Z4_DIR_PIN) || IS_RX2(Z4_STEP_PIN) || (AXIS_HAS_SPI(Z4) && IS_TX2(Z4_CS_PIN))
+    #error "Serial port pins (2) conflict with Z4 pins!"
+  #elif IS_RX2(X_DIR_PIN) || IS_RX2(Y_DIR_PIN)
+    #error "Serial port pins (2) conflict with other pins!"
+  #elif Y_HOME_DIR < 0 && IS_TX2(Y_STOP_PIN)
+    #error "Serial port pins (2) conflict with Y endstop pin!"
+  #elif HAS_CUSTOM_PROBE_PIN && IS_TX2(Z_MIN_PROBE_PIN)
+    #error "Serial port pins (2) conflict with probe pin!"
+  #elif IS_TX2(X_ENABLE_PIN) || IS_RX2(X_DIR_PIN) || IS_TX2(Y_ENABLE_PIN) || IS_RX2(Y_DIR_PIN)
+    #error "Serial port pins (2) conflict with X/Y stepper pins!"
+  #elif EXTRUDERS > 1 && (IS_TX2(E1_ENABLE_PIN) || (AXIS_HAS_SPI(E1) && IS_TX2(E1_CS_PIN)))
+    #error "Serial port pins (2) conflict with E1 stepper pins!"
+  #elif EXTRUDERS && (IS_RX2(E0_DIR_PIN) || IS_RX2(E0_STEP_PIN))
+    #error "Serial port pins (2) conflict with E stepper pins!"
+  #endif
+  #undef IS_TX2
+  #undef IS_RX2
+#endif
+
+#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
+  #define PIN_IS_TX3(P) (PIN_EXISTS(P) && P##_PIN == P0_00)
+  #define PIN_IS_RX3(P) (P##_PIN == P0_01)
+  #if PIN_IS_TX3(X_MIN) || PIN_IS_RX3(X_MAX)
+    #error "Serial port pins (3) conflict with X endstop pins!"
+  #elif PIN_IS_TX3(Y_SERIAL_TX) || PIN_IS_TX3(Y_SERIAL_RX) \
+    ||  PIN_IS_RX3(X_SERIAL_TX) || PIN_IS_RX3(X_SERIAL_RX)
+    #error "Serial port pins (3) conflict with X/Y axis UART pins!"
+  #elif PIN_IS_TX3(X2_DIR) || PIN_IS_RX3(X2_STEP)
+    #error "Serial port pins (3) conflict with X2 pins!"
+  #elif PIN_IS_TX3(Y2_DIR) || PIN_IS_RX3(Y2_STEP)
+    #error "Serial port pins (3) conflict with Y2 pins!"
+  #elif PIN_IS_TX3(Z2_DIR) || PIN_IS_RX3(Z2_STEP)
+    #error "Serial port pins (3) conflict with Z2 pins!"
+  #elif PIN_IS_TX3(Z3_DIR) || PIN_IS_RX3(Z3_STEP)
+    #error "Serial port pins (3) conflict with Z3 pins!"
+  #elif PIN_IS_TX3(Z4_DIR) || PIN_IS_RX3(Z4_STEP)
+    #error "Serial port pins (3) conflict with Z4 pins!"
+  #elif EXTRUDERS > 1 && (PIN_IS_TX3(E1_DIR) || PIN_IS_RX3(E1_STEP))
+    #error "Serial port pins (3) conflict with E1 pins!"
+  #endif
+  #undef PIN_IS_TX3
+  #undef PIN_IS_RX3
+#endif
+
+//
+// Flag any i2c pin conflicts
+//
+#if ANY(DIGIPOT_I2C, DIGIPOT_MCP4018, DAC_STEPPER_CURRENT, EXPERIMENTAL_I2CBUS, I2C_POSITION_ENCODERS, PCA9632, I2C_EEPROM)
+  #define USEDI2CDEV_M 1  // <Arduino>/Wire.cpp
+
+  #if USEDI2CDEV_M == 0         // P0_27 [D57] (AUX-1) .......... P0_28 [D58] (AUX-1)
+    #define PIN_IS_SDA0(P) (P##_PIN == P0_27)
+    #define IS_SCL0(P)     (P == P0_28)
+    #if ENABLED(SDSUPPORT) && PIN_IS_SDA0(SD_DETECT)
+      #error "SDA0 overlaps with SD_DETECT_PIN!"
+    #elif PIN_IS_SDA0(E0_AUTO_FAN)
+      #error "SDA0 overlaps with E0_AUTO_FAN_PIN!"
+    #elif PIN_IS_SDA0(BEEPER)
+      #error "SDA0 overlaps with BEEPER_PIN!"
+    #elif IS_SCL0(BTN_ENC)
+      #error "SCL0 overlaps with Encoder Button!"
+    #elif IS_SCL0(SS_PIN)
+      #error "SCL0 overlaps with SS_PIN!"
+    #elif IS_SCL0(LCD_SDSS)
+      #error "SCL0 overlaps with LCD_SDSS!"
+    #endif
+    #undef PIN_IS_SDA0
+    #undef IS_SCL0
+  #elif USEDI2CDEV_M == 1       // P0_00 [D20] (SCA) ............ P0_01 [D21] (SCL)
+    #define PIN_IS_SDA1(P) (PIN_EXISTS(P) && P##_PIN == P0_00)
+    #define PIN_IS_SCL1(P) (P##_PIN == P0_01)
+    #if PIN_IS_SDA1(X_MIN) || PIN_IS_SCL1(X_MAX)
+      #error "One or more i2c (1) pins overlaps with X endstop pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(X2_DIR) || PIN_IS_SCL1(X2_STEP)
+      #error "One or more i2c (1) pins overlaps with X2 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Y2_DIR) || PIN_IS_SCL1(Y2_STEP)
+      #error "One or more i2c (1) pins overlaps with Y2 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Z2_DIR) || PIN_IS_SCL1(Z2_STEP)
+      #error "One or more i2c (1) pins overlaps with Z2 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Z3_DIR) || PIN_IS_SCL1(Z3_STEP)
+      #error "One or more i2c (1) pins overlaps with Z3 pins! Disable i2c peripherals."
+    #elif PIN_IS_SDA1(Z4_DIR) || PIN_IS_SCL1(Z4_STEP)
+      #error "One or more i2c (1) pins overlaps with Z4 pins! Disable i2c peripherals."
+    #elif EXTRUDERS > 1 && (PIN_IS_SDA1(E1_DIR) || PIN_IS_SCL1(E1_STEP))
+      #error "One or more i2c (1) pins overlaps with E1 pins! Disable i2c peripherals."
+    #endif
+    #undef PIN_IS_SDA1
+    #undef PIN_IS_SCL1
+  #elif USEDI2CDEV_M == 2     // P0_10 [D38] (X_ENABLE_PIN) ... P0_11 [D55] (X_DIR_PIN)
+    #define PIN_IS_SDA2(P) (P##_PIN == P0_10)
+    #define PIN_IS_SCL2(P) (P##_PIN == P0_11)
+    #if PIN_IS_SDA2(Y_STOP)
+      #error "i2c SDA2 overlaps with Y endstop pin!"
+    #elif HAS_CUSTOM_PROBE_PIN && PIN_IS_SDA2(Z_MIN_PROBE)
+      #error "i2c SDA2 overlaps with Z probe pin!"
+    #elif PIN_IS_SDA2(X_ENABLE) || PIN_IS_SDA2(Y_ENABLE)
+      #error "i2c SDA2 overlaps with X/Y ENABLE pin!"
+    #elif AXIS_HAS_SPI(X) && PIN_IS_SDA2(X_CS)
+      #error "i2c SDA2 overlaps with X CS pin!"
+    #elif PIN_IS_SDA2(X2_ENABLE)
+      #error "i2c SDA2 overlaps with X2 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Y2_ENABLE)
+      #error "i2c SDA2 overlaps with Y2 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Z2_ENABLE)
+      #error "i2c SDA2 overlaps with Z2 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Z3_ENABLE)
+      #error "i2c SDA2 overlaps with Z3 enable pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(Z4_ENABLE)
+      #error "i2c SDA2 overlaps with Z4 enable pin! Disable i2c peripherals."
+    #elif EXTRUDERS > 1 && PIN_IS_SDA2(E1_ENABLE)
+      #error "i2c SDA2 overlaps with E1 enable pin! Disable i2c peripherals."
+    #elif EXTRUDERS > 1 && AXIS_HAS_SPI(E1) && PIN_IS_SDA2(E1_CS)
+      #error "i2c SDA2 overlaps with E1 CS pin! Disable i2c peripherals."
+    #elif EXTRUDERS && (PIN_IS_SDA2(E0_STEP) || PIN_IS_SDA2(E0_DIR))
+      #error "i2c SCL2 overlaps with E0 STEP/DIR pin! Disable i2c peripherals."
+    #elif PIN_IS_SDA2(X_DIR) || PIN_IS_SDA2(Y_DIR)
+      #error "One or more i2c pins overlaps with X/Y DIR pin! Disable i2c peripherals."
+    #endif
+    #undef PIN_IS_SDA2
+    #undef PIN_IS_SCL2
+  #endif
+
+  #undef USEDI2CDEV_M
+#endif
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/SPI.h b/Marlin/src/HAL/LPC1768/include/SPI.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/SPI.h
rename to Marlin/src/HAL/LPC1768/include/SPI.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
rename to Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
rename to Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c b/Marlin/src/HAL/LPC1768/include/i2c_util.c
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/i2c_util.c
rename to Marlin/src/HAL/LPC1768/include/i2c_util.c
diff --git a/Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h b/Marlin/src/HAL/LPC1768/include/i2c_util.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/include/i2c_util.h
rename to Marlin/src/HAL/LPC1768/include/i2c_util.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_LPC1768/main.cpp
rename to Marlin/src/HAL/LPC1768/main.cpp
index d7ba62fe5e98..d7b05dce9d75 100644
--- a/Marlin/src/HAL/HAL_LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -37,6 +37,7 @@ extern "C" {
 
 #include "../../sd/cardreader.h"
 #include "../../inc/MarlinConfig.h"
+#include "../../core/millis_t.h"
 #include "HAL.h"
 #include "timers.h"
 
@@ -66,7 +67,7 @@ void HAL_init() {
     #endif
 
     // Flash status LED 3 times to indicate Marlin has started booting
-    for (uint8_t i = 0; i < 6; ++i) {
+    LOOP_L_N(i, 6) {
       TOGGLE(LED_PIN);
       delay(100);
     }
@@ -89,7 +90,7 @@ void HAL_init() {
 
   //debug_frmwrk_init();
   //_DBG("\n\nDebug running\n");
-  // Initialise the SD card chip select pins as soon as possible
+  // Initialize the SD card chip select pins as soon as possible
   #if PIN_EXISTS(SS)
     OUT_WRITE(SS_PIN, HIGH);
   #endif
diff --git a/Marlin/src/HAL/HAL_LPC1768/pinsDebug.h b/Marlin/src/HAL/LPC1768/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/pinsDebug.h
rename to Marlin/src/HAL/LPC1768/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h b/Marlin/src/HAL/LPC1768/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/spi_pins.h
rename to Marlin/src/HAL/LPC1768/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.cpp b/Marlin/src/HAL/LPC1768/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/timers.cpp
rename to Marlin/src/HAL/LPC1768/timers.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/timers.h
rename to Marlin/src/HAL/LPC1768/timers.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.cpp
rename to Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_defines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_defines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h b/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_delay.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.c
rename to Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/LCD_pin_routines.h
rename to Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp  under construction b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp  under construction
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp  under construction
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp  under construction
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
rename to Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
index a98c5eea9cb9..6eac5daf244e 100644
--- a/Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
@@ -73,7 +73,7 @@
 
 uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
 
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (spi_speed == 0) {
       LPC176x::gpio_set(mosi_pin, !!(b & 0x80));
       LPC176x::gpio_set(sck_pin, HIGH);
@@ -83,16 +83,16 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
     }
     else {
       const uint8_t state = (b & 0x80) ? HIGH : LOW;
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(mosi_pin, state);
 
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         LPC176x::gpio_set(sck_pin, HIGH);
 
       b <<= 1;
       if (miso_pin >= 0 && LPC176x::gpio_get(miso_pin)) b |= 1;
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(sck_pin, LOW);
     }
   }
@@ -102,7 +102,7 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
 
 uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
 
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     const uint8_t state = (b & 0x80) ? HIGH : LOW;
     if (spi_speed == 0) {
       LPC176x::gpio_set(sck_pin, LOW);
@@ -111,13 +111,13 @@ uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck
       LPC176x::gpio_set(sck_pin, HIGH);
     }
     else {
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         LPC176x::gpio_set(sck_pin, LOW);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(mosi_pin, state);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         LPC176x::gpio_set(sck_pin, HIGH);
     }
     b <<= 1;
diff --git a/Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
rename to Marlin/src/HAL/LPC1768/upload_extra_script.py
diff --git a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp b/Marlin/src/HAL/LPC1768/usb_serial.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
rename to Marlin/src/HAL/LPC1768/usb_serial.cpp
index 0af2d8347bb0..ddb31da20f6e 100644
--- a/Marlin/src/HAL/HAL_LPC1768/usb_serial.cpp
+++ b/Marlin/src/HAL/LPC1768/usb_serial.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(EMERGENCY_PARSER)
 
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
 EmergencyParser::State emergency_state;
 bool CDC_RecvCallback(const char buffer) {
   emergency_parser.update(emergency_state, buffer);
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.cpp b/Marlin/src/HAL/LPC1768/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
rename to Marlin/src/HAL/LPC1768/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/watchdog.h b/Marlin/src/HAL/LPC1768/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/watchdog.h
rename to Marlin/src/HAL/LPC1768/watchdog.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/win_usb_driver/lpc176x_usb_driver.inf b/Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/win_usb_driver/lpc176x_usb_driver.inf
rename to Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_SAMD51/HAL.cpp
rename to Marlin/src/HAL/SAMD51/HAL.cpp
index 4828c40ff705..b3a741fe13da 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -478,10 +478,10 @@ void HAL_adc_init() {
   #if ADC_IS_REQUIRED
     memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results));                 // Fill result with invalid values
 
-    for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi)
+    LOOP_L_N(pi, COUNT(adc_pins))
       pinPeripheral(adc_pins[pi], PIO_ANALOG);
 
-    for (uint8_t ai = FIRST_ADC; ai <= LAST_ADC; ++ai) {
+    LOOP_S_LE_N(ai, FIRST_ADC, LAST_ADC) {
       Adc* adc = ((Adc*[])ADC_INSTS)[ai];
 
       // ADC clock setup
@@ -513,7 +513,7 @@ void HAL_adc_init() {
 
 void HAL_adc_start_conversion(const uint8_t adc_pin) {
   #if ADC_IS_REQUIRED
-    for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi) {
+    LOOP_L_N(pi, COUNT(adc_pins)) {
       if (adc_pin == adc_pins[pi]) {
         HAL_adc_result = HAL_adc_results[pi];
         return;
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/HAL.h
rename to Marlin/src/HAL/SAMD51/HAL.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp b/Marlin/src/HAL/SAMD51/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
rename to Marlin/src/HAL/SAMD51/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.cpp
rename to Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/MarlinSerial_AGCM4.h
rename to Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.cpp b/Marlin/src/HAL/SAMD51/QSPIFlash.cpp
new file mode 100644
index 000000000000..76a332970731
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.cpp
@@ -0,0 +1,78 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(QSPI_EEPROM)
+
+#include "QSPIFlash.h"
+
+#define INVALID_ADDR    0xffffffff
+#define SECTOR_OF(a)    (a & ~(SFLASH_SECTOR_SIZE - 1))
+#define OFFSET_OF(a)    (a & (SFLASH_SECTOR_SIZE - 1))
+
+Adafruit_SPIFlashBase * QSPIFlash::_flashBase = nullptr;
+uint8_t QSPIFlash::_buf[SFLASH_SECTOR_SIZE];
+uint32_t QSPIFlash::_addr = INVALID_ADDR;
+
+void QSPIFlash::begin() {
+  if (_flashBase != nullptr) return;
+
+  _flashBase = new Adafruit_SPIFlashBase(new Adafruit_FlashTransport_QSPI());
+  _flashBase->begin(NULL);
+}
+
+size_t QSPIFlash::size() {
+  return _flashBase->size();
+}
+
+uint8_t QSPIFlash::readByte(const uint32_t address) {
+  if (SECTOR_OF(address) == _addr) return _buf[OFFSET_OF(address)];
+
+  return _flashBase->read8(address);
+}
+
+void QSPIFlash::writeByte(const uint32_t address, const uint8_t value) {
+  uint32_t const sector_addr = SECTOR_OF(address);
+
+  // Page changes, flush old and update new cache
+  if (sector_addr != _addr) {
+    flush();
+    _addr = sector_addr;
+
+    // read a whole page from flash
+    _flashBase->readBuffer(sector_addr, _buf, SFLASH_SECTOR_SIZE);
+  }
+
+  _buf[OFFSET_OF(address)] = value;
+}
+
+void QSPIFlash::flush() {
+  if (_addr == INVALID_ADDR) return;
+
+  _flashBase->eraseSector(_addr / SFLASH_SECTOR_SIZE);
+  _flashBase->writeBuffer(_addr, _buf, SFLASH_SECTOR_SIZE);
+
+  _addr = INVALID_ADDR;
+}
+
+#endif // QSPI_EEPROM
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.h b/Marlin/src/HAL/SAMD51/QSPIFlash.h
new file mode 100644
index 000000000000..7f75286ebfc1
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.h
@@ -0,0 +1,51 @@
+/**
+ * @file QSPIFlash.h
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach and Dean Miller for Adafruit Industries LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Derived from Adafruit_SPIFlash class with no SdFat references
+ *
+ */
+
+#pragma once
+
+#include "Adafruit_SPIFlashBase.h"
+
+// This class extends Adafruit_SPIFlashBase by adding caching support.
+//
+// This class will use 4096 Bytes of RAM as a block cache.
+class QSPIFlash {
+  public:
+    static void begin();
+    static size_t size();
+    static uint8_t readByte(const uint32_t address);
+    static void writeByte(const uint32_t address, const uint8_t v);
+    static void flush();
+
+  private:
+    static Adafruit_SPIFlashBase * _flashBase;
+    static uint8_t _buf[SFLASH_SECTOR_SIZE];
+    static uint32_t _addr;
+};
+
+extern QSPIFlash qspi;
diff --git a/Marlin/src/HAL/HAL_SAMD51/SAMD51.h b/Marlin/src/HAL/SAMD51/SAMD51.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/SAMD51.h
rename to Marlin/src/HAL/SAMD51/SAMD51.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/Servo.cpp b/Marlin/src/HAL/SAMD51/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/Servo.cpp
rename to Marlin/src/HAL/SAMD51/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/ServoTimers.h b/Marlin/src/HAL/SAMD51/ServoTimers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/ServoTimers.h
rename to Marlin/src/HAL/SAMD51/ServoTimers.h
diff --git a/Marlin/src/HAL/SAMD51/eeprom.cpp b/Marlin/src/HAL/SAMD51/eeprom.cpp
new file mode 100644
index 000000000000..e167515bff3a
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom.cpp
@@ -0,0 +1,66 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(EEPROM_SETTINGS) && NONE(QSPI_EEPROM, FLASH_EEPROM_EMULATION)
+
+#include "../shared/eeprom_api.h"
+
+size_t PersistentStore::capacity() { return E2END + 1; }
+
+bool PersistentStore::access_start() { return true; }
+bool PersistentStore::access_finish() { return true; }
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  while (size--) {
+    const uint8_t v = *value;
+    uint8_t * const p = (uint8_t * const)pos;
+    if (v != eeprom_read_byte(p)) {
+      eeprom_write_byte(p, v);
+      delay(2);
+      if (eeprom_read_byte(p) != v) {
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
+        return true;
+      }
+    }
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  while (size--) {
+    uint8_t c = eeprom_read_byte((uint8_t*)pos);
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+#endif // EEPROM_SETTINGS && !(QSPI_EEPROM || FLASH_EEPROM_EMULATION)
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/eeprom_flash.cpp b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
new file mode 100644
index 000000000000..fd8973369a8a
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
@@ -0,0 +1,96 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+
+#include "../shared/eeprom_api.h"
+
+#define NVMCTRL_CMD(c)    do{                                                 \
+                            SYNC(!NVMCTRL->STATUS.bit.READY);                 \
+                            NVMCTRL->INTFLAG.bit.DONE = true;                 \
+                            NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \
+                            SYNC(NVMCTRL->INTFLAG.bit.DONE);                  \
+                          }while(0)
+#define NVMCTRL_FLUSH()   do{                                           \
+                            if (NVMCTRL->SEESTAT.bit.LOAD)              \
+                              NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH);  \
+                          }while(0)
+
+size_t PersistentStore::capacity() {
+  const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ,
+                sblk = NVMCTRL->SEESTAT.bit.SBLK;
+
+  return   (!psz && !sblk)         ? 0
+         : (psz <= 2)              ? (0x200 << psz)
+         : (sblk == 1 || psz == 3) ?  4096
+         : (sblk == 2 || psz == 4) ?  8192
+         : (sblk <= 4 || psz == 5) ? 16384
+         : (sblk >= 9 && psz == 7) ? 65536
+                                   : 32768;
+}
+
+bool PersistentStore::access_start() {
+  NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED;  // Buffered mode and segment reallocation active
+  if (NVMCTRL->SEESTAT.bit.RLOCK)
+    NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE);    // Unlock E2P data write access
+  return true;
+}
+
+bool PersistentStore::access_finish() {
+  NVMCTRL_FLUSH();
+  if (!NVMCTRL->SEESTAT.bit.LOCK)
+    NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE);    // Lock E2P data write access
+  return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  while (size--) {
+    const uint8_t v = *value;
+    SYNC(NVMCTRL->SEESTAT.bit.BUSY);
+    if (NVMCTRL->INTFLAG.bit.SEESFULL)
+      NVMCTRL_FLUSH();      // Next write will trigger a sector reallocation. I need to flush 'pagebuffer'
+    ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v;
+    SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC);
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  while (size--) {
+    SYNC(NVMCTRL->SEESTAT.bit.BUSY);
+    uint8_t c = ((volatile uint8_t *)SEEPROM_ADDR)[pos];
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+#endif // FLASH_EEPROM_EMULATION
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
new file mode 100644
index 000000000000..c6aa383f9f40
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
@@ -0,0 +1,71 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+#ifdef __SAMD51__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(QSPI_EEPROM)
+
+#include "../shared/eeprom_api.h"
+
+#include "QSPIFlash.h"
+
+static bool initialized;
+
+size_t PersistentStore::capacity() { return qspi.size(); }
+
+bool PersistentStore::access_start() {
+  if (!initialized) {
+    qspi.begin();
+    initialized = true;
+  }
+  return true;
+}
+
+bool PersistentStore::access_finish() {
+  qspi.flush();
+  return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  while (size--) {
+    const uint8_t v = *value;
+    qspi.writeByte(pos, v);
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  while (size--) {
+    uint8_t c = qspi.readByte(pos);
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  }
+  return false;
+}
+
+#endif // QSPI_EEPROM
+#endif // __SAMD51__
diff --git a/Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
rename to Marlin/src/HAL/SAMD51/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio.h b/Marlin/src/HAL/SAMD51/fastio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_SAMD51/fastio.h
rename to Marlin/src/HAL/SAMD51/fastio.h
index e00fa77a7c1f..d3b3dc1f63c5 100644
--- a/Marlin/src/HAL/HAL_SAMD51/fastio.h
+++ b/Marlin/src/HAL/SAMD51/fastio.h
@@ -37,7 +37,7 @@
 /**
  * Magic I/O routines
  *
- * Now you can simply SET_OUTPUT(STEP); WRITE(STEP, HIGH); WRITE(STEP, LOW);
+ * Now you can simply SET_OUTPUT(IO); WRITE(IO, HIGH); WRITE(IO, LOW);
  */
 
 // Read a pin
@@ -100,9 +100,9 @@
                                   PORT->Group[port].DIRCLR.reg = MASK(pin);                           \
                                 }while(0)
 // Set pin as PWM (push pull)
-#define SET_PWM(IO)             SET_OUTPUT(IO)
+#define SET_PWM                 SET_OUTPUT
 // Set pin as PWM (open drain)
-#define SET_PWM_OD(IO)          SET_OUTPUT_OD(IO)
+#define SET_PWM_OD              SET_OUTPUT_OD
 
 // check if pin is an output
 #define IS_OUTPUT(IO)            ((PORT->Group[(EPortType)GET_SAMD_PORT(IO)].DIR.reg & MASK(GET_SAMD_PIN(IO))) \
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
rename to Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
similarity index 87%
rename from Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
rename to Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
index 0285c52ee365..490cfd50e889 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
@@ -20,3 +20,7 @@
  *
  */
 #pragma once
+
+#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
similarity index 91%
rename from Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
rename to Marlin/src/HAL/SAMD51/inc/SanityCheck.h
index ddea64f2d01f..cc7a10e7a6cf 100644
--- a/Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
@@ -23,6 +23,10 @@
  * Test SAMD51 specific configuration values for errors at compile-time.
  */
 
+#if ENABLED(FLASH_EEPROM_EMULATION)
+  #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
+#endif
+
 #if defined(ADAFRUIT_GRAND_CENTRAL_M4) && SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -42,11 +46,3 @@
 #if ENABLED(FAST_PWM_FAN)
   #error "FAST_PWM_FAN is not yet implemented for this platform."
 #endif
-
-#if ENABLED(EEPROM_SETTINGS) && NONE(SPI_EEPROM, I2C_EEPROM)
-  #warning "Did you activate the SmartEEPROM? See https://github.com/GMagician/SAMD51-SmartEEprom-Manager/releases"
-#endif
-
-#if HAS_TMC_SW_SERIAL
-  #error "TMC220x Software Serial is not supported on this platform."
-#endif
diff --git a/Marlin/src/HAL/HAL_SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/pinsDebug.h
rename to Marlin/src/HAL/SAMD51/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/spi_pins.h b/Marlin/src/HAL/SAMD51/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/spi_pins.h
rename to Marlin/src/HAL/SAMD51/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.cpp b/Marlin/src/HAL/SAMD51/timers.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_SAMD51/timers.cpp
rename to Marlin/src/HAL/SAMD51/timers.cpp
index 99839cd48a10..3eb021c25bfd 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.cpp
+++ b/Marlin/src/HAL/SAMD51/timers.cpp
@@ -42,7 +42,7 @@ const tTimerConfig TimerConfig[NUM_HARDWARE_TIMERS+1] = {
   { {.pTc=TC1},  TC1_IRQn, TC_PRIORITY(1) },  // 1 - stepper (needed by 32 bit timers)
   { {.pTc=TC2},  TC2_IRQn, TC_PRIORITY(2) },  // 2 - tone (framework)
   { {.pTc=TC3},  TC3_IRQn, TC_PRIORITY(3) },  // 3 - servo
-  { {.pTc=TC4},  TC4_IRQn, TC_PRIORITY(4) },
+  { {.pTc=TC4},  TC4_IRQn, TC_PRIORITY(4) },  // 4 - software serial
   { {.pTc=TC5},  TC5_IRQn, TC_PRIORITY(5) },
   { {.pTc=TC6},  TC6_IRQn, TC_PRIORITY(6) },
   { {.pTc=TC7},  TC7_IRQn, TC_PRIORITY(7) },
@@ -145,12 +145,12 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 }
 
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
   NVIC_EnableIRQ(irq);
 }
 
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
   Disable_Irq(irq);
 }
 
@@ -160,7 +160,7 @@ static bool NVIC_GetEnabledIRQ(IRQn_Type IRQn) {
 }
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
   return NVIC_GetEnabledIRQ(irq);
 }
 
diff --git a/Marlin/src/HAL/HAL_SAMD51/timers.h b/Marlin/src/HAL/SAMD51/timers.h
similarity index 93%
rename from Marlin/src/HAL/HAL_SAMD51/timers.h
rename to Marlin/src/HAL/SAMD51/timers.h
index 073239c4311e..4b21e4716262 100644
--- a/Marlin/src/HAL/HAL_SAMD51/timers.h
+++ b/Marlin/src/HAL/SAMD51/timers.h
@@ -57,16 +57,16 @@ typedef uint32_t hal_timer_t;
                                : (t == TEMP_TIMER_NUM) ? 6                        \
                                : 7
 
-#define _TC_HANDLER(t)        void TC##t##_Handler()
-#define TC_HANDLER(t)         _TC_HANDLER(t)
-#define HAL_STEP_TIMER_ISR()  TC_HANDLER(STEP_TIMER_NUM)
+#define _TC_HANDLER(t)            void TC##t##_Handler()
+#define TC_HANDLER(t)             _TC_HANDLER(t)
+#define HAL_STEP_TIMER_ISR()      TC_HANDLER(STEP_TIMER_NUM)
 #if STEP_TIMER_NUM != PULSE_TIMER_NUM
-  #define HAL_PULSE_TIMER_ISR()  TC_HANDLER(PULSE_TIMER_NUM)
+  #define HAL_PULSE_TIMER_ISR()   TC_HANDLER(PULSE_TIMER_NUM)
 #endif
 #if TEMP_TIMER_NUM == RTC_TIMER_NUM
-  #define HAL_TEMP_TIMER_ISR()  void RTC_Handler()
+  #define HAL_TEMP_TIMER_ISR()    void RTC_Handler()
 #else
-  #define HAL_TEMP_TIMER_ISR()  TC_HANDLER(TEMP_TIMER_NUM)
+  #define HAL_TEMP_TIMER_ISR()    TC_HANDLER(TEMP_TIMER_NUM)
 #endif
 
 // --------------------------------------------------------------------------
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp b/Marlin/src/HAL/SAMD51/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
rename to Marlin/src/HAL/SAMD51/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog.h b/Marlin/src/HAL/SAMD51/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog.h
rename to Marlin/src/HAL/SAMD51/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32/HAL.cpp
rename to Marlin/src/HAL/STM32/HAL.cpp
index 5d8c686af30e..77f8d2764055 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -133,6 +133,6 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRe
 
 uint16_t HAL_adc_get_result() { return HAL_adc_result; }
 
-void flashFirmware(int16_t) { NVIC_SystemReset(); }
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
 
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32/HAL.h
rename to Marlin/src/HAL/STM32/HAL.h
index 9fb40d612187..c310cca74e29 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -223,4 +223,4 @@ uint16_t HAL_adc_get_result();
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/README.md b/Marlin/src/HAL/STM32/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/README.md
rename to Marlin/src/HAL/STM32/README.md
diff --git a/Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/Sd2Card_sdio_stm32duino.cpp
rename to Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.cpp b/Marlin/src/HAL/STM32/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/Servo.cpp
rename to Marlin/src/HAL/STM32/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/Servo.h b/Marlin/src/HAL/STM32/Servo.h
similarity index 97%
rename from Marlin/src/HAL/HAL_STM32/Servo.h
rename to Marlin/src/HAL/STM32/Servo.h
index 1f841f8184aa..e8b3c4b100b4 100644
--- a/Marlin/src/HAL/HAL_STM32/Servo.h
+++ b/Marlin/src/HAL/STM32/Servo.h
@@ -24,6 +24,8 @@
 
 #include <Servo.h>
 
+#include "../../core/millis_t.h"
+
 // Inherit and expand on the official library
 class libServo : public Servo {
   public:
diff --git a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.cpp b/Marlin/src/HAL/STM32/SoftwareSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/SoftwareSerial.cpp
rename to Marlin/src/HAL/STM32/SoftwareSerial.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.h b/Marlin/src/HAL/STM32/SoftwareSerial.h
similarity index 96%
rename from Marlin/src/HAL/HAL_STM32/SoftwareSerial.h
rename to Marlin/src/HAL/STM32/SoftwareSerial.h
index 3799701cfe5b..504bd6979b2c 100644
--- a/Marlin/src/HAL/HAL_STM32/SoftwareSerial.h
+++ b/Marlin/src/HAL/STM32/SoftwareSerial.h
@@ -29,9 +29,7 @@
  * The latest version of this library can always be found at
  * http://arduiniana.org.
  */
-
-#ifndef SOFTWARESERIAL_H
-#define SOFTWARESERIAL_H
+#pragma once
 
 #include <Arduino.h>
 
@@ -64,7 +62,6 @@ class SoftwareSerial : public Stream {
     uint32_t delta_start = 0;
 
     // static data
-    static bool initialised;
     static HardwareTimer timer;
     static const IRQn_Type timer_interrupt_number;
     static uint32_t timer_interrupt_priority;
@@ -91,7 +88,7 @@ class SoftwareSerial : public Stream {
   public:
     // public methods
 
-    SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic = false);
+    SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic=false);
     virtual ~SoftwareSerial();
     void begin(long speed);
     bool listen();
@@ -115,5 +112,3 @@ class SoftwareSerial : public Stream {
 
     using Print::write;
 };
-
-#endif // SOFTWARESERIAL_H
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32/eeprom_flash.cpp
index 80ef901ceba9..39012f8205e0 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -27,7 +27,7 @@
 
 #if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 
 // Only STM32F4 can support wear leveling at this time
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp b/Marlin/src/HAL/STM32/eeprom_impl.cpp
similarity index 88%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
rename to Marlin/src/HAL/STM32/eeprom_impl.cpp
index b4e58a795e28..cd0f93e8d878 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_impl.cpp
@@ -24,9 +24,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && ANY(SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if EITHER(USE_WIRED_EEPROM, SRAM_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() {
   return true;
@@ -41,7 +41,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
     uint8_t v = *value;
 
     // Save to either external EEPROM, program flash or Backup SRAM
-    #if EITHER(SPI_EEPROM, I2C_EEPROM)
+    #if USE_WIRED_EEPROM
       // EEPROM has only ~100,000 write cycles,
       // so only write bytes that have changed!
       uint8_t * const p = (uint8_t * const)pos;
@@ -68,7 +68,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
   do {
     // Read from either external EEPROM, program flash or Backup SRAM
     const uint8_t c = (
-      #if EITHER(SPI_EEPROM, I2C_EEPROM)
+      #if USE_WIRED_EEPROM
         eeprom_read_byte((uint8_t*)pos)
       #else
         (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos)))
@@ -85,13 +85,13 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 
 size_t PersistentStore::capacity() {
   return (
-    #if ENABLED(SRAM_EEPROM_EMULATION)
-      4096 // 4kB
-    #else
+    #if USE_WIRED_EEPROM
       E2END + 1
+    #else
+      4096 // 4kB
     #endif
   );
 }
 
-#endif // EEPROM_SETTINGS && (SRAM_EEPROM_EMULATION || SPI_EEPROM || I2C_EEPROM)
+#endif // USE_WIRED_EEPROM || SRAM_EEPROM_EMULATION
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
similarity index 93%
rename from Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32/eeprom_sdcard.cpp
index 2df90d23288e..2b89c21b8997 100644
--- a/Marlin/src/HAL/HAL_STM32/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
@@ -28,9 +28,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #ifndef E2END
   #define E2END 0xFFF // 4KB
@@ -99,5 +99,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; }
 
-#endif // EEPROM_SETTINGS
-#endif // STM32
+#endif // SDCARD_EEPROM_EMULATION
+#endif // STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/HAL_STM32/endstop_interrupts.h b/Marlin/src/HAL/STM32/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
rename to Marlin/src/HAL/STM32/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.cpp b/Marlin/src/HAL/STM32/fastio.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32/fastio.cpp
rename to Marlin/src/HAL/STM32/fastio.cpp
index 4c8b63fa1039..c51effaa0430 100644
--- a/Marlin/src/HAL/HAL_STM32/fastio.cpp
+++ b/Marlin/src/HAL/STM32/fastio.cpp
@@ -27,7 +27,7 @@
 GPIO_TypeDef* FastIOPortMap[LastPort + 1];
 
 void FastIO_init() {
-  for (uint8_t i = 0; i < NUM_DIGITAL_PINS; i++)
+  LOOP_L_N(i, NUM_DIGITAL_PINS)
     FastIOPortMap[STM_PORT(digitalPin[i])] = get_GPIO_Port(STM_PORT(digitalPin[i]));
 }
 
diff --git a/Marlin/src/HAL/HAL_STM32/fastio.h b/Marlin/src/HAL/STM32/fastio.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32/fastio.h
rename to Marlin/src/HAL/STM32/fastio.h
index fa94d4703cfe..c17901fa99dd 100644
--- a/Marlin/src/HAL/HAL_STM32/fastio.h
+++ b/Marlin/src/HAL/STM32/fastio.h
@@ -55,7 +55,7 @@ void FastIO_init(); // Must be called before using fast io macros
     else   FastIOPortMap[STM_PORT(digitalPin[IO])]->BRR  = _BV32(STM_PIN(digitalPin[IO])) ; \
   }while(0)
 #else
-  #define _WRITE(IO, V) (FastIOPortMap[STM_PORT(digitalPin[IO])]->BSRR = _BV32(STM_PIN(digitalPin[IO]) + (V ? 0 : 16)))
+  #define _WRITE(IO, V) (FastIOPortMap[STM_PORT(digitalPin[IO])]->BSRR = _BV32(STM_PIN(digitalPin[IO]) + ((V) ? 0 : 16)))
 #endif
 
 #define _READ(IO)               bool(READ_BIT(FastIOPortMap[STM_PORT(digitalPin[IO])]->IDR, _BV32(STM_PIN(digitalPin[IO]))))
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/STM32/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
rename to Marlin/src/HAL/STM32/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
new file mode 100644
index 000000000000..11603c9ef41d
--- /dev/null
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
@@ -0,0 +1,27 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug.h
rename to Marlin/src/HAL/STM32/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h b/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
rename to Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
index 43f430a48f9d..e3d28aed070c 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
+++ b/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h
@@ -29,9 +29,9 @@
 #ifdef BOARD_NR_GPIO_PINS  // Only in STM32GENERIC (Maple)
 
 #ifdef __STM32F1__
-  #include "../HAL_STM32F1/fastio.h"
+  #include "../STM32F1/fastio.h"
 #elif defined(STM32F4) || defined(STM32F7)
-  #include "../HAL_STM32_F4_F7/fastio.h"
+  #include "../STM32_F4_F7/fastio.h"
 #else
   #include "fastio.h"
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h b/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/pinsDebug_STM32duino.h
rename to Marlin/src/HAL/STM32/pinsDebug_STM32duino.h
diff --git a/Marlin/src/HAL/HAL_STM32/pins_Xref.h b/Marlin/src/HAL/STM32/pins_Xref.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/pins_Xref.h
rename to Marlin/src/HAL/STM32/pins_Xref.h
diff --git a/Marlin/src/HAL/HAL_STM32/spi_pins.h b/Marlin/src/HAL/STM32/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/spi_pins.h
rename to Marlin/src/HAL/STM32/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/timers.cpp
rename to Marlin/src/HAL/STM32/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/timers.h
rename to Marlin/src/HAL/STM32/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/watchdog.cpp
rename to Marlin/src/HAL/STM32/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog.h b/Marlin/src/HAL/STM32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/watchdog.h
rename to Marlin/src/HAL/STM32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL.cpp
rename to Marlin/src/HAL/STM32F1/HAL.cpp
index bc5479b60ce0..01fd2c8fc38b 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -388,6 +388,6 @@ void analogWrite(pin_t pin, int pwm_val8) {
     analogWrite(uint8_t(pin), pwm_val8);
 }
 
-void flashFirmware(int16_t value) { nvic_sys_reset(); }
+void flashFirmware(const int16_t) { nvic_sys_reset(); }
 
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL.h
rename to Marlin/src/HAL/STM32F1/HAL.h
index c97abf4bb1a8..ff42beb92af2 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -160,6 +160,7 @@ void HAL_idletask();
 
 #ifndef digitalPinHasPWM
   #define digitalPinHasPWM(P) (PIN_MAP[P].timer_device != nullptr)
+  #define NO_COMPILE_TIME_PWM
 #endif
 
 #define CRITICAL_SECTION_START()  uint32_t primask = __get_primask(); (void)__iCliRetVal()
@@ -287,4 +288,4 @@ void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
 #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp b/Marlin/src/HAL/STM32F1/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32F1/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/README.md b/Marlin/src/HAL/STM32F1/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/README.md
rename to Marlin/src/HAL/STM32F1/README.md
diff --git a/Marlin/src/HAL/HAL_STM32F1/SPI.cpp b/Marlin/src/HAL/STM32F1/SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SPI.cpp
rename to Marlin/src/HAL/STM32F1/SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SPI.h
rename to Marlin/src/HAL/STM32F1/SPI.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.cpp b/Marlin/src/HAL/STM32F1/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/Servo.cpp
rename to Marlin/src/HAL/STM32F1/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/Servo.h b/Marlin/src/HAL/STM32F1/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/Servo.h
rename to Marlin/src/HAL/STM32F1/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp b/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
rename to Marlin/src/HAL/STM32F1/SoftwareSerial.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h b/Marlin/src/HAL/STM32F1/SoftwareSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.h
rename to Marlin/src/HAL/STM32F1/SoftwareSerial.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/build_flags.py b/Marlin/src/HAL/STM32F1/build_flags.py
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32F1/build_flags.py
rename to Marlin/src/HAL/STM32F1/build_flags.py
index 6310740fe0d8..98c871a1d8f9 100755
--- a/Marlin/src/HAL/HAL_STM32F1/build_flags.py
+++ b/Marlin/src/HAL/STM32F1/build_flags.py
@@ -15,7 +15,7 @@
                     "--specs=nano.specs",
                     "--specs=nosys.specs",
 
-                    "-IMarlin/src/HAL/HAL_STM32F1",
+                    "-IMarlin/src/HAL/STM32F1",
 
                     "-MMD",
                     "-MP",
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
rename to Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
similarity index 91%
rename from Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
rename to Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
index 8cf9099c8159..2e9d11f97e61 100644
--- a/Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@@ -32,7 +32,7 @@
 static uint8_t SPI_speed = SPI_SPEED;
 
 static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     if (spi_speed == 0) {
       WRITE(DOGLCD_MOSI, !!(b & 0x80));
       WRITE(DOGLCD_SCK, HIGH);
@@ -42,16 +42,16 @@ static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, c
     }
     else {
       const uint8_t state = (b & 0x80) ? HIGH : LOW;
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_MOSI, state);
 
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         WRITE(DOGLCD_SCK, HIGH);
 
       b <<= 1;
       if (miso_pin >= 0 && READ(miso_pin)) b |= 1;
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_SCK, LOW);
     }
   }
@@ -59,7 +59,7 @@ static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, c
 }
 
 static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
-  for (uint8_t i = 0; i < 8; i++) {
+  LOOP_L_N(i, 8) {
     const uint8_t state = (b & 0x80) ? HIGH : LOW;
     if (spi_speed == 0) {
       WRITE(DOGLCD_SCK, LOW);
@@ -68,13 +68,13 @@ static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, c
       WRITE(DOGLCD_SCK, HIGH);
     }
     else {
-      for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
         WRITE(DOGLCD_SCK, LOW);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_MOSI, state);
 
-      for (uint8_t j = 0; j < spi_speed; j++)
+      LOOP_L_N(j, spi_speed)
         WRITE(DOGLCD_SCK, HIGH);
     }
     b <<= 1;
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32F1/eeprom.cpp
similarity index 92%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32F1/eeprom.cpp
index f2a1cb031a0b..ed5d50cbdea4 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom.cpp
@@ -22,9 +22,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && EITHER(SPI_EEPROM, I2C_EEPROM)
+#if USE_WIRED_EEPROM
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() {
   #if ENABLED(SPI_EEPROM)
@@ -73,5 +73,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
 
 size_t PersistentStore::capacity() { return E2END + 1; }
 
-#endif // EEPROM_SETTINGS && EITHER(SPI_EEPROM, I2C_EEPROM)
+#endif // USE_WIRED_EEPROM
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp b/Marlin/src/HAL/STM32F1/eeprom_flash.cpp
similarity index 95%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
rename to Marlin/src/HAL/STM32F1/eeprom_flash.cpp
index 3d6a3b4591f0..9c81730465c8 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_flash.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_flash.cpp
@@ -31,10 +31,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-// This is for EEPROM emulation in flash
-#if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION)
+#if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #include <flash_stm32.h>
 #include <EEPROM.h>
@@ -108,5 +107,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return EEPROM_SIZE; }
 
-#endif // EEPROM_SETTINGS && EEPROM FLASH
+#endif // FLASH_EEPROM_EMULATION
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp b/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
similarity index 94%
rename from Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
rename to Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
index 0a0d71271822..7894e69787dd 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp
@@ -29,9 +29,9 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+#if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 #ifndef E2END
   #define E2END 0xFFF // 4KB
@@ -100,6 +100,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin
 
 size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; }
 
-#endif // EEPROM_SETTINGS
-
+#endif // SDCARD_EEPROM_EMULATION
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
rename to Marlin/src/HAL/STM32F1/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/fastio.h b/Marlin/src/HAL/STM32F1/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/fastio.h
rename to Marlin/src/HAL/STM32F1/fastio.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
rename to Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
rename to Marlin/src/HAL/STM32F1/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32F1/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/maple_win_usb_driver/maple_serial.inf b/Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/maple_win_usb_driver/maple_serial.inf
rename to Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp b/Marlin/src/HAL/STM32F1/msc_sd.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp
rename to Marlin/src/HAL/STM32F1/msc_sd.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/msc_sd.h b/Marlin/src/HAL/STM32F1/msc_sd.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/msc_sd.h
rename to Marlin/src/HAL/STM32F1/msc_sd.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
rename to Marlin/src/HAL/STM32F1/onboard_sd.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/onboard_sd.h b/Marlin/src/HAL/STM32F1/onboard_sd.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/onboard_sd.h
rename to Marlin/src/HAL/STM32F1/onboard_sd.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
similarity index 90%
rename from Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
rename to Marlin/src/HAL/STM32F1/pinsDebug.h
index 8d3eed52d0ba..913cb62afcfd 100644
--- a/Marlin/src/HAL/HAL_STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -19,9 +19,9 @@
 #pragma once
 
 #ifdef NUM_DIGITAL_PINS             // Only in ST's Arduino core (STM32duino, STM32Core)
-  #include "../HAL_STM32/pinsDebug_STM32duino.h"
+  #include "../STM32/pinsDebug_STM32duino.h"
 #elif defined(BOARD_NR_GPIO_PINS)   // Only in STM32GENERIC (Maple)
-  #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+  #include "../STM32/pinsDebug_STM32GENERIC.h"
 #else
   #error "M43 not supported for this board"
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.cpp b/Marlin/src/HAL/STM32F1/sdio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/sdio.cpp
rename to Marlin/src/HAL/STM32F1/sdio.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/sdio.h b/Marlin/src/HAL/STM32F1/sdio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/sdio.h
rename to Marlin/src/HAL/STM32F1/sdio.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/spi_pins.h b/Marlin/src/HAL/STM32F1/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/spi_pins.h
rename to Marlin/src/HAL/STM32F1/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.cpp b/Marlin/src/HAL/STM32F1/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/timers.cpp
rename to Marlin/src/HAL/STM32F1/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/timers.h
rename to Marlin/src/HAL/STM32F1/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp b/Marlin/src/HAL/STM32F1/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
rename to Marlin/src/HAL/STM32F1/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog.h b/Marlin/src/HAL/STM32F1/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog.h
rename to Marlin/src/HAL/STM32F1/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
similarity index 92%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
rename to Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
index 4852234ba455..cc1a1bb01e79 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/EmulatedEeprom.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp
@@ -27,13 +27,7 @@
 // Include configs and pins to get all EEPROM flags
 #include "../../inc/MarlinConfig.h"
 
-#ifdef STM32F7
-  #define HAS_EMULATED_EEPROM 1
-#else
-  #define HAS_EMULATED_EEPROM NONE(I2C_EEPROM, SPI_EEPROM)
-#endif
-
-#if HAS_EMULATED_EEPROM && ENABLED(EEPROM_SETTINGS)
+#if ENABLED(FLASH_EEPROM_EMULATION)
 
 // ------------------------
 // Includes
@@ -108,7 +102,7 @@ void eeprom_read_block(void *__dst, const void *__src, size_t __n) {
 
   uint16_t data = 0xFF;
   uint16_t eeprom_address = unsigned(__src);
-  for (uint8_t c = 0; c < __n; c++) {
+  LOOP_L_N(c, __n) {
     EE_ReadVariable(eeprom_address+c, &data);
     *((uint8_t*)__dst + c) = data;
   }
@@ -118,5 +112,5 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n) {
 
 }
 
-#endif // EEPROM_SETTINGS
+#endif // FLASH_EEPROM_EMULATION
 #endif // STM32GENERIC && (STM32F4 || STM32F7)
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp b/Marlin/src/HAL/STM32_F4_F7/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
rename to Marlin/src/HAL/STM32_F4_F7/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h b/Marlin/src/HAL/STM32_F4_F7/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
rename to Marlin/src/HAL/STM32_F4_F7/HAL.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp b/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
rename to Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/README.md b/Marlin/src/HAL/STM32_F4_F7/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/README.md
rename to Marlin/src/HAL/STM32_F4_F7/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/README.md b/Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/README.md
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h b/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/README.md b/Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/README.md
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h b/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h b/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp b/Marlin/src/HAL/STM32_F4_F7/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
rename to Marlin/src/HAL/STM32_F4_F7/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h b/Marlin/src/HAL/STM32_F4_F7/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
rename to Marlin/src/HAL/STM32_F4_F7/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp b/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
index 2ffbc609ecf5..b957aae6a88f 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp
@@ -27,7 +27,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() { return true; }
 bool PersistentStore::access_finish() { return true; }
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp b/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp
rename to Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.h b/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.h
rename to Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h b/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
rename to Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h b/Marlin/src/HAL/STM32_F4_F7/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
rename to Marlin/src/HAL/STM32_F4_F7/fastio.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
new file mode 100644
index 000000000000..d21624955ec4
--- /dev/null
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
@@ -0,0 +1,29 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if ENABLED(EEPROM_SETTINGS) && defined(STM32F7)
+  #undef USE_WIRED_EEPROM
+  #undef SRAM_EEPROM_EMULATION
+  #undef SDCARD_EEPROM_EMULATION
+  #define FLASH_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h b/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
rename to Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h b/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
similarity index 91%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
rename to Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
index 8672dd0a1b05..208a3524f700 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/pinsDebug.h
+++ b/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h
@@ -19,9 +19,9 @@
 #pragma once
 
 #ifdef NUM_DIGITAL_PINS             // Only in ST's Arduino core (STM32duino, STM32Core)
-  #include "../HAL_STM32/pinsDebug_STM32duino.h"
+  #include "../STM32/pinsDebug_STM32duino.h"
 #elif defined(BOARD_NR_GPIO_PINS)   // Only in STM32GENERIC (Maple)
-  #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+  #include "../STM32/pinsDebug_STM32GENERIC.h"
 #else
   #error "M43 Pins Debugging not supported for this board."
 #endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h b/Marlin/src/HAL/STM32_F4_F7/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/spi_pins.h
rename to Marlin/src/HAL/STM32_F4_F7/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h b/Marlin/src/HAL/STM32_F4_F7/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
rename to Marlin/src/HAL/STM32_F4_F7/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp b/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
rename to Marlin/src/HAL/STM32_F4_F7/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h b/Marlin/src/HAL/STM32_F4_F7/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
rename to Marlin/src/HAL/STM32_F4_F7/watchdog.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
rename to Marlin/src/HAL/TEENSY31_32/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
rename to Marlin/src/HAL/TEENSY31_32/HAL.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
rename to Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp b/Marlin/src/HAL/TEENSY31_32/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
rename to Marlin/src/HAL/TEENSY31_32/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h b/Marlin/src/HAL/TEENSY31_32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
rename to Marlin/src/HAL/TEENSY31_32/Servo.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp b/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
rename to Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
index 6a179cd962ea..96499d4f19d1 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp
@@ -22,7 +22,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 
 bool PersistentStore::access_start() { return true; }
 bool PersistentStore::access_finish() { return true; }
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
rename to Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h b/Marlin/src/HAL/TEENSY31_32/fastio.h
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
rename to Marlin/src/HAL/TEENSY31_32/fastio.h
index 8547fe2b7a81..e74920d49334 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
+++ b/Marlin/src/HAL/TEENSY31_32/fastio.h
@@ -76,8 +76,9 @@
 
 #define SET_INPUT(IO)         _SET_INPUT(IO)
 #define SET_INPUT_PULLUP(IO)  _SET_INPUT_PULLUP(IO)
+#define SET_INPUT_PULLDOWN    SET_INPUT
 #define SET_OUTPUT(IO)        _SET_OUTPUT(IO)
-#define SET_PWM(IO)            SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 #define IS_INPUT(IO)          _IS_INPUT(IO)
 #define IS_OUTPUT(IO)         _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
rename to Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
new file mode 100644
index 000000000000..11603c9ef41d
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
@@ -0,0 +1,27 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
+  #define SDCARD_EEPROM_EMULATION
+#endif
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
rename to Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/pinsDebug.h b/Marlin/src/HAL/TEENSY31_32/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/pinsDebug.h
rename to Marlin/src/HAL/TEENSY31_32/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h b/Marlin/src/HAL/TEENSY31_32/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/spi_pins.h
rename to Marlin/src/HAL/TEENSY31_32/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp b/Marlin/src/HAL/TEENSY31_32/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
rename to Marlin/src/HAL/TEENSY31_32/timers.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/timers.h
rename to Marlin/src/HAL/TEENSY31_32/timers.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp b/Marlin/src/HAL/TEENSY31_32/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
rename to Marlin/src/HAL/TEENSY31_32/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h b/Marlin/src/HAL/TEENSY31_32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
rename to Marlin/src/HAL/TEENSY31_32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
rename to Marlin/src/HAL/TEENSY35_36/HAL.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
rename to Marlin/src/HAL/TEENSY35_36/HAL.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
rename to Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp b/Marlin/src/HAL/TEENSY35_36/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
rename to Marlin/src/HAL/TEENSY35_36/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h b/Marlin/src/HAL/TEENSY35_36/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
rename to Marlin/src/HAL/TEENSY35_36/Servo.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp b/Marlin/src/HAL/TEENSY35_36/eeprom.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
rename to Marlin/src/HAL/TEENSY35_36/eeprom.cpp
index 32b215ee6e12..c66a45e2a54f 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/eeprom.cpp
@@ -27,7 +27,7 @@
 
 #if ENABLED(EEPROM_SETTINGS)
 
-#include "../shared/persistent_store_api.h"
+#include "../shared/eeprom_api.h"
 #include <avr/eeprom.h>
 
 bool PersistentStore::access_start() { return true; }
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
rename to Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h b/Marlin/src/HAL/TEENSY35_36/fastio.h
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
rename to Marlin/src/HAL/TEENSY35_36/fastio.h
index 8547fe2b7a81..e74920d49334 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
+++ b/Marlin/src/HAL/TEENSY35_36/fastio.h
@@ -76,8 +76,9 @@
 
 #define SET_INPUT(IO)         _SET_INPUT(IO)
 #define SET_INPUT_PULLUP(IO)  _SET_INPUT_PULLUP(IO)
+#define SET_INPUT_PULLDOWN    SET_INPUT
 #define SET_OUTPUT(IO)        _SET_OUTPUT(IO)
-#define SET_PWM(IO)            SET_OUTPUT(IO)
+#define SET_PWM               SET_OUTPUT
 
 #define IS_INPUT(IO)          _IS_INPUT(IO)
 #define IS_OUTPUT(IO)         _IS_OUTPUT(IO)
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
rename to Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
rename to Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h
diff --git a/Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
rename to Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
rename to Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/pinsDebug.h
rename to Marlin/src/HAL/TEENSY35_36/pinsDebug.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h b/Marlin/src/HAL/TEENSY35_36/spi_pins.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h
rename to Marlin/src/HAL/TEENSY35_36/spi_pins.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp b/Marlin/src/HAL/TEENSY35_36/timers.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
rename to Marlin/src/HAL/TEENSY35_36/timers.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/timers.h
rename to Marlin/src/HAL/TEENSY35_36/timers.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp b/Marlin/src/HAL/TEENSY35_36/watchdog.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
rename to Marlin/src/HAL/TEENSY35_36/watchdog.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h b/Marlin/src/HAL/TEENSY35_36/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
rename to Marlin/src/HAL/TEENSY35_36/watchdog.h
diff --git a/Marlin/src/HAL/platforms.h b/Marlin/src/HAL/platforms.h
index cbf8a9512bb9..cc462f37c5bd 100644
--- a/Marlin/src/HAL/platforms.h
+++ b/Marlin/src/HAL/platforms.h
@@ -21,32 +21,30 @@
  */
 #pragma once
 
+#define XSTR(V...) #V
+
 #ifdef __AVR__
-  #define HAL_PLATFORM HAL_AVR
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/AVR/NAME)
 #elif defined(ARDUINO_ARCH_SAM)
-  #define HAL_PLATFORM HAL_DUE
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/DUE/NAME)
 #elif defined(__MK20DX256__)
-  #define HAL_PLATFORM HAL_TEENSY31_32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY31_32/NAME)
 #elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
-  #define HAL_PLATFORM HAL_TEENSY35_36
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY35_36/NAME)
 #elif defined(TARGET_LPC1768)
-  #define HAL_PLATFORM HAL_LPC1768
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/LPC1768/NAME)
 #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
-  #define HAL_PLATFORM HAL_STM32F1
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32F1/NAME)
 #elif defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F7))
-  #define HAL_PLATFORM HAL_STM32_F4_F7
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32_F4_F7/NAME)
 #elif defined(ARDUINO_ARCH_STM32)
-  #define HAL_PLATFORM HAL_STM32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32/NAME)
 #elif defined(ARDUINO_ARCH_ESP32)
-  #define HAL_PLATFORM HAL_ESP32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME)
 #elif defined(__PLAT_LINUX__)
-  #define HAL_PLATFORM HAL_LINUX
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/LINUX/NAME)
 #elif defined(__SAMD51__)
-  #define HAL_PLATFORM HAL_SAMD51
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME)
 #else
   #error "Unsupported Platform!"
 #endif
-
-#define XSTR_(M) #M
-#define XSTR(M) XSTR_(M)
-#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)
diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index 78bf6745ea54..5cb68b150349 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -29,7 +29,6 @@
  *  DELAY_US(count): Delay execution in microseconds
  */
 
-#include "../../core/millis_t.h"
 #include "../../core/macros.h"
 
 #if defined(__arm__) || defined(__thumb__)
diff --git a/Marlin/src/HAL/shared/HAL_ST7920.h b/Marlin/src/HAL/shared/HAL_ST7920.h
index 12392a5ece23..69c1d741ae29 100644
--- a/Marlin/src/HAL/shared/HAL_ST7920.h
+++ b/Marlin/src/HAL/shared/HAL_ST7920.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * HAL/HAL_ST7920.h
+ * HAL/ST7920.h
  * For the HALs that provide direct access to the ST7920 display
  * (bypassing U8G), it will allow the LIGHTWEIGHT_UI to operate.
  */
diff --git a/Marlin/src/HAL/shared/MarlinSerial.h b/Marlin/src/HAL/shared/MarlinSerial.h
deleted file mode 100644
index 3770f61b3c26..000000000000
--- a/Marlin/src/HAL/shared/MarlinSerial.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * HAL/shared/MarlinSerial.h
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-constexpr bool
-  #if HAS_DGUS_LCD
-    bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS = (false
-      #if ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS)
-        || true
-      #endif
-    ),
-  #endif
-  bSERIAL_XON_XOFF = (false
-    #if ENABLED(SERIAL_XON_XOFF)
-      || true
-    #endif
-  ),
-  bEMERGENCY_PARSER = (false
-    #if ENABLED(EMERGENCY_PARSER)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_DROPPED_RX = (false
-    #if ENABLED(SERIAL_STATS_DROPPED_RX)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_RX_BUFFER_OVERRUNS = (false
-    #if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_RX_FRAMING_ERRORS = (false
-    #if ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS)
-      || true
-    #endif
-  ),
-  bSERIAL_STATS_MAX_RX_QUEUED = (false
-    #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
-      || true
-    #endif
-  );
diff --git a/Marlin/src/HAL/shared/persistent_store_api.cpp b/Marlin/src/HAL/shared/eeprom_api.cpp
similarity index 96%
rename from Marlin/src/HAL/shared/persistent_store_api.cpp
rename to Marlin/src/HAL/shared/eeprom_api.cpp
index 735fa4278b7f..d8839e3d9d32 100644
--- a/Marlin/src/HAL/shared/persistent_store_api.cpp
+++ b/Marlin/src/HAL/shared/eeprom_api.cpp
@@ -24,7 +24,7 @@
 
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
 
-  #include "persistent_store_api.h"
+  #include "eeprom_api.h"
   PersistentStore persistentStore;
 
 #endif
diff --git a/Marlin/src/HAL/shared/persistent_store_api.h b/Marlin/src/HAL/shared/eeprom_api.h
similarity index 100%
rename from Marlin/src/HAL/shared/persistent_store_api.h
rename to Marlin/src/HAL/shared/eeprom_api.h
diff --git a/Marlin/src/HAL/shared/servo.cpp b/Marlin/src/HAL/shared/servo.cpp
index d03b80b20097..2c3d7bb7d3e0 100644
--- a/Marlin/src/HAL/shared/servo.cpp
+++ b/Marlin/src/HAL/shared/servo.cpp
@@ -68,7 +68,7 @@ uint8_t ServoCount = 0;                         // the total number of attached
 
 static boolean isTimerActive(timer16_Sequence_t timer) {
   // returns true if any servo is active on this timer
-  for (uint8_t channel = 0; channel < SERVOS_PER_TIMER; channel++) {
+  LOOP_L_N(channel, SERVOS_PER_TIMER) {
     if (SERVO(timer, channel).Pin.isActive)
       return true;
   }
diff --git a/Marlin/src/HAL/shared/servo.h b/Marlin/src/HAL/shared/servo.h
index 4e12720553bb..b582221b86ff 100644
--- a/Marlin/src/HAL/shared/servo.h
+++ b/Marlin/src/HAL/shared/servo.h
@@ -68,19 +68,19 @@
  */
 
 #if IS_TEENSY32
-  #include "../HAL_TEENSY31_32/Servo.h"
+  #include "../TEENSY31_32/Servo.h"
 #elif IS_TEENSY35 || IS_TEENSY36
-  #include "../HAL_TEENSY35_36/Servo.h"
+  #include "../TEENSY35_36/Servo.h"
 #elif defined(TARGET_LPC1768)
-  #include "../HAL_LPC1768/Servo.h"
+  #include "../LPC1768/Servo.h"
 #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
-  #include "../HAL_STM32F1/Servo.h"
+  #include "../STM32F1/Servo.h"
 #elif defined(STM32GENERIC) && defined(STM32F4)
-  #include "../HAL_STM32_F4_F7/Servo.h"
+  #include "../STM32_F4_F7/Servo.h"
 #elif defined(ARDUINO_ARCH_STM32)
-  #include "../HAL_STM32/Servo.h"
+  #include "../STM32/Servo.h"
 #elif defined(ARDUINO_ARCH_ESP32)
-  #include "../HAL_ESP32/Servo.h"
+  #include "../ESP32/Servo.h"
 #else
   #include <stdint.h>
 
diff --git a/Marlin/src/HAL/shared/servo_private.h b/Marlin/src/HAL/shared/servo_private.h
index 63761ce0f40c..58e455b1240c 100644
--- a/Marlin/src/HAL/shared/servo_private.h
+++ b/Marlin/src/HAL/shared/servo_private.h
@@ -44,11 +44,11 @@
 
 // Architecture specific include
 #ifdef __AVR__
-  #include "../HAL_AVR/ServoTimers.h"
+  #include "../AVR/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_SAM)
-  #include "../HAL_DUE/ServoTimers.h"
+  #include "../DUE/ServoTimers.h"
 #elif defined(__SAMD51__)
-  #include "../HAL_SAMD51/ServoTimers.h"
+  #include "../SAMD51/ServoTimers.h"
 #else
   #error "This library only supports boards with an AVR, SAM3X or SAMD51 processor."
 #endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5a527482ce09..8130affe301c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -78,7 +78,7 @@
 #endif
 
 #if ENABLED(MAX7219_DEBUG)
-  #include "feature/Max7219_Debug_LEDs.h"
+  #include "feature/max7219.h"
 #endif
 
 #if HAS_COLOR_LEDS
@@ -107,10 +107,10 @@
 #endif
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "feature/I2CPositionEncoder.h"
+  #include "feature/encoder_i2c.h"
 #endif
 
-#if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
+#if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
   #include "feature/tmc_util.h"
 #endif
 
@@ -142,7 +142,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "feature/power_loss_recovery.h"
+  #include "feature/powerloss.h"
 #endif
 
 #if ENABLED(CANCEL_OBJECTS)
@@ -165,7 +165,7 @@
   #include "feature/fanmux.h"
 #endif
 
-#if DO_SWITCH_EXTRUDER || ANY(SWITCHING_NOZZLE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
+#if DO_SWITCH_EXTRUDER || ANY(SWITCHING_NOZZLE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, ELECTROMAGNETIC_SWITCHING_TOOLHEAD, SWITCHING_TOOLHEAD)
   #include "module/tool_change.h"
 #endif
 
@@ -174,7 +174,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "feature/prusa_MMU2/mmu2.h"
+  #include "feature/mmu2/mmu2.h"
 #endif
 
 #if HAS_L64XX
@@ -192,9 +192,17 @@ const char NUL_STR[] PROGMEM = "",
            SP_X_STR[] PROGMEM = " X",
            SP_Y_STR[] PROGMEM = " Y",
            SP_Z_STR[] PROGMEM = " Z",
-           SP_E_STR[] PROGMEM = " E";
-
-bool Running = true;
+           SP_E_STR[] PROGMEM = " E",
+              X_LBL[] PROGMEM =  "X:",
+              Y_LBL[] PROGMEM =  "Y:",
+              Z_LBL[] PROGMEM =  "Z:",
+              E_LBL[] PROGMEM =  "E:",
+           SP_X_LBL[] PROGMEM = " X:",
+           SP_Y_LBL[] PROGMEM = " Y:",
+           SP_Z_LBL[] PROGMEM = " Z:",
+           SP_E_LBL[] PROGMEM = " E:";
+
+MarlinState marlin_state = MF_INITIALIZING;
 
 // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
 bool wait_for_heatup = true;
@@ -202,6 +210,24 @@ bool wait_for_heatup = true;
 // For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
 #if HAS_RESUME_CONTINUE
   bool wait_for_user; // = false;
+
+  void wait_for_user_response(millis_t ms/*=0*/, const bool no_sleep/*=false*/) {
+    #if DISABLED(ADVANCED_PAUSE_FEATURE)
+      UNUSED(no_sleep);
+    #endif
+    KEEPALIVE_STATE(PAUSED_FOR_USER);
+    wait_for_user = true;
+    if (ms) ms += millis(); // expire time
+    while (wait_for_user && !(ms && ELAPSED(millis(), ms))) {
+      idle(
+        #if ENABLED(ADVANCED_PAUSE_FEATURE)
+          no_sleep
+        #endif
+      );
+    }
+    wait_for_user = false;
+  }
+
 #endif
 
 // Inactivity shutdown
@@ -233,11 +259,8 @@ void setup_powerhold() {
     OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
   #endif
   #if ENABLED(PSU_CONTROL)
-    #if ENABLED(PSU_DEFAULT_OFF)
-      powersupply_on = true;  PSU_OFF();
-    #else
-      powersupply_on = false; PSU_ON();
-    #endif
+    powersupply_on = ENABLED(PSU_DEFAULT_OFF);
+    if (ENABLED(PSU_DEFAULT_OFF)) PSU_OFF(); else PSU_ON();
   #endif
 }
 
@@ -269,7 +292,7 @@ void setup_powerhold() {
 
 bool pin_is_protected(const pin_t pin) {
   static const pin_t sensitive_pins[] PROGMEM = SENSITIVE_PINS;
-  for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) {
+  LOOP_L_N(i, COUNT(sensitive_pins)) {
     pin_t sensitive_pin;
     memcpy_P(&sensitive_pin, &sensitive_pins[i], sizeof(pin_t));
     if (pin == sensitive_pin) return true;
@@ -413,51 +436,8 @@ void startOrResumeJob() {
   }
 
   inline void finishSDPrinting() {
-    bool did_state = true;
-    switch (card.sdprinting_done_state) {
-
-      #if HAS_RESUME_CONTINUE                   // Display "Click to Continue..."
-        case 1:
-          did_state = queue.enqueue_P(PSTR("M0Q1S"
-            #if HAS_LCD_MENU
-              "1800"                            // ...for 30 minutes with LCD
-            #else
-              "60"                              // ...for 1 minute with no LCD
-            #endif
-          ));
-          break;
-      #endif
-
-      case 2: print_job_timer.stop(); break;
-
-      case 3:
-        did_state = print_job_timer.duration() < 60 || queue.enqueue_P(PSTR("M31"));
-        break;
-
-      case 4:
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          recovery.purge();
-        #endif
-
-        #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
-          planner.finish_and_disable();
-        #endif
-
-        #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-          ui.set_progress_done();
-        #endif
-
-        #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
-          ui.reselect_last_file();
-        #endif
-
-        SERIAL_ECHOLNPGM(STR_FILE_PRINTED);
-
-      default:
-        did_state = false;
-        card.sdprinting_done_state = 0;
-    }
-    if (did_state) ++card.sdprinting_done_state;
+    if (queue.enqueue_one_P(PSTR("M1001")))
+      marlin_state = MF_RUNNING;
   }
 
 #endif // SDSUPPORT
@@ -493,31 +473,19 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
   }
 
   // Prevent steppers timing-out in the middle of M600
-  #if BOTH(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_NO_STEPPER_TIMEOUT)
-    #define MOVE_AWAY_TEST !did_pause_print
-  #else
-    #define MOVE_AWAY_TEST true
-  #endif
+  #define STAY_TEST (BOTH(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_NO_STEPPER_TIMEOUT) && did_pause_print)
 
   if (stepper_inactive_time) {
     static bool already_shutdown_steppers; // = false
     if (planner.has_blocks_queued())
       gcode.reset_stepper_timeout();
-    else if (MOVE_AWAY_TEST && !ignore_stepper_queue && ELAPSED(ms, gcode.previous_move_ms + stepper_inactive_time)) {
+    else if (!STAY_TEST && !ignore_stepper_queue && ELAPSED(ms, gcode.previous_move_ms + stepper_inactive_time)) {
       if (!already_shutdown_steppers) {
         already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
-        #if ENABLED(DISABLE_INACTIVE_X)
-          DISABLE_AXIS_X();
-        #endif
-        #if ENABLED(DISABLE_INACTIVE_Y)
-          DISABLE_AXIS_Y();
-        #endif
-        #if ENABLED(DISABLE_INACTIVE_Z)
-          DISABLE_AXIS_Z();
-        #endif
-        #if ENABLED(DISABLE_INACTIVE_E)
-          disable_e_steppers();
-        #endif
+        if (ENABLED(DISABLE_INACTIVE_X)) DISABLE_AXIS_X();
+        if (ENABLED(DISABLE_INACTIVE_Y)) DISABLE_AXIS_Y();
+        if (ENABLED(DISABLE_INACTIVE_Z)) DISABLE_AXIS_Z();
+        if (ENABLED(DISABLE_INACTIVE_E)) disable_e_steppers();
         #if HAS_LCD_MENU && ENABLED(AUTO_BED_LEVELING_UBL)
           if (ubl.lcd_map_control) {
             ubl.lcd_map_control = false;
@@ -573,7 +541,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
   #endif
 
   #if ENABLED(USE_CONTROLLER_FAN)
-    controllerfan_update(); // Check if fan should be turned on to cool stepper drivers down
+    controllerFan.update(); // Check if fan should be turned on to cool stepper drivers down
   #endif
 
   #if ENABLED(AUTO_POWER_CONTROL)
@@ -642,7 +610,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
       // travel moves have been received so enact them
       delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
       destination = current_position;
-      prepare_move_to_destination();
+      prepare_line_to_destination();
     }
   #endif
 
@@ -845,7 +813,7 @@ void stop() {
     SERIAL_ERROR_MSG(STR_ERR_STOPPED);
     LCD_MESSAGEPGM(MSG_STOPPED);
     safe_delay(350);       // allow enough time for messages to get out before stopping
-    Running = false;
+    marlin_state = MF_STOPPED;
   }
 }
 
@@ -866,6 +834,7 @@ void stop() {
  *    • Digipot I2C
  *    • Z probe sled
  *    • status LEDs
+ *    • Max7219
  */
 void setup() {
 
@@ -879,10 +848,6 @@ void setup() {
     OUT_WRITE(SMART_EFFECTOR_MOD_PIN, LOW);   // Put Smart Effector into NORMAL mode
   #endif
 
-  #if ENABLED(MAX7219_DEBUG)
-    max7219.init();
-  #endif
-
   #if ENABLED(DISABLE_DEBUG)
     // Disable any hardware debug to free up pins for IO
     #ifdef JTAGSWD_DISABLE
@@ -975,48 +940,70 @@ void setup() {
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
 
+  #if ENABLED(MARLIN_DEV_MODE)
+    auto log_current_ms = [&](PGM_P const msg) {
+      SERIAL_ECHO_START();
+      SERIAL_CHAR('['); SERIAL_ECHO(millis()); SERIAL_ECHO("] ");
+      serialprintPGM(msg);
+      SERIAL_EOL();
+    };
+    #define SETUP_LOG(M) log_current_ms(PSTR(M))
+  #else
+    #define SETUP_LOG(...) NOOP
+  #endif
+  #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
+
   // Set up LEDs early
   #if HAS_COLOR_LEDS
-    leds.setup();
+    SETUP_RUN(leds.setup());
+  #endif
+
+  #if ENABLED(USE_CONTROLLER_FAN)     // Set up fan controller to initialize also the default configurations.
+    SETUP_RUN(controllerFan.setup());
   #endif
 
-  ui.init();
+  SETUP_RUN(ui.init());
+  SETUP_RUN(ui.reset_status());       // Load welcome message early. (Retained if no errors exist.)
+
   #if HAS_SPI_LCD && ENABLED(SHOW_BOOTSCREEN)
-    ui.show_bootscreen();
+    SETUP_RUN(ui.show_bootscreen());
+  #endif
+
+  #if ENABLED(SDSUPPORT) && defined(SDCARD_CONNECTION) && !SD_CONNECTION_IS(LCD)
+    SETUP_RUN(card.mount());          // Mount onboard / custom SD card before settings.first_load
   #endif
 
-  ui.reset_status();        // Load welcome message early. (Retained if no errors exist.)
+  SETUP_RUN(settings.first_load());   // Load data from EEPROM if available (or use defaults)
+                                      // This also updates variables in the planner, elsewhere
 
-  #if ENABLED(SDSUPPORT)
-    card.mount();           // Mount the SD card before settings.first_load
+  #if HAS_SERVICE_INTERVALS
+    SETUP_RUN(ui.reset_status(true)); // Show service messages or keep current status
   #endif
-                            // Load data from EEPROM if available (or use defaults)
-  settings.first_load();    // This also updates variables in the planner, elsewhere
 
   #if ENABLED(TOUCH_BUTTONS)
-    touch.init();
+    SETUP_RUN(touch.init());
   #endif
 
-  #if HAS_M206_COMMAND      // Initialize current position based on home_offset
-    current_position += home_offset;
+  #if HAS_M206_COMMAND
+    current_position += home_offset;  // Init current position based on home_offset
   #endif
 
-  sync_plan_position();     // Vital to init stepper/planner equivalent for current_position
+  sync_plan_position();               // Vital to init stepper/planner equivalent for current_position
 
-  thermalManager.init();    // Initialize temperature loop
+  SETUP_RUN(thermalManager.init());   // Initialize temperature loop
 
-  print_job_timer.init();   // Initial setup of print job timer
+  SETUP_RUN(print_job_timer.init());  // Initial setup of print job timer
 
-  endstops.init();          // Init endstops and pullups
+  SETUP_RUN(endstops.init());         // Init endstops and pullups
 
-  stepper.init();           // Init stepper. This enables interrupts!
+  SETUP_RUN(stepper.init());          // Init stepper. This enables interrupts!
 
   #if HAS_SERVOS
-    servo_init();
+    SETUP_RUN(servo_init());
   #endif
 
   #if HAS_Z_SERVO_PROBE
-    probe.servo_probe_init();
+    SETUP_RUN(probe.servo_probe_init());
   #endif
 
   #if HAS_PHOTOGRAPH
@@ -1024,7 +1011,7 @@ void setup() {
   #endif
 
   #if HAS_CUTTER
-    cutter.init();
+    SETUP_RUN(cutter.init());
   #endif
 
   #if ENABLED(COOLANT_MIST)
@@ -1035,23 +1022,19 @@ void setup() {
   #endif
 
   #if HAS_BED_PROBE
-    endstops.enable_z_probe(false);
-  #endif
-
-  #if ENABLED(USE_CONTROLLER_FAN)
-    SET_OUTPUT(CONTROLLER_FAN_PIN);
+    SETUP_RUN(endstops.enable_z_probe(false));
   #endif
 
   #if HAS_STEPPER_RESET
-    enableStepperDrivers();
+    SETUP_RUN(enableStepperDrivers());
   #endif
 
   #if ENABLED(DIGIPOT_I2C)
-    digipot_i2c_init();
+    SETUP_RUN(digipot_i2c_init());
   #endif
 
   #if ENABLED(DAC_STEPPER_CURRENT)
-    dac_init();
+    SETUP_RUN(dac_init());
   #endif
 
   #if EITHER(Z_PROBE_SLED, SOLENOID_PROBE) && HAS_SOLENOID_1
@@ -1074,41 +1057,44 @@ void setup() {
     #if DISABLED(CASE_LIGHT_USE_NEOPIXEL)
       if (PWM_PIN(CASE_LIGHT_PIN)) SET_PWM(CASE_LIGHT_PIN); else SET_OUTPUT(CASE_LIGHT_PIN);
     #endif
-    update_case_light();
+    SETUP_RUN(update_case_light());
   #endif
 
   #if ENABLED(MK2_MULTIPLEXER)
+    SETUP_LOG("MK2_MULTIPLEXER");
     SET_OUTPUT(E_MUX0_PIN);
     SET_OUTPUT(E_MUX1_PIN);
     SET_OUTPUT(E_MUX2_PIN);
   #endif
 
   #if HAS_FANMUX
-    fanmux_init();
+    SETUP_RUN(fanmux_init());
   #endif
 
   #if ENABLED(MIXING_EXTRUDER)
-    mixer.init();
+    SETUP_RUN(mixer.init());
   #endif
 
   #if ENABLED(BLTOUCH)
-    bltouch.init(/*set_voltage=*/true);
+    SETUP_RUN(bltouch.init(/*set_voltage=*/true));
   #endif
 
   #if ENABLED(I2C_POSITION_ENCODERS)
-    I2CPEM.init();
+    SETUP_RUN(I2CPEM.init());
   #endif
 
   #if ENABLED(EXPERIMENTAL_I2CBUS) && I2C_SLAVE_ADDRESS > 0
+    SETUP_LOG("i2c...");
     i2c.onReceive(i2c_on_receive);
     i2c.onRequest(i2c_on_request);
   #endif
 
   #if DO_SWITCH_EXTRUDER
-    move_extruder_servo(0);   // Initialize extruder servo
+    SETUP_RUN(move_extruder_servo(0));  // Initialize extruder servo
   #endif
 
   #if ENABLED(SWITCHING_NOZZLE)
+    SETUP_LOG("SWITCHING_NOZZLE");
     // Initialize nozzle servo(s)
     #if SWITCHING_NOZZLE_TWO_SERVOS
       lower_nozzle(0);
@@ -1119,52 +1105,61 @@ void setup() {
   #endif
 
   #if ENABLED(MAGNETIC_PARKING_EXTRUDER)
-    mpe_settings_init();
+    SETUP_RUN(mpe_settings_init());
   #endif
 
   #if ENABLED(PARKING_EXTRUDER)
-    pe_solenoid_init();
+    SETUP_RUN(pe_solenoid_init());
+  #endif
+
+  #if ENABLED(SWITCHING_TOOLHEAD)
+    swt_init();
   #endif
 
   #if ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
-    est_init();
+    SETUP_RUN(est_init());
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    recovery.check();
+    SETUP_RUN(recovery.check());
   #endif
 
   #if ENABLED(USE_WATCHDOG)
-    watchdog_init();          // Reinit watchdog after HAL_get_reset_source call
+    SETUP_RUN(watchdog_init());       // Reinit watchdog after HAL_get_reset_source call
   #endif
 
   #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
-    init_closedloop();
+    SETUP_RUN(init_closedloop());
   #endif
 
   #ifdef STARTUP_COMMANDS
+    SETUP_LOG("STARTUP_COMMANDS");
     queue.inject_P(PSTR(STARTUP_COMMANDS));
   #endif
 
   #if ENABLED(INIT_SDCARD_ON_BOOT) && !HAS_SPI_LCD
-    card.beginautostart();
+    SETUP_RUN(card.beginautostart());
   #endif
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_action_prompt_end();
+    SETUP_RUN(host_action_prompt_end());
   #endif
 
-  #if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
-    test_tmc_connection(true, true, true, true);
+  #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
+    SETUP_RUN(test_tmc_connection(true, true, true, true));
   #endif
 
   #if ENABLED(PRUSA_MMU2)
-    mmu2.init();
+    SETUP_RUN(mmu2.init());
   #endif
 
-  #if HAS_SERVICE_INTERVALS
-    ui.reset_status(true);  // Show service messages or keep current status
+  #if ENABLED(MAX7219_DEBUG)
+    SETUP_RUN(max7219.init());
   #endif
+
+  marlin_state = MF_RUNNING;
+
+  SETUP_LOG("setup() completed.");
 }
 
 /**
@@ -1182,22 +1177,17 @@ void setup() {
  */
 void loop() {
   do {
-
     idle();
 
     #if ENABLED(SDSUPPORT)
       card.checkautostart();
       if (card.flag.abort_sd_printing) abortSDPrinting();
-      if (card.sdprinting_done_state) finishSDPrinting();
+      if (marlin_state == MF_SD_COMPLETE) finishSDPrinting();
     #endif
 
     queue.advance();
 
     endstops.event_handler();
 
-  } while (false        // Return to caller for best compatibility
-    #ifdef __AVR__
-      || true           // Loop forever on slower (AVR) boards
-    #endif
-  );
+  } while (ENABLED(__AVR__)); // Loop forever on slower (AVR) boards
 }
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 5a8157bde1f6..e6678c5b1888 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -40,10 +40,18 @@ void stop();
 
 void idle(
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    bool no_stepper_sleep = false  // pass true to keep steppers from disabling on timeout
+    bool no_stepper_sleep=false    // Pass true to keep steppers from timing out
   #endif
 );
 
+inline void idle_no_sleep() {
+  idle(
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      true
+    #endif
+  );
+}
+
 #if ENABLED(EXPERIMENTAL_I2CBUS)
   #include "feature/twibus.h"
   extern TWIBus i2c;
@@ -68,9 +76,20 @@ void minkill(const bool steppers_off=false);
 
 void quickstop_stepper();
 
-extern bool Running;
-inline bool IsRunning() { return  Running; }
-inline bool IsStopped() { return !Running; }
+// Global State of the firmware
+enum MarlinState : uint8_t {
+  MF_INITIALIZING =  0,
+  MF_RUNNING      = _BV(0),
+  MF_PAUSED       = _BV(1),
+  MF_WAITING      = _BV(2),
+  MF_STOPPED      = _BV(3),
+  MF_SD_COMPLETE  = _BV(4),
+  MF_KILLED       = _BV(7)
+};
+
+extern MarlinState marlin_state;
+inline bool IsRunning() { return marlin_state == MF_RUNNING; }
+inline bool IsStopped() { return marlin_state != MF_RUNNING; }
 
 bool printingIsActive();
 bool printingIsPaused();
@@ -80,6 +99,7 @@ extern bool wait_for_heatup;
 
 #if HAS_RESUME_CONTINUE
   extern bool wait_for_user;
+  void wait_for_user_response(millis_t ms=0, const bool no_sleep=false);
 #endif
 
 // Inactivity shutdown timer
@@ -115,4 +135,6 @@ void protected_pin_err();
 #endif
 
 extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
-                  SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[];
+                  SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[],
+                  X_LBL[], Y_LBL[], Z_LBL[], E_LBL[], SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[];
+
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 09b0eada1a17..30c2d3eb87a3 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -103,6 +103,7 @@
 #define BOARD_HJC2560C_REV2           1147  // ADIMLab Gantry v2
 #define BOARD_TANGO                   1148  // BIQU Tango V1
 #define BOARD_MKS_GEN_L_V2            1149  // MKS GEN L V2
+#define BOARD_COPYMASTER_3D           1150  // Copymaster 3D
 
 //
 // RAMBo and derivatives
@@ -143,6 +144,7 @@
 #define BOARD_LEAPFROG_XEED2015       1321  // Leapfrog Xeed 2015
 #define BOARD_PICA_REVB               1322  // PICA Shield (original version)
 #define BOARD_PICA                    1323  // PICA Shield (rev C or later)
+#define BOARD_INTAMSYS40              1324  // Intamsys 4.0 (Funmat HT)
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 306329d6fe98..833899bdcbc1 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -82,97 +82,97 @@
 #define _OR_ADTE(N,T)   || AXIS_DRIVER_TYPE_E(N,T)
 #define HAS_E_DRIVER(T) (0 RREPEAT2(E_STEPPERS, _OR_ADTE, T))
 
-#define HAS_DRIVER(T) (    AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_X2(T) \
-                        || AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Y2(T) \
-                        || AXIS_DRIVER_TYPE_Z(T)  || AXIS_DRIVER_TYPE_Z2(T) \
-                        || AXIS_DRIVER_TYPE_Z3(T) || AXIS_DRIVER_TYPE_Z4(T) \
-                        || HAS_E_DRIVER(T) )
+#define HAS_DRIVER(T) (  AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Z(T)  \
+                      || AXIS_DRIVER_TYPE_X2(T) || AXIS_DRIVER_TYPE_Y2(T) || AXIS_DRIVER_TYPE_Z2(T) \
+                      || AXIS_DRIVER_TYPE_Z3(T) || AXIS_DRIVER_TYPE_Z4(T) || HAS_E_DRIVER(T) )
 
 // Test for supported TMC drivers that require advanced configuration
 // Does not match standalone configurations
-#define HAS_TRINAMIC (    HAS_DRIVER(TMC2130) \
-                       || HAS_DRIVER(TMC2160) \
-                       || HAS_DRIVER(TMC2208) \
-                       || HAS_DRIVER(TMC2209) \
-                       || HAS_DRIVER(TMC2660) \
-                       || HAS_DRIVER(TMC5130) \
-                       || HAS_DRIVER(TMC5160) )
-
-#define HAS_TRINAMIC_STANDALONE (    HAS_DRIVER(TMC2130_STANDALONE) \
-                                  || HAS_DRIVER(TMC2208_STANDALONE) \
-                                  || HAS_DRIVER(TMC2209_STANDALONE) \
-                                  || HAS_DRIVER(TMC26X_STANDALONE)  \
-                                  || HAS_DRIVER(TMC2660_STANDALONE) \
-                                  || HAS_DRIVER(TMC5130_STANDALONE) \
-                                  || HAS_DRIVER(TMC5160_STANDALONE) \
-                                  || HAS_DRIVER(TMC2160_STANDALONE) )
-
-#define HAS_TMCX1X0 (    HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) \
-                      || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160))
-
-#define HAS_TMC220x (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209))
-
-#define AXIS_IS_TMC(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                           || AXIS_DRIVER_TYPE(A,TMC2160) \
-                           || AXIS_DRIVER_TYPE(A,TMC2208) \
-                           || AXIS_DRIVER_TYPE(A,TMC2209) \
+#if (    HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) \
+      || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209) \
+      || HAS_DRIVER(TMC2660) \
+      || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160) )
+  #define HAS_TRINAMIC_CONFIG 1
+#endif
+
+#define HAS_TRINAMIC HAS_TRINAMIC_CONFIG
+
+#if (    HAS_DRIVER(TMC2130_STANDALONE) || HAS_DRIVER(TMC2160_STANDALONE) \
+      || HAS_DRIVER(TMC2208_STANDALONE) || HAS_DRIVER(TMC2209_STANDALONE) \
+      || HAS_DRIVER(TMC26X_STANDALONE)  || HAS_DRIVER(TMC2660_STANDALONE) \
+      || HAS_DRIVER(TMC5130_STANDALONE) || HAS_DRIVER(TMC5160_STANDALONE) )
+  #define HAS_TRINAMIC_STANDALONE 1
+#endif
+
+#if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160)
+  #define HAS_TMCX1X0 1
+#endif
+
+#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
+  #define HAS_TMC220x 1
+#endif
+
+#define AXIS_IS_TMC(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+                           || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
                            || AXIS_DRIVER_TYPE(A,TMC2660) \
-                           || AXIS_DRIVER_TYPE(A,TMC5130) \
-                           || AXIS_DRIVER_TYPE(A,TMC5160) )
+                           || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
 // Test for a driver that uses SPI - this allows checking whether a _CS_ pin
 // is considered sensitive
-#define AXIS_HAS_SPI(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                           || AXIS_DRIVER_TYPE(A,TMC2160) \
+#define AXIS_HAS_SPI(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
                            || AXIS_DRIVER_TYPE(A,TMC2660) \
-                           || AXIS_DRIVER_TYPE(A,TMC5130) \
-                           || AXIS_DRIVER_TYPE(A,TMC5160) )
+                           || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
-#define AXIS_HAS_UART(A) (    AXIS_DRIVER_TYPE(A,TMC2208) \
-                           || AXIS_DRIVER_TYPE(A,TMC2209) )
+#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) )
 
-#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
+#define AXIS_HAS_RXTX AXIS_HAS_UART
 
-#define AXIS_HAS_STALLGUARD(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2160) \
+#define AXIS_HAS_SW_SERIAL(A) ( AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL) )
+
+#define AXIS_HAS_STALLGUARD(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
                                    || AXIS_DRIVER_TYPE(A,TMC2209) \
                                    || AXIS_DRIVER_TYPE(A,TMC2660) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5160) )
+                                   || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
-#define AXIS_HAS_STEALTHCHOP(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2160) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2208) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2209) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5160) )
+#define AXIS_HAS_STEALTHCHOP(A)  (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
+                                   || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
-#define AXIS_HAS_SG_RESULT(A)    (    AXIS_DRIVER_TYPE(A,TMC2130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2160) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2208) \
-                                   || AXIS_DRIVER_TYPE(A,TMC2209) )
+#define AXIS_HAS_SG_RESULT(A)    (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
+                                   || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) )
 
 #define AXIS_HAS_COOLSTEP(A)     (    AXIS_DRIVER_TYPE(A,TMC2130) \
                                    || AXIS_DRIVER_TYPE(A,TMC2209) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5130) \
-                                   || AXIS_DRIVER_TYPE(A,TMC5160) )
+                                   || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
 #define _OR_EAH(N,T)    || AXIS_HAS_##T(E##N)
 #define E_AXIS_HAS(T)   (0 _OR_EAH(0,T) _OR_EAH(1,T) _OR_EAH(2,T) _OR_EAH(3,T) _OR_EAH(4,T) _OR_EAH(5,T) _OR_EAH(6,T) _OR_EAH(7,T))
 
-#define ANY_AXIS_HAS(T) (    AXIS_HAS_##T(X)  || AXIS_HAS_##T(X2) \
-                          || AXIS_HAS_##T(Y)  || AXIS_HAS_##T(Y2) \
-                          || AXIS_HAS_##T(Z)  || AXIS_HAS_##T(Z2) \
-                          || AXIS_HAS_##T(Z3) || AXIS_HAS_##T(Z4) \
-                          || E_AXIS_HAS(T) )
-
-#define HAS_STEALTHCHOP    ANY_AXIS_HAS(STEALTHCHOP)
-#define HAS_STALLGUARD     ANY_AXIS_HAS(STALLGUARD)
-#define HAS_SG_RESULT      ANY_AXIS_HAS(SG_RESULT)
-#define HAS_COOLSTEP       ANY_AXIS_HAS(COOLSTEP)
-#define HAS_TMC_UART       ANY_AXIS_HAS(UART)
-#define HAS_TMC_SPI        ANY_AXIS_HAS(SPI)
-#define HAS_TMC_SW_SERIAL  ANY_AXIS_HAS(SW_SERIAL)
+#define ANY_AXIS_HAS(T) (    AXIS_HAS_##T(X)  || AXIS_HAS_##T(Y)  || AXIS_HAS_##T(Z)  \
+                          || AXIS_HAS_##T(X2) || AXIS_HAS_##T(Y2) || AXIS_HAS_##T(Z2) \
+                          || AXIS_HAS_##T(Z3) || AXIS_HAS_##T(Z4) || E_AXIS_HAS(T) )
+
+#if ANY_AXIS_HAS(STEALTHCHOP)
+  #define HAS_STEALTHCHOP 1
+#endif
+#if ANY_AXIS_HAS(STALLGUARD)
+  #define HAS_STALLGUARD 1
+#endif
+#if ANY_AXIS_HAS(SG_RESULT)
+  #define HAS_SG_RESULT 1
+#endif
+#if ANY_AXIS_HAS(COOLSTEP)
+  #define HAS_COOLSTEP 1
+#endif
+#if ANY_AXIS_HAS(RXTX)
+  #define HAS_TMC_UART 1
+#endif
+#if ANY_AXIS_HAS(SPI)
+  #define HAS_TMC_SPI 1
+#endif
+
+// Defines that can't be evaluated now
+#define HAS_TMC_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL)
 
 //
 // Stretching 'drivers.h' to include LPC/SAMD51 SD options
@@ -183,7 +183,11 @@
 #define _SDCARD_ID(V) _CAT(_SDCARD_, V)
 #define SD_CONNECTION_IS(V) (_SDCARD_ID(SDCARD_CONNECTION) == _SDCARD_ID(V))
 
-#define HAS_L64XX (HAS_DRIVER(L6470) || HAS_DRIVER(L6474) || HAS_DRIVER(L6480) || HAS_DRIVER(POWERSTEP01))
-#define HAS_L64XX_NOT_L6474 (HAS_L64XX && !HAS_DRIVER(L6474))
+#if HAS_DRIVER(L6470) || HAS_DRIVER(L6474) || HAS_DRIVER(L6480) || HAS_DRIVER(POWERSTEP01)
+  #define HAS_L64XX 1
+#endif
+#if HAS_L64XX && !HAS_DRIVER(L6474)
+  #define HAS_L64XX_NOT_L6474 1
+#endif
 
 #define AXIS_IS_L64XX(A) (AXIS_DRIVER_TYPE_##A(L6470) || AXIS_DRIVER_TYPE_##A(L6474) ||  AXIS_DRIVER_TYPE_##A(L6480) || AXIS_DRIVER_TYPE_##A(POWERSTEP01))
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 5e0797d67c04..899baf73592e 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+#if !defined(__has_include)
+  #define __has_include(...) 1
+#endif
+
 #define ABCE 4
 #define XYZE 4
 #define ABC  3
@@ -177,18 +181,26 @@
 // Macros to support option testing
 #define _CAT(a,V...) a##V
 #define CAT(a,V...) _CAT(a,V)
-#define SWITCH_ENABLED_false 0
-#define SWITCH_ENABLED_true  1
-#define SWITCH_ENABLED_0     0
-#define SWITCH_ENABLED_1     1
-#define SWITCH_ENABLED_0x0   0
-#define SWITCH_ENABLED_0x1   1
-#define SWITCH_ENABLED_      1
-#define _ENA_1(O)           _CAT(SWITCH_ENABLED_, O)
-#define _DIS_1(O)           !_ENA_1(O)
+
+#define _ISENA_     ~,1
+#define _ISENA_1    ~,1
+#define _ISENA_0x1  ~,1
+#define _ISENA_true ~,1
+#define _ISENA(V...)        IS_PROBE(V)
+
+#define _ENA_1(O)           _ISENA(CAT(_IS,CAT(ENA_, O)))
+#define _DIS_1(O)           NOT(_ENA_1(O))
 #define ENABLED(V...)       DO(ENA,&&,V)
 #define DISABLED(V...)      DO(DIS,&&,V)
 
+#define TERN(O,A,B)         _TERN(_ENA_1(O),B,A)    // OPTION converted to '0' or '1'
+#define TERN0(O,A)          _TERN(_ENA_1(O),0,A)    // OPTION converted to A or '0'
+#define TERN1(O,A)          _TERN(_ENA_1(O),1,A)    // OPTION converted to A or '1'
+#define TERN_(O,A)          _TERN(_ENA_1(O),,A)     // OPTION converted to A or '<nul>'
+#define _TERN(E,V...)       __TERN(_CAT(T_,E),V)    // Prepend 'T_' to get 'T_0' or 'T_1'
+#define __TERN(T,V...)      ___TERN(_CAT(_NO,T),V)  // Prepend '_NO' to get '_NOT_0' or '_NOT_1'
+#define ___TERN(P,V...)     THIRD(P,V)              // If first argument has a comma, A. Else B.
+
 #define ANY(V...)          !DISABLED(V)
 #define NONE(V...)          DISABLED(V)
 #define ALL(V...)           ENABLED(V)
@@ -243,6 +255,11 @@
 #define _JOIN_1(O)         (O)
 #define JOIN_N(N,C,V...)   (DO(JOIN,C,LIST_N(N,V)))
 
+#define LOOP_S_LE_N(VAR, S, N) for (uint8_t VAR=(S); VAR<=(N); VAR++)
+#define LOOP_S_L_N(VAR, S, N) for (uint8_t VAR=(S); VAR<(N); VAR++)
+#define LOOP_LE_N(VAR, N) LOOP_S_LE_N(VAR, 0, N)
+#define LOOP_L_N(VAR, N) LOOP_S_L_N(VAR, 0, N)
+
 #define NOOP (void(0))
 
 #define CEILING(x,y) (((x) + (y) - 1) / (y))
@@ -390,8 +407,9 @@
 //
 // Primitives supporting precompiler REPEAT
 //
-#define FIRST(a,...)    a
-#define SECOND(a,b,...) b
+#define FIRST(a,...)     a
+#define SECOND(a,b,...)  b
+#define THIRD(a,b,c,...) c
 
 // Defer expansion
 #define EMPTY()
@@ -473,7 +491,7 @@
     ( DEFER2(__RREPEAT2)()(ADD1(_RPT_I),SUB1(_RPT_N),_RPT_OP,V) ) \
     ( /* Do nothing */ )
 #define __RREPEAT2() _RREPEAT2
-#define RREPEAT_S(S,N,OP)        EVAL(_RREPEAT(S,SUB##S(N),OP))
+#define RREPEAT_S(S,N,OP)        EVAL1024(_RREPEAT(S,SUB##S(N),OP))
 #define RREPEAT(N,OP)            RREPEAT_S(0,N,OP)
-#define RREPEAT2_S(S,N,OP,V...)  EVAL(_RREPEAT2(S,SUB##S(N),OP,V))
+#define RREPEAT2_S(S,N,OP,V...)  EVAL1024(_RREPEAT2(S,SUB##S(N),OP,V))
 #define RREPEAT2(N,OP,V...)      RREPEAT2_S(0,N,OP,V)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index d563963cf75c..1212eb5ba299 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <stddef.h>
 
-#include "millis_t.h"
+#include "../inc/MarlinConfigPre.h"
 
 class __FlashStringHelper;
 typedef const __FlashStringHelper *progmem_str;
@@ -50,12 +50,6 @@ enum AxisEnum : uint8_t {
 //
 // Loop over XYZE axes
 //
-
-#define LOOP_S_LE_N(VAR, S, N) for (uint8_t VAR=(S); VAR<=(N); VAR++)
-#define LOOP_S_L_N(VAR, S, N) for (uint8_t VAR=(S); VAR<(N); VAR++)
-#define LOOP_LE_N(VAR, N) LOOP_S_LE_N(VAR, 0, N)
-#define LOOP_L_N(VAR, N) LOOP_S_L_N(VAR, 0, N)
-
 #define LOOP_XYZ(VAR) LOOP_S_LE_N(VAR, X_AXIS, Z_AXIS)
 #define LOOP_XYZE(VAR) LOOP_S_LE_N(VAR, X_AXIS, E_AXIS)
 #define LOOP_XYZE_N(VAR) LOOP_S_L_N(VAR, X_AXIS, XYZE_N)
@@ -187,6 +181,12 @@ struct XYval {
   };
   FI void set(const T px)                               { x = px; }
   FI void set(const T px, const T py)                   { x = px; y = py; }
+  FI void set(const T (&arr)[XY])                       { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZ])                      { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZE])                     { x = arr[0]; y = arr[1]; }
+  #if XYZE_N > XYZE
+    FI void set(const T (&arr)[XYZE_N])                 { x = arr[0]; y = arr[1]; }
+  #endif
   FI void reset()                                       { x = y = 0; }
   FI T magnitude()                                const { return (T)sqrtf(x*x + y*y); }
   FI operator T* ()                                     { return pos; }
@@ -197,6 +197,8 @@ struct XYval {
   FI XYval<int16_t>    asInt()                    const { return { int16_t(x), int16_t(y) }; }
   FI XYval<int32_t>   asLong()                          { return { int32_t(x), int32_t(y) }; }
   FI XYval<int32_t>   asLong()                    const { return { int32_t(x), int32_t(y) }; }
+  FI XYval<int32_t>   ROUNDL()                          { return { int32_t(LROUND(x)), int32_t(LROUND(y)) }; }
+  FI XYval<int32_t>   ROUNDL()                    const { return { int32_t(LROUND(x)), int32_t(LROUND(y)) }; }
   FI XYval<float>    asFloat()                          { return {   float(x),   float(y) }; }
   FI XYval<float>    asFloat()                    const { return {   float(x),   float(y) }; }
   FI XYval<float> reciprocal()                    const { return {  _RECIP(x),  _RECIP(y) }; }
@@ -290,6 +292,12 @@ struct XYZval {
   FI void set(const T px, const T py)                  { x = px; y = py; }
   FI void set(const T px, const T py, const T pz)      { x = px; y = py; z = pz; }
   FI void set(const XYval<T> pxy, const T pz)          { x = pxy.x; y = pxy.y; z = pz; }
+  FI void set(const T (&arr)[XY])                      { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZ])                     { x = arr[0]; y = arr[1]; z = arr[2]; }
+  FI void set(const T (&arr)[XYZE])                    { x = arr[0]; y = arr[1]; z = arr[2]; }
+  #if XYZE_N > XYZE
+    FI void set(const T (&arr)[XYZE_N])                { x = arr[0]; y = arr[1]; z = arr[2]; }
+  #endif
   FI void reset()                                      { x = y = z = 0; }
   FI T magnitude()                               const { return (T)sqrtf(x*x + y*y + z*z); }
   FI operator T* ()                                    { return pos; }
@@ -300,6 +308,8 @@ struct XYZval {
   FI XYZval<int16_t>   asInt()                   const { return { int16_t(x), int16_t(y), int16_t(z) }; }
   FI XYZval<int32_t>  asLong()                         { return { int32_t(x), int32_t(y), int32_t(z) }; }
   FI XYZval<int32_t>  asLong()                   const { return { int32_t(x), int32_t(y), int32_t(z) }; }
+  FI XYZval<int32_t>  ROUNDL()                         { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)) }; }
+  FI XYZval<int32_t>  ROUNDL()                   const { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)) }; }
   FI XYZval<float>   asFloat()                         { return {   float(x),   float(y),   float(z) }; }
   FI XYZval<float>   asFloat()                   const { return {   float(x),   float(y),   float(z) }; }
   FI XYZval<float> reciprocal()                  const { return {  _RECIP(x),  _RECIP(y),  _RECIP(z) }; }
@@ -397,12 +407,20 @@ struct XYZEval {
   FI void set(const XYval<T> pxy, const T pz, const T pe)     { x = pxy.x;  y = pxy.y;  z = pz;     e = pe;    }
   FI void set(const XYval<T> pxy, const XYval<T> pze)         { x = pxy.x;  y = pxy.y;  z = pze.z;  e = pze.e; }
   FI void set(const XYZval<T> pxyz, const T pe)               { x = pxyz.x; y = pxyz.y; z = pxyz.z; e = pe;    }
+  FI void set(const T (&arr)[XY])                             { x = arr[0]; y = arr[1]; }
+  FI void set(const T (&arr)[XYZ])                            { x = arr[0]; y = arr[1]; z = arr[2]; }
+  FI void set(const T (&arr)[XYZE])                           { x = arr[0]; y = arr[1]; z = arr[2]; e = arr[3]; }
+  #if XYZE_N > XYZE
+    FI void set(const T (&arr)[XYZE_N])                       { x = arr[0]; y = arr[1]; z = arr[2]; e = arr[3]; }
+  #endif
   FI XYZEval<T>          copy()                         const { return *this; }
   FI XYZEval<T>           ABS()                         const { return { T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(e)) }; }
   FI XYZEval<int16_t>   asInt()                               { return { int16_t(x), int16_t(y), int16_t(z), int16_t(e) }; }
   FI XYZEval<int16_t>   asInt()                         const { return { int16_t(x), int16_t(y), int16_t(z), int16_t(e) }; }
-  FI XYZEval<int32_t>  asLong()                         const { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
   FI XYZEval<int32_t>  asLong()                               { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
+  FI XYZEval<int32_t>  asLong()                         const { return { int32_t(x), int32_t(y), int32_t(z), int32_t(e) }; }
+  FI XYZEval<int32_t>  ROUNDL()                               { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(e)) }; }
+  FI XYZEval<int32_t>  ROUNDL()                         const { return { int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(e)) }; }
   FI XYZEval<float>   asFloat()                               { return {   float(x),   float(y),   float(z),   float(e) }; }
   FI XYZEval<float>   asFloat()                         const { return {   float(x),   float(y),   float(z),   float(e) }; }
   FI XYZEval<float> reciprocal()                        const { return {  _RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(e) }; }
@@ -483,3 +501,4 @@ struct XYZEval {
 #undef FI
 
 const xyze_char_t axis_codes { 'X', 'Y', 'Z', 'E' };
+#define XYZ_CHAR(A) ('X' + char(A))
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 64783d070f0a..5e159af58176 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -57,39 +57,22 @@ void safe_delay(millis_t ms) {
 
   void log_machine_info() {
     SERIAL_ECHOLNPGM("Machine Type: "
-      #if ENABLED(DELTA)
-        "Delta"
-      #elif IS_SCARA
-        "SCARA"
-      #elif IS_CORE
-        "Core"
-      #else
-        "Cartesian"
-      #endif
+      TERN(DELTA, "Delta", "")
+      TERN(IS_SCARA, "SCARA", "")
+      TERN(IS_CORE, "Core", "")
+      TERN(IS_CARTESIAN, "Cartesian", "")
     );
 
     SERIAL_ECHOLNPGM("Probe: "
-      #if ENABLED(PROBE_MANUALLY)
-        "PROBE_MANUALLY"
-      #elif ENABLED(NOZZLE_AS_PROBE)
-        "NOZZLE_AS_PROBE"
-      #elif ENABLED(FIX_MOUNTED_PROBE)
-        "FIX_MOUNTED_PROBE"
-      #elif ENABLED(BLTOUCH)
-        "BLTOUCH"
-      #elif HAS_Z_SERVO_PROBE
-        "SERVO PROBE"
-      #elif ENABLED(TOUCH_MI_PROBE)
-        "TOUCH_MI_PROBE"
-      #elif ENABLED(Z_PROBE_SLED)
-        "Z_PROBE_SLED"
-      #elif ENABLED(Z_PROBE_ALLEN_KEY)
-        "Z_PROBE_ALLEN_KEY"
-      #elif ENABLED(SOLENOID_PROBE)
-        "SOLENOID_PROBE"
-      #else
-        "NONE"
-      #endif
+      TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "")
+      TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "")
+      TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "")
+      TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "")
+      TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "")
+      TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "")
+      TERN(Z_PROBE_ALLEN_KEY, "Z_PROBE_ALLEN_KEY", "")
+      TERN(SOLENOID_PROBE, "SOLENOID_PROBE", "")
+      TERN(PROBE_SELECTED, "", "NONE")
     );
 
     #if HAS_BED_PROBE
@@ -107,20 +90,10 @@ void safe_delay(millis_t ms) {
         else
           SERIAL_ECHOPGM(" (Aligned With");
 
-        if (probe.offset_xy.y > 0) {
-          #if IS_SCARA
-            SERIAL_ECHOPGM("-Distal");
-          #else
-            SERIAL_ECHOPGM("-Back");
-          #endif
-        }
-        else if (probe.offset_xy.y < 0) {
-          #if IS_SCARA
-            SERIAL_ECHOPGM("-Proximal");
-          #else
-            SERIAL_ECHOPGM("-Front");
-          #endif
-        }
+        if (probe.offset_xy.y > 0)
+          serialprintPGM(ENABLED(IS_SCARA) ? PSTR("-Distal") : PSTR("-Back"));
+        else if (probe.offset_xy.y < 0)
+          serialprintPGM(ENABLED(IS_SCARA) ? PSTR("-Proximal") : PSTR("-Front"));
         else if (probe.offset_xy.x != 0)
           SERIAL_ECHOPGM("-Center");
 
@@ -128,28 +101,19 @@ void safe_delay(millis_t ms) {
 
       #endif
 
-      if (probe.offset.z < 0)
-        SERIAL_ECHOPGM("Below");
-      else if (probe.offset.z > 0)
-        SERIAL_ECHOPGM("Above");
-      else
-        SERIAL_ECHOPGM("Same Z as");
+      serialprintPGM(probe.offset.z < 0 ? PSTR("Below") : probe.offset.z > 0 ? PSTR("Above") : PSTR("Same Z as"));
       SERIAL_ECHOLNPGM(" Nozzle)");
 
     #endif
 
     #if HAS_ABL_OR_UBL
-      SERIAL_ECHOLNPGM("Auto Bed Leveling: "
-        #if ENABLED(AUTO_BED_LEVELING_LINEAR)
-          "LINEAR"
-        #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-          "BILINEAR"
-        #elif ENABLED(AUTO_BED_LEVELING_3POINT)
-          "3POINT"
-        #elif ENABLED(AUTO_BED_LEVELING_UBL)
-          "UBL"
-        #endif
+      SERIAL_ECHOPGM("Auto Bed Leveling: "
+        TERN(AUTO_BED_LEVELING_LINEAR, "LINEAR", "")
+        TERN(AUTO_BED_LEVELING_BILINEAR, "BILINEAR", "")
+        TERN(AUTO_BED_LEVELING_3POINT, "3POINT", "")
+        TERN(AUTO_BED_LEVELING_UBL, "UBL", "")
       );
+
       if (planner.leveling_active) {
         SERIAL_ECHOLNPGM(" (enabled)");
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
@@ -160,7 +124,7 @@ void safe_delay(millis_t ms) {
           SERIAL_ECHOPGM("ABL Adjustment X");
           LOOP_XYZ(a) {
             float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a];
-            SERIAL_CHAR(' ', 'X' + char(a));
+            SERIAL_CHAR(' ', XYZ_CHAR(a));
             if (v > 0) SERIAL_CHAR('+');
             SERIAL_ECHO(v);
           }
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index e34f9dd58a0e..0c2e91d31fca 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -23,6 +23,7 @@
 
 #include "../inc/MarlinConfigPre.h"
 #include "../core/types.h"
+#include "../core/millis_t.h"
 
 // Delay that ensures heaters and watchdog are kept alive
 void safe_delay(millis_t ms);
@@ -70,7 +71,7 @@ class restorer {
   inline void restore() { ref_ = val_; }
 };
 
-#define REMEMBER(N,X,V...) const restorer<typeof(X)> restorer_##N(X, ##V)
+#define REMEMBER(N,X,V...) restorer<typeof(X)> restorer_##N(X, ##V)
 #define RESTORE(N) restorer_##N.restore()
 
 // Converts from an uint8_t in the range of 0-255 to an uint8_t
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index bf9e9a78b551..5d2dc47bee95 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -55,14 +55,7 @@ void Babystep::add_mm(const AxisEnum axis, const float &mm) {
 
 void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
 
-  #if ENABLED(BABYSTEP_WITHOUT_HOMING)
-    #define CAN_BABYSTEP(AXIS) true
-  #else
-    extern uint8_t axis_known_position;
-    #define CAN_BABYSTEP(AXIS) TEST(axis_known_position, AXIS)
-  #endif
-
-  if (!CAN_BABYSTEP(axis)) return;
+  if (DISABLED(BABYSTEP_WITHOUT_HOMING) && !TEST(axis_known_position, axis)) return;
 
   accum += distance; // Count up babysteps for the UI
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 84cd0a85b7d7..bc33ae31853a 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -113,7 +113,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
             error_correction = 0; // Don't take up any backlash in this segment, as it would subtract steps
         }
       #endif
-      // Making a correction reduces the residual error and modifies delta_mm
+      // Making a correction reduces the residual error and adds block steps
       if (error_correction) {
         block->steps[axis] += ABS(error_correction);
         residual_error[axis] -= error_correction;
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index 74821ba2ec5f..33c9cbdfde36 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -32,7 +32,7 @@
 #include "../../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 xy_pos_t bilinear_grid_spacing, bilinear_start;
@@ -115,8 +115,8 @@ void extrapolate_unprobed_bed_level() {
                       ylen = ctry1;
   #endif
 
-  for (uint8_t xo = 0; xo <= xlen; xo++)
-    for (uint8_t yo = 0; yo <= ylen; yo++) {
+  LOOP_LE_N(xo, xlen)
+    LOOP_LE_N(yo, ylen) {
       uint8_t x2 = ctrx2 + xo, y2 = ctry2 + yo;
       #ifndef HALF_IN_X
         const uint8_t x1 = ctrx1 - xo;
@@ -209,8 +209,8 @@ void print_bilinear_leveling_grid() {
 
   static float bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const float &tx, const float &ty) {
     float row[4], column[4];
-    for (uint8_t i = 0; i < 4; i++) {
-      for (uint8_t j = 0; j < 4; j++) {
+    LOOP_L_N(i, 4) {
+      LOOP_L_N(j, 4) {
         column[j] = bed_level_virt_coord(i + x - 1, j + y - 1);
       }
       row[i] = bed_level_virt_cmr(column, 1, ty);
@@ -221,11 +221,11 @@ void print_bilinear_leveling_grid() {
   void bed_level_virt_interpolate() {
     bilinear_grid_spacing_virt = bilinear_grid_spacing / (BILINEAR_SUBDIVISIONS);
     bilinear_grid_factor_virt = bilinear_grid_spacing_virt.reciprocal();
-    for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t ty = 0; ty < BILINEAR_SUBDIVISIONS; ty++)
-          for (uint8_t tx = 0; tx < BILINEAR_SUBDIVISIONS; tx++) {
-            if ((ty && y == GRID_MAX_POINTS_Y - 1) || (tx && x == GRID_MAX_POINTS_X - 1))
+    LOOP_L_N(y, GRID_MAX_POINTS_Y)
+      LOOP_L_N(x, GRID_MAX_POINTS_X)
+        LOOP_L_N(ty, BILINEAR_SUBDIVISIONS)
+          LOOP_L_N(tx, BILINEAR_SUBDIVISIONS) {
+            if ((ty && y == (GRID_MAX_POINTS_Y) - 1) || (tx && x == (GRID_MAX_POINTS_X) - 1))
               continue;
             z_values_virt[x * (BILINEAR_SUBDIVISIONS) + tx][y * (BILINEAR_SUBDIVISIONS) + ty] =
               bed_level_virt_2cmr(
diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index f302d172bf9b..63493712a8c9 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -43,7 +43,7 @@
 #include "../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 bool leveling_is_valid() {
@@ -143,13 +143,12 @@ void reset_bed_level() {
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
       bilinear_start.reset();
       bilinear_grid_spacing.reset();
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-          z_values[x][y] = NAN;
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(x, y, 0);
-          #endif
-        }
+      GRID_LOOP(x, y) {
+        z_values[x][y] = NAN;
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, 0);
+        #endif
+      }
     #elif ABL_PLANAR
       planner.bed_level_matrix.set_to_identity();
     #endif
@@ -173,7 +172,7 @@ void reset_bed_level() {
    */
   void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, element_2d_fn fn) {
     #ifndef SCAD_MESH_OUTPUT
-      for (uint8_t x = 0; x < sx; x++) {
+      LOOP_L_N(x, sx) {
         serial_spaces(precision + (x < 10 ? 3 : 2));
         SERIAL_ECHO(int(x));
       }
@@ -182,14 +181,14 @@ void reset_bed_level() {
     #ifdef SCAD_MESH_OUTPUT
       SERIAL_ECHOLNPGM("measured_z = ["); // open 2D array
     #endif
-    for (uint8_t y = 0; y < sy; y++) {
+    LOOP_L_N(y, sy) {
       #ifdef SCAD_MESH_OUTPUT
         SERIAL_ECHOPGM(" [");             // open sub-array
       #else
         if (y < 10) SERIAL_CHAR(' ');
         SERIAL_ECHO(int(y));
       #endif
-      for (uint8_t x = 0; x < sx; x++) {
+      LOOP_L_N(x, sx) {
         SERIAL_CHAR(' ');
         const float offset = fn(x, y);
         if (!isnan(offset)) {
@@ -202,7 +201,7 @@ void reset_bed_level() {
               SERIAL_CHAR(' ');
             SERIAL_ECHOPGM("NAN");
           #else
-            for (uint8_t i = 0; i < precision + 3; i++)
+            LOOP_L_N(i, precision + 3)
               SERIAL_CHAR(i ? '=' : ' ');
           #endif
         }
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
index e80b9e9d2f15..7439c3fcd3e9 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
@@ -29,7 +29,7 @@
   #include "../../../module/motion.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   mesh_bed_leveling mbl;
@@ -40,9 +40,9 @@
         mesh_bed_leveling::index_to_ypos[GRID_MAX_POINTS_Y];
 
   mesh_bed_leveling::mesh_bed_leveling() {
-    for (uint8_t i = 0; i < GRID_MAX_POINTS_X; ++i)
+    LOOP_L_N(i, GRID_MAX_POINTS_X)
       index_to_xpos[i] = MESH_MIN_X + i * (MESH_X_DIST);
-    for (uint8_t i = 0; i < GRID_MAX_POINTS_Y; ++i)
+    LOOP_L_N(i, GRID_MAX_POINTS_Y)
       index_to_ypos[i] = MESH_MIN_Y + i * (MESH_Y_DIST);
     reset();
   }
@@ -51,9 +51,7 @@
     z_offset = 0;
     ZERO(z_values);
     #if ENABLED(EXTENSIBLE_UI)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          ExtUI::onMeshUpdate(x, y, 0);
+      GRID_LOOP(x, y) ExtUI::onMeshUpdate(x, y, 0);
     #endif
   }
 
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
index 4c8773107f77..3a1cbaccb0f5 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -52,9 +52,7 @@ class mesh_bed_leveling {
   static void reset();
 
   FORCE_INLINE static bool has_mesh() {
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-        if (z_values[x][y]) return true;
+    GRID_LOOP(x, y) if (z_values[x][y]) return true;
     return false;
   }
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index f1a67061335e..8ef2ad564c06 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -37,7 +37,7 @@
   #include "../../../module/probe.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   #include "math.h"
@@ -49,7 +49,7 @@
   void unified_bed_leveling::report_current_mesh() {
     if (!leveling_is_valid()) return;
     SERIAL_ECHO_MSG("  G29 I99");
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
+    LOOP_L_N(x, GRID_MAX_POINTS_X)
       for (uint8_t y = 0;  y < GRID_MAX_POINTS_Y; y++)
         if (!isnan(z_values[x][y])) {
           SERIAL_ECHO_START();
@@ -101,9 +101,7 @@
     storage_slot = -1;
     ZERO(z_values);
     #if ENABLED(EXTENSIBLE_UI)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          ExtUI::onMeshUpdate(x, y, 0);
+      GRID_LOOP(x, y) ExtUI::onMeshUpdate(x, y, 0);
     #endif
     if (was_enabled) report_current_position();
   }
@@ -114,13 +112,11 @@
   }
 
   void unified_bed_leveling::set_all_mesh_points_to_value(const float value) {
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-        z_values[x][y] = value;
-        #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::onMeshUpdate(x, y, value);
-        #endif
-      }
+    GRID_LOOP(x, y) {
+      z_values[x][y] = value;
+      #if ENABLED(EXTENSIBLE_UI)
+        ExtUI::onMeshUpdate(x, y, value);
+      #endif
     }
   }
 
@@ -190,7 +186,7 @@
       }
 
       // Row Values (I indexes)
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
+      LOOP_L_N(i, GRID_MAX_POINTS_X) {
 
         // Opening Brace or Space
         const bool is_current = i == curr.x && j == curr.y;
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 370d792fc5d6..9e227f02d9f7 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -298,9 +298,7 @@ class unified_bed_leveling {
     #endif
 
     static inline bool mesh_is_valid() {
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          if (isnan(z_values[x][y])) return false;
+      GRID_LOOP(x, y) if (isnan(z_values[x][y])) return false;
       return true;
     }
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index a0a12ea621d2..217d8945437f 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -27,7 +27,7 @@
   #include "../bedlevel.h"
 
   #include "../../../MarlinCore.h"
-  #include "../../../HAL/shared/persistent_store_api.h"
+  #include "../../../HAL/shared/eeprom_api.h"
   #include "../../../libs/hex_print_routines.h"
   #include "../../../module/configuration_store.h"
   #include "../../../lcd/ultralcd.h"
@@ -46,7 +46,7 @@
   #include "../../../core/debug_out.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   #include <math.h>
@@ -365,25 +365,23 @@
         #endif
 
         case 0:
-          for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {   // Create a bowl shape - similar to
-            for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { // a poorly calibrated Delta.
-              const float p1 = 0.5f * (GRID_MAX_POINTS_X) - x,
-                          p2 = 0.5f * (GRID_MAX_POINTS_Y) - y;
-              z_values[x][y] += 2.0f * HYPOT(p1, p2);
-              #if ENABLED(EXTENSIBLE_UI)
-                ExtUI::onMeshUpdate(x, y, z_values[x][y]);
-              #endif
-            }
+          GRID_LOOP(x, y) {                                     // Create a bowl shape similar to a poorly-calibrated Delta
+            const float p1 = 0.5f * (GRID_MAX_POINTS_X) - x,
+                        p2 = 0.5f * (GRID_MAX_POINTS_Y) - y;
+            z_values[x][y] += 2.0f * HYPOT(p1, p2);
+            #if ENABLED(EXTENSIBLE_UI)
+              ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+            #endif
           }
           break;
 
         case 1:
-          for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) {  // Create a diagonal line several Mesh cells thick that is raised
+          LOOP_L_N(x, GRID_MAX_POINTS_X) {                     // Create a diagonal line several Mesh cells thick that is raised
             z_values[x][x] += 9.999f;
-            z_values[x][x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1] += 9.999f; // We want the altered line several mesh points thick
+            z_values[x][x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1] += 9.999f; // We want the altered line several mesh points thick
             #if ENABLED(EXTENSIBLE_UI)
               ExtUI::onMeshUpdate(x, x, z_values[x][x]);
-              ExtUI::onMeshUpdate(x, (x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1), z_values[x][x + (x < GRID_MAX_POINTS_Y - 1) ? 1 : -1]);
+              ExtUI::onMeshUpdate(x, (x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1), z_values[x][x + (x < (GRID_MAX_POINTS_Y) - 1) ? 1 : -1]);
             #endif
 
           }
@@ -467,7 +465,7 @@
             //
             // Manually Probe Mesh in areas that can't be reached by the probe
             //
-            SERIAL_ECHOLNPGM("Manually probing unreachable mesh locations.");
+            SERIAL_ECHOLNPGM("Manually probing unreachable points.");
             do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
 
             if (parser.seen('C') && !xy_seen) {
@@ -537,9 +535,7 @@
                 if (cpos.x < 0) {
                   // No more REAL INVALID mesh points to populate, so we ASSUME
                   // user meant to populate ALL INVALID mesh points to value
-                  for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-                    for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-                      if (isnan(z_values[x][y])) z_values[x][y] = g29_constant;
+                  GRID_LOOP(x, y) if (isnan(z_values[x][y])) z_values[x][y] = g29_constant;
                   break; // No more invalid Mesh Points to populate
                 }
                 else {
@@ -696,12 +692,11 @@
   void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const float value) {
     float sum = 0;
     int n = 0;
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-        if (!isnan(z_values[x][y])) {
-          sum += z_values[x][y];
-          n++;
-        }
+    GRID_LOOP(x, y)
+      if (!isnan(z_values[x][y])) {
+        sum += z_values[x][y];
+        n++;
+      }
 
     const float mean = sum / n;
 
@@ -709,10 +704,9 @@
     // Sum the squares of difference from mean
     //
     float sum_of_diff_squared = 0;
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-        if (!isnan(z_values[x][y]))
-          sum_of_diff_squared += sq(z_values[x][y] - mean);
+    GRID_LOOP(x, y)
+      if (!isnan(z_values[x][y]))
+        sum_of_diff_squared += sq(z_values[x][y] - mean);
 
     SERIAL_ECHOLNPAIR("# of samples: ", n);
     SERIAL_ECHOLNPAIR_F("Mean Mesh Height: ", mean, 6);
@@ -721,27 +715,25 @@
     SERIAL_ECHOLNPAIR_F("Standard Deviation: ", sigma, 6);
 
     if (cflag)
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
-          if (!isnan(z_values[x][y])) {
-            z_values[x][y] -= mean + value;
-            #if ENABLED(EXTENSIBLE_UI)
-              ExtUI::onMeshUpdate(x, y, z_values[x][y]);
-            #endif
-          }
-  }
-
-  void unified_bed_leveling::shift_mesh_height() {
-    for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-      for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
+      GRID_LOOP(x, y)
         if (!isnan(z_values[x][y])) {
-          z_values[x][y] += g29_constant;
+          z_values[x][y] -= mean + value;
           #if ENABLED(EXTENSIBLE_UI)
             ExtUI::onMeshUpdate(x, y, z_values[x][y]);
           #endif
         }
   }
 
+  void unified_bed_leveling::shift_mesh_height() {
+    GRID_LOOP(x, y)
+      if (!isnan(z_values[x][y])) {
+        z_values[x][y] += g29_constant;
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+        #endif
+      }
+  }
+
   #if HAS_BED_PROBE
     /**
      * Probe all invalidated locations of the mesh that can be reached by the probe.
@@ -1243,52 +1235,46 @@
 
     mesh_index_pair farthest { -1, -1, -99999.99 };
 
-    for (int8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-      for (int8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
+    GRID_LOOP(i, j) {
+      if (!isnan(z_values[i][j])) continue;  // Skip valid mesh points
 
-        if (isnan(z_values[i][j])) {                  // Invalid mesh point?
+      // Skip unreachable points
+      if (!probe.can_reach(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
+        continue;
 
-          // Skip points the probe can't reach
-          if (!position_is_reachable_by_probe(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
-            continue;
+      found_a_NAN = true;
 
-          found_a_NAN = true;
+      xy_int8_t near { -1, -1 };
+      float d1, d2 = 99999.9f;
+      GRID_LOOP(k, l) {
+        if (isnan(z_values[k][l])) continue;
 
-          xy_int8_t near { -1, -1 };
-          float d1, d2 = 99999.9f;
-          for (int8_t k = 0; k < GRID_MAX_POINTS_X; k++) {
-            for (int8_t l = 0; l < GRID_MAX_POINTS_Y; l++) {
-              if (!isnan(z_values[k][l])) {
-                found_a_real = true;
+        found_a_real = true;
 
-                // Add in a random weighting factor that scrambles the probing of the
-                // last half of the mesh (when every unprobed mesh point is one index
-                // from a probed location).
+        // Add in a random weighting factor that scrambles the probing of the
+        // last half of the mesh (when every unprobed mesh point is one index
+        // from a probed location).
 
-                d1 = HYPOT(i - k, j - l) + (1.0f / ((millis() % 47) + 13));
+        d1 = HYPOT(i - k, j - l) + (1.0f / ((millis() % 47) + 13));
 
-                if (d1 < d2) {    // Invalid mesh point (i,j) is closer to the defined point (k,l)
-                  d2 = d1;
-                  near.set(i, j);
-                }
-              }
-            }
-          }
+        if (d1 < d2) {    // Invalid mesh point (i,j) is closer to the defined point (k,l)
+          d2 = d1;
+          near.set(i, j);
+        }
+      }
 
-          //
-          // At this point d2 should have the near defined mesh point to invalid mesh point (i,j)
-          //
+      //
+      // At this point d2 should have the near defined mesh point to invalid mesh point (i,j)
+      //
 
-          if (found_a_real && near.x >= 0 && d2 > farthest.distance) {
-            farthest.pos = near;      // Found an invalid location farther from the defined mesh point
-            farthest.distance = d2;
-          }
-        }
-      } // for j
-    } // for i
+      if (found_a_real && near.x >= 0 && d2 > farthest.distance) {
+        farthest.pos = near;      // Found an invalid location farther from the defined mesh point
+        farthest.distance = d2;
+      }
+    } // GRID_LOOP
 
     if (!found_a_real && found_a_NAN) {        // if the mesh is totally unpopulated, start the probing
-      farthest.pos.set(GRID_MAX_POINTS_X / 2, GRID_MAX_POINTS_Y / 2);
+      farthest.pos.set((GRID_MAX_POINTS_X) / 2, (GRID_MAX_POINTS_Y) / 2);
       farthest.distance = 1;
     }
     return farthest;
@@ -1304,36 +1290,34 @@
 
     float best_so_far = 99999.99f;
 
-    for (int8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-      for (int8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
-        if ( (type == (isnan(z_values[i][j]) ? INVALID : REAL))
-          || (type == SET_IN_BITMAP && !done_flags->marked(i, j))
-        ) {
-          // Found a Mesh Point of the specified type!
-          const xy_pos_t mpos = { mesh_index_to_xpos(i), mesh_index_to_ypos(j) };
+    GRID_LOOP(i, j) {
+      if ( (type == (isnan(z_values[i][j]) ? INVALID : REAL))
+        || (type == SET_IN_BITMAP && !done_flags->marked(i, j))
+      ) {
+        // Found a Mesh Point of the specified type!
+        const xy_pos_t mpos = { mesh_index_to_xpos(i), mesh_index_to_ypos(j) };
 
-          // If using the probe as the reference there are some unreachable locations.
-          // Also for round beds, there are grid points outside the bed the nozzle can't reach.
-          // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
+        // If using the probe as the reference there are some unreachable locations.
+        // Also for round beds, there are grid points outside the bed the nozzle can't reach.
+        // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
 
-          if (probe_relative ? !position_is_reachable_by_probe(mpos) : !position_is_reachable(mpos))
-            continue;
+        if (!(probe_relative ? probe.can_reach(mpos) : position_is_reachable(mpos)))
+          continue;
 
-          // Reachable. Check if it's the best_so_far location to the nozzle.
+        // Reachable. Check if it's the best_so_far location to the nozzle.
 
-          const xy_pos_t diff = current_position - mpos;
-          const float distance = (ref - mpos).magnitude() + diff.magnitude() * 0.1f;
+        const xy_pos_t diff = current_position - mpos;
+        const float distance = (ref - mpos).magnitude() + diff.magnitude() * 0.1f;
 
-          // factor in the distance from the current location for the normal case
-          // so the nozzle isn't running all over the bed.
-          if (distance < best_so_far) {
-            best_so_far = distance;   // Found a closer location with the desired value type.
-            closest.pos.set(i, j);
-            closest.distance = best_so_far;
-          }
+        // factor in the distance from the current location for the normal case
+        // so the nozzle isn't running all over the bed.
+        if (distance < best_so_far) {
+          best_so_far = distance;   // Found a closer location with the desired value type.
+          closest.pos.set(i, j);
+          closest.distance = best_so_far;
         }
-      } // for j
-    } // for i
+      }
+    } // GRID_LOOP
 
     return closest;
   }
@@ -1373,7 +1357,7 @@
       info3 PROGMEM = { GRID_MAX_POINTS_X - 1, 0,  0, GRID_MAX_POINTS_Y,      true  };  // Right side of the mesh looking left
     static const smart_fill_info * const info[] PROGMEM = { &info0, &info1, &info2, &info3 };
 
-    for (uint8_t i = 0; i < COUNT(info); ++i) {
+    LOOP_L_N(i, COUNT(info)) {
       const smart_fill_info *f = (smart_fill_info*)pgm_read_ptr(&info[i]);
       const int8_t sx = pgm_read_byte(&f->sx), sy = pgm_read_byte(&f->sy),
                    ex = pgm_read_byte(&f->ex), ey = pgm_read_byte(&f->ey);
@@ -1496,12 +1480,13 @@
 
         bool zig_zag = false;
 
-        uint16_t total_points = g29_grid_size * g29_grid_size, point_num = 1;
+        const uint16_t total_points = sq(g29_grid_size);
+        uint16_t point_num = 1;
 
         xy_pos_t rpos;
-        for (uint8_t ix = 0; ix < g29_grid_size; ix++) {
+        LOOP_L_N(ix, g29_grid_size) {
           rpos.x = x_min + ix * dx;
-          for (int8_t iy = 0; iy < g29_grid_size; iy++) {
+          LOOP_L_N(iy, g29_grid_size) {
             rpos.y = y_min + dy * (zig_zag ? g29_grid_size - 1 - iy : iy);
 
             if (!abort_flag) {
@@ -1569,39 +1554,37 @@
 
       matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
 
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-        for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
-          float mx = mesh_index_to_xpos(i),
-                my = mesh_index_to_ypos(j),
-                mz = z_values[i][j];
-
-          if (DEBUGGING(LEVELING)) {
-            DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(my, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(mz, 7);
-            DEBUG_ECHOPGM("]   ---> ");
-            DEBUG_DELAY(20);
-          }
+      GRID_LOOP(i, j) {
+        float mx = mesh_index_to_xpos(i),
+              my = mesh_index_to_ypos(j),
+              mz = z_values[i][j];
+
+        if (DEBUGGING(LEVELING)) {
+          DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(my, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(mz, 7);
+          DEBUG_ECHOPGM("]   ---> ");
+          DEBUG_DELAY(20);
+        }
 
-          apply_rotation_xyz(rotation, mx, my, mz);
+        apply_rotation_xyz(rotation, mx, my, mz);
 
-          if (DEBUGGING(LEVELING)) {
-            DEBUG_ECHOPAIR_F("after rotation = [", mx, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(my, 7);
-            DEBUG_CHAR(',');
-            DEBUG_ECHO_F(mz, 7);
-            DEBUG_ECHOLNPGM("]");
-            DEBUG_DELAY(20);
-          }
-
-          z_values[i][j] = mz - lsf_results.D;
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(i, j, z_values[i][j]);
-          #endif
+        if (DEBUGGING(LEVELING)) {
+          DEBUG_ECHOPAIR_F("after rotation = [", mx, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(my, 7);
+          DEBUG_CHAR(',');
+          DEBUG_ECHO_F(mz, 7);
+          DEBUG_ECHOLNPGM("]");
+          DEBUG_DELAY(20);
         }
+
+        z_values[i][j] = mz - lsf_results.D;
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(i, j, z_values[i][j]);
+        #endif
       }
 
       if (DEBUGGING(LEVELING)) {
@@ -1628,7 +1611,7 @@
          * numbers for those locations should be 0.
          */
         #ifdef VALIDATE_MESH_TILT
-          auto d_from = []() { DEBUG_ECHOPGM("D from "); };
+          auto d_from = []{ DEBUG_ECHOPGM("D from "); };
           auto normed = [&](const xy_pos_t &pos, const float &zadd) {
             return normal.x * pos.x + normal.y * pos.y + zadd;
           };
@@ -1661,7 +1644,7 @@
       // being extrapolated so that nearby points will have greater influence on
       // the point being extrapolated.  Then extrapolate the mesh point from WLSF.
 
-      static_assert(GRID_MAX_POINTS_Y <= 16, "GRID_MAX_POINTS_Y too big");
+      static_assert((GRID_MAX_POINTS_Y) <= 16, "GRID_MAX_POINTS_Y too big");
       uint16_t bitmap[GRID_MAX_POINTS_X] = { 0 };
       struct linear_fit_data lsf_results;
 
@@ -1669,23 +1652,20 @@
 
       const float weight_scaled = weight_factor * _MAX(MESH_X_DIST, MESH_Y_DIST);
 
-      for (uint8_t jx = 0; jx < GRID_MAX_POINTS_X; jx++)
-        for (uint8_t jy = 0; jy < GRID_MAX_POINTS_Y; jy++)
-          if (!isnan(z_values[jx][jy]))
-            SBI(bitmap[jx], jy);
+      GRID_LOOP(jx, jy) if (!isnan(z_values[jx][jy])) SBI(bitmap[jx], jy);
 
       xy_pos_t ppos;
-      for (uint8_t ix = 0; ix < GRID_MAX_POINTS_X; ix++) {
+      LOOP_L_N(ix, GRID_MAX_POINTS_X) {
         ppos.x = mesh_index_to_xpos(ix);
-        for (uint8_t iy = 0; iy < GRID_MAX_POINTS_Y; iy++) {
+        LOOP_L_N(iy, GRID_MAX_POINTS_Y) {
           ppos.y = mesh_index_to_ypos(iy);
           if (isnan(z_values[ix][iy])) {
             // undefined mesh point at (ppos.x,ppos.y), compute weighted LSF from original valid mesh points.
             incremental_LSF_reset(&lsf_results);
             xy_pos_t rpos;
-            for (uint8_t jx = 0; jx < GRID_MAX_POINTS_X; jx++) {
+            LOOP_L_N(jx, GRID_MAX_POINTS_X) {
               rpos.x = mesh_index_to_xpos(jx);
-              for (uint8_t jy = 0; jy < GRID_MAX_POINTS_Y; jy++) {
+              LOOP_L_N(jy, GRID_MAX_POINTS_Y) {
                 if (TEST(bitmap[jx], jy)) {
                   rpos.y = mesh_index_to_ypos(jy);
                   const float rz = z_values[jx][jy],
@@ -1747,7 +1727,7 @@
       SERIAL_ECHOLNPAIR("MESH_Y_DIST  ", MESH_Y_DIST);                         serial_delay(50);
 
       SERIAL_ECHOPGM("X-Axis Mesh Points at: ");
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
+      LOOP_L_N(i, GRID_MAX_POINTS_X) {
         SERIAL_ECHO_F(LOGICAL_X_POSITION(mesh_index_to_xpos(i)), 3);
         SERIAL_ECHOPGM("  ");
         serial_delay(25);
@@ -1755,7 +1735,7 @@
       SERIAL_EOL();
 
       SERIAL_ECHOPGM("Y-Axis Mesh Points at: ");
-      for (uint8_t i = 0; i < GRID_MAX_POINTS_Y; i++) {
+      LOOP_L_N(i, GRID_MAX_POINTS_Y) {
         SERIAL_ECHO_F(LOGICAL_Y_POSITION(mesh_index_to_ypos(i)), 3);
         SERIAL_ECHOPGM("  ");
         serial_delay(25);
@@ -1840,13 +1820,12 @@
 
       SERIAL_ECHOLNPAIR("Subtracting mesh in slot ", g29_storage_slot, " from current mesh.");
 
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-          z_values[x][y] -= tmp_z_values[x][y];
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(x, y, z_values[x][y]);
-          #endif
-        }
+      GRID_LOOP(x, y) {
+        z_values[x][y] -= tmp_z_values[x][y];
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, z_values[x][y]);
+        #endif
+      }
     }
 
   #endif // UBL_DEVEL_DEBUGGING
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 77d85c4195f4..efe575ec634e 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -73,20 +73,12 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
       );
     }
 
-    const bool should_set = last_written_mode != (false
-      #if ENABLED(BLTOUCH_SET_5V_MODE)
-        || true
-      #endif
-    );
+    const bool should_set = last_written_mode != ENABLED(BLTOUCH_SET_5V_MODE);
 
   #endif
 
   if (should_set && set_voltage)
-    mode_conv_proc((false
-      #if ENABLED(BLTOUCH_SET_5V_MODE)
-        || true
-      #endif
-    ));
+    mode_conv_proc(ENABLED(BLTOUCH_SET_5V_MODE));
 }
 
 void BLTouch::clear() {
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index b9d8c394609b..074670040781 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -24,60 +24,80 @@
 
 #if ENABLED(USE_CONTROLLER_FAN)
 
+#include "controllerfan.h"
 #include "../module/stepper/indirection.h"
 #include "../module/temperature.h"
 
-uint8_t controllerfan_speed;
+ControllerFan controllerFan;
 
-void controllerfan_update() {
-  static millis_t lastMotorOn = 0, // Last time a motor was turned on
+uint8_t ControllerFan::speed;
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+  controllerFan_settings_t ControllerFan::settings; // {0}
+#endif
+
+void ControllerFan::setup() {
+  SET_OUTPUT(CONTROLLER_FAN_PIN);
+  init();
+}
+
+void ControllerFan::set_fan_speed(const uint8_t s) {
+  speed = s < (CONTROLLERFAN_SPEED_MIN) ? 0 : s; // Fan OFF below minimum
+}
+
+void ControllerFan::update() {
+  static millis_t lastMotorOn = 0,    // Last time a motor was turned on
                   nextMotorCheck = 0; // Last time the state was checked
   const millis_t ms = millis();
   if (ELAPSED(ms, nextMotorCheck)) {
     nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
 
-    const bool xory = X_ENABLE_READ() == bool(X_ENABLE_ON) || Y_ENABLE_READ() == bool(Y_ENABLE_ON);
+    #define MOTOR_IS_ON(A,B) (A##_ENABLE_READ() == bool(B##_ENABLE_ON))
+    #define _OR_ENABLED_E(N) || MOTOR_IS_ON(E##N,E)
 
-    // If any of the drivers or the bed are enabled...
-    if (xory || Z_ENABLE_READ() == bool(Z_ENABLE_ON)
-      #if HAS_HEATED_BED
-        || thermalManager.temp_bed.soft_pwm_amount > 0
-      #endif
-      #if HAS_X2_ENABLE
-        || X2_ENABLE_READ() == bool(X_ENABLE_ON)
-      #endif
-      #if HAS_Y2_ENABLE
-        || Y2_ENABLE_READ() == bool(Y_ENABLE_ON)
-      #endif
+    const bool motor_on = MOTOR_IS_ON(Z,Z)
       #if HAS_Z2_ENABLE
-        || Z2_ENABLE_READ() == bool(Z_ENABLE_ON)
+        || MOTOR_IS_ON(Z2,Z)
       #endif
       #if HAS_Z3_ENABLE
-        || Z3_ENABLE_READ() == bool(Z_ENABLE_ON)
+        || MOTOR_IS_ON(Z3,Z)
       #endif
       #if HAS_Z4_ENABLE
-        || Z4_ENABLE_READ() == bool(Z_ENABLE_ON)
-      #endif
-      #if E_STEPPERS
-        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == bool(E_ENABLE_ON)
-        REPEAT(E_STEPPERS, _OR_ENABLED_E)
+        || MOTOR_IS_ON(Z4,Z)
       #endif
-    ) {
-      lastMotorOn = ms; //... set time to NOW so the fan will turn on
-    }
+      || (DISABLED(CONTROLLER_FAN_USE_Z_ONLY) && (
+          MOTOR_IS_ON(X,X) || MOTOR_IS_ON(Y,Y)
+          #if HAS_X2_ENABLE
+            || MOTOR_IS_ON(X2,X)
+          #endif
+          #if HAS_Y2_ENABLE
+            || MOTOR_IS_ON(Y2,Y)
+          #endif
+          #if E_STEPPERS
+            REPEAT(E_STEPPERS, _OR_ENABLED_E)
+          #endif
+        )
+      )
+    ;
 
-    // Fan off if no steppers have been enabled for CONTROLLERFAN_SECS seconds
-    controllerfan_speed = (!lastMotorOn || ELAPSED(ms, lastMotorOn + (CONTROLLERFAN_SECS) * 1000UL)) ? 0 : (
-      #ifdef CONTROLLERFAN_SPEED_Z_ONLY
-        xory ? CONTROLLERFAN_SPEED : CONTROLLERFAN_SPEED_Z_ONLY
-      #else
-        CONTROLLERFAN_SPEED
+    // If any of the drivers or the heated bed are enabled...
+    if (motor_on
+      #if HAS_HEATED_BED
+        || thermalManager.temp_bed.soft_pwm_amount > 0
       #endif
+    ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
+
+    // Fan Settings. Set fan > 0:
+    //  - If AutoMode is on and steppers have been enabled for CONTROLLERFAN_IDLE_TIME seconds.
+    //  - If System is on idle and idle fan speed settings is activated.
+    set_fan_speed(
+      settings.auto_mode && lastMotorOn && PENDING(ms, lastMotorOn + settings.duration * 1000UL)
+      ? settings.active_speed : settings.idle_speed
     );
 
     // Allow digital or PWM fan output (see M42 handling)
-    WRITE(CONTROLLER_FAN_PIN, controllerfan_speed);
-    analogWrite(pin_t(CONTROLLER_FAN_PIN), controllerfan_speed);
+    WRITE(CONTROLLER_FAN_PIN, speed);
+    analogWrite(pin_t(CONTROLLER_FAN_PIN), speed);
   }
 }
 
diff --git a/Marlin/src/feature/controllerfan.h b/Marlin/src/feature/controllerfan.h
index f2facc288f30..cd56ff8cedf6 100644
--- a/Marlin/src/feature/controllerfan.h
+++ b/Marlin/src/feature/controllerfan.h
@@ -21,4 +21,56 @@
  */
 #pragma once
 
-void controllerfan_update();
+#include "../inc/MarlinConfigPre.h"
+
+typedef struct {
+  uint8_t   active_speed,    // 0-255 (fullspeed); Speed with enabled stepper motors
+            idle_speed;      // 0-255 (fullspeed); Speed after idle period with all motors are disabled
+  uint16_t  duration;        // Duration in seconds for the fan to run after all motors are disabled
+  bool      auto_mode;       // Default true
+} controllerFan_settings_t;
+
+#ifndef CONTROLLERFAN_SPEED_ACTIVE
+  #define CONTROLLERFAN_SPEED_ACTIVE 255
+#endif
+#ifndef CONTROLLERFAN_SPEED_IDLE
+  #define CONTROLLERFAN_SPEED_IDLE     0
+#endif
+#ifndef CONTROLLERFAN_IDLE_TIME
+  #define CONTROLLERFAN_IDLE_TIME     60
+#endif
+
+static constexpr controllerFan_settings_t controllerFan_defaults = {
+  CONTROLLERFAN_SPEED_ACTIVE,
+  CONTROLLERFAN_SPEED_IDLE,
+  CONTROLLERFAN_IDLE_TIME,
+  true
+};
+
+#if ENABLED(USE_CONTROLLER_FAN)
+
+class ControllerFan {
+  private:
+    static uint8_t speed;
+    static void set_fan_speed(const uint8_t s);
+
+  public:
+    #if ENABLED(CONTROLLER_FAN_EDITABLE)
+      static controllerFan_settings_t settings;
+    #else
+      static const controllerFan_settings_t constexpr &settings = controllerFan_defaults;
+    #endif
+    static inline bool state() { return speed > 0; }
+    static inline void init() { reset(); }
+    static inline void reset() {
+      #if ENABLED(CONTROLLER_FAN_EDITABLE)
+        settings = controllerFan_defaults;
+      #endif
+    }
+    static void setup();
+    static void update();
+};
+
+extern ControllerFan controllerFan;
+
+#endif
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index cb3856f28704..c8c1cb2494b0 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -88,11 +88,11 @@ void dac_print_values() {
 
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
   SERIAL_ECHO_START();
-  SERIAL_ECHOLNPAIR(
-    " X:", dac_perc(X_AXIS), " (", dac_amps(X_AXIS), ")"
-    " Y:", dac_perc(Y_AXIS), " (", dac_amps(Y_AXIS), ")"
-    " Z:", dac_perc(Z_AXIS), " (", dac_amps(Z_AXIS), ")"
-    " E:", dac_perc(E_AXIS), " (", dac_amps(E_AXIS), ")"
+  SERIAL_ECHOLNPAIR_P(
+    SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")")
+    SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")")
+    SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")")
+    SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")")
   );
 }
 
diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
index 888acc55d050..e8df4a475fee 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
@@ -92,11 +92,11 @@ void digipot_i2c_set_current(const uint8_t channel, const float current) {
 void digipot_i2c_init() {
   static const float digipot_motor_current[] PROGMEM = DIGIPOT_I2C_MOTOR_CURRENTS;
 
-  for (uint8_t i = 0; i < DIGIPOT_I2C_NUM_CHANNELS; i++)
+  LOOP_L_N(i, DIGIPOT_I2C_NUM_CHANNELS)
     pots[i].i2c_init();
 
   // setup initial currents as defined in Configuration_adv.h
-  for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++)
+  LOOP_L_N(i, COUNT(digipot_motor_current))
     digipot_i2c_set_current(i, pgm_read_float(&digipot_motor_current[i]));
 }
 
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index e84bd28d35c6..1183c96aa515 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -83,7 +83,7 @@ void digipot_i2c_init() {
   #endif
   // setup initial currents as defined in Configuration_adv.h
   static const float digipot_motor_current[] PROGMEM = DIGIPOT_I2C_MOTOR_CURRENTS;
-  for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++)
+  LOOP_L_N(i, COUNT(digipot_motor_current))
     digipot_i2c_set_current(i, pgm_read_float(&digipot_motor_current[i]));
 }
 
diff --git a/Marlin/src/feature/emergency_parser.cpp b/Marlin/src/feature/e_parser.cpp
similarity index 97%
rename from Marlin/src/feature/emergency_parser.cpp
rename to Marlin/src/feature/e_parser.cpp
index 60fba1f1b617..e7d79bf745c1 100644
--- a/Marlin/src/feature/emergency_parser.cpp
+++ b/Marlin/src/feature/e_parser.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(EMERGENCY_PARSER)
 
-#include "emergency_parser.h"
+#include "e_parser.h"
 
 // Static data members
 bool EmergencyParser::killed_by_M112, // = false
diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/e_parser.h
similarity index 96%
rename from Marlin/src/feature/emergency_parser.h
rename to Marlin/src/feature/e_parser.h
index 787c82407fc5..41261402a10f 100644
--- a/Marlin/src/feature/emergency_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -75,10 +75,11 @@ class EmergencyParser {
   FORCE_INLINE static void disable() { enabled = false; }
 
   FORCE_INLINE static void update(State &state, const uint8_t c) {
+    #define ISEOL(C) ((C) == '\n' || (C) == '\r')
     switch (state) {
       case EP_RESET:
         switch (c) {
-          case ' ': break;
+          case ' ': case '\n': case '\r': break;
           case 'N': state = EP_N;      break;
           case 'M': state = EP_M;      break;
           default: state  = EP_IGNORE;
@@ -164,11 +165,11 @@ class EmergencyParser {
       #endif
 
       case EP_IGNORE:
-        if (c == '\n') state = EP_RESET;
+        if (ISEOL(c)) state = EP_RESET;
         break;
 
       default:
-        if (c == '\n') {
+        if (ISEOL(c)) {
           if (enabled) switch (state) {
             case EP_M108: wait_for_user = wait_for_heatup = false; break;
             case EP_M112: killed_by_M112 = true; break;
diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/encoder_i2c.cpp
similarity index 99%
rename from Marlin/src/feature/I2CPositionEncoder.cpp
rename to Marlin/src/feature/encoder_i2c.cpp
index 9c1e53df74c4..a70227a27011 100644
--- a/Marlin/src/feature/I2CPositionEncoder.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -32,7 +32,7 @@
 
 #if ENABLED(I2C_POSITION_ENCODERS)
 
-#include "I2CPositionEncoder.h"
+#include "encoder_i2c.h"
 
 #include "../module/temperature.h"
 #include "../module/stepper.h"
diff --git a/Marlin/src/feature/I2CPositionEncoder.h b/Marlin/src/feature/encoder_i2c.h
similarity index 100%
rename from Marlin/src/feature/I2CPositionEncoder.h
rename to Marlin/src/feature/encoder_i2c.h
diff --git a/Marlin/src/feature/filwidth.cpp b/Marlin/src/feature/filwidth.cpp
index ae8c43d43091..4357d39fe031 100644
--- a/Marlin/src/feature/filwidth.cpp
+++ b/Marlin/src/feature/filwidth.cpp
@@ -42,7 +42,7 @@ int8_t FilamentWidthSensor::ratios[MAX_MEASUREMENT_DELAY + 1],          // Ring
 
 void FilamentWidthSensor::init() {
   const int8_t ratio = sample_to_size_ratio();
-  for (uint8_t i = 0; i < COUNT(ratios); ++i) ratios[i] = ratio;
+  LOOP_L_N(i, COUNT(ratios)) ratios[i] = ratio;
   index_r = index_w = 0;
 }
 
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 2436170b3542..7d756ac6d060 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -73,7 +73,7 @@ void FWRetract::reset() {
   settings.swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP;
   current_hop = 0.0;
 
-  for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+  LOOP_L_N(i, EXTRUDERS) {
     retracted[i] = false;
     #if EXTRUDERS > 1
       retracted_swap[i] = false;
@@ -117,7 +117,7 @@ void FWRetract::retract(const bool retracting
       " swapping ", swapping,
       " active extruder ", active_extruder
     );
-    for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+    LOOP_L_N(i, EXTRUDERS) {
       SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
       #if EXTRUDERS > 1
         SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
@@ -201,7 +201,7 @@ void FWRetract::retract(const bool retracting
     SERIAL_ECHOLNPAIR("retracting ", retracting);
     SERIAL_ECHOLNPAIR("swapping ", swapping);
     SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
-    for (uint8_t i = 0; i < EXTRUDERS; ++i) {
+    LOOP_L_N(i, EXTRUDERS) {
       SERIAL_ECHOLNPAIR("retracted[", i, "] ", retracted[i]);
       #if EXTRUDERS > 1
         SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", retracted_swap[i]);
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index 70c2812a37aa..66afb63b054e 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -37,7 +37,7 @@
 Joystick joystick;
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_JOY_ADC_X
@@ -173,6 +173,7 @@ Joystick joystick;
 
     if (!UNEAR_ZERO(hypot2)) {
       current_position += move_dist;
+      apply_motion_limits(current_position);
       const float length = sqrt(hypot2);
       injecting_now = true;
       planner.buffer_line(current_position, length / seg_time, active_extruder, length);
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/max7219.cpp
similarity index 85%
rename from Marlin/src/feature/Max7219_Debug_LEDs.cpp
rename to Marlin/src/feature/max7219.cpp
index 2b329db3b333..a012aeb5fa69 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -41,31 +41,23 @@
 
 #define MAX7219_ERRORS // Disable to save 406 bytes of Program Memory
 
-#include "Max7219_Debug_LEDs.h"
+#include "max7219.h"
 
 #include "../module/planner.h"
 #include "../module/stepper.h"
 #include "../MarlinCore.h"
 #include "../HAL/shared/Delay.h"
 
-#define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1)
+#if ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1
+  #define HAS_SIDE_BY_SIDE 1
+#endif
 
 #if _ROT == 0 || _ROT == 180
-  #if HAS_SIDE_BY_SIDE
-    #define MAX7219_X_LEDS  8
-    #define MAX7219_Y_LEDS  MAX7219_LINES
-  #else
-    #define MAX7219_Y_LEDS  8
-    #define MAX7219_X_LEDS  MAX7219_LINES
-  #endif
+  #define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
+  #define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
 #elif _ROT == 90 || _ROT == 270
-  #if HAS_SIDE_BY_SIDE
-    #define MAX7219_Y_LEDS  8
-    #define MAX7219_X_LEDS  MAX7219_LINES
-  #else
-    #define MAX7219_X_LEDS  8
-    #define MAX7219_Y_LEDS  MAX7219_LINES
-  #endif
+  #define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
+  #define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
 #else
   #error "MAX7219_ROTATE must be a multiple of +/- 90°."
 #endif
@@ -73,6 +65,7 @@
 Max7219 max7219;
 
 uint8_t Max7219::led_line[MAX7219_LINES]; // = { 0 };
+uint8_t Max7219::suspended; // = 0;
 
 #define LINE_REG(Q)     (max7219_reg_digit0 + ((Q) & 0x7))
 
@@ -128,7 +121,7 @@ uint8_t Max7219::led_line[MAX7219_LINES]; // = { 0 };
   #define CRITICAL_SECTION_START() NOOP
   #define CRITICAL_SECTION_END()   NOOP
 #else
-  #define SIG_DELAY() DELAY_NS(188) // Delay for 0.1875µs (16MHz AVR) or 0.15µs (20MHz AVR)
+  #define SIG_DELAY() DELAY_NS(250)
 #endif
 
 void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/*=-1*/) {
@@ -154,7 +147,7 @@ void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/
  */
 inline uint32_t flipped(const uint32_t bits, const uint8_t n_bytes) {
   uint32_t mask = 1, outbits = 0;
-  for (uint8_t b = 0; b < n_bytes * 8; b++) {
+  LOOP_L_N(b, n_bytes * 8) {
     outbits <<= 1;
     if (bits & mask) outbits |= 1;
     mask <<= 1;
@@ -212,6 +205,7 @@ void Max7219::send(const uint8_t reg, const uint8_t data) {
 
 // Send out a single native row of bits to just one unit
 void Max7219::refresh_unit_line(const uint8_t line) {
+  if (suspended) return;
   #if MAX7219_NUMBER_UNITS == 1
     send(LINE_REG(line), led_line[line]);
   #else
@@ -223,6 +217,7 @@ void Max7219::refresh_unit_line(const uint8_t line) {
 
 // Send out a single native row of bits to all units
 void Max7219::refresh_line(const uint8_t line) {
+  if (suspended) return;
   #if MAX7219_NUMBER_UNITS == 1
     refresh_unit_line(line);
   #else
@@ -241,9 +236,9 @@ void Max7219::set(const uint8_t line, const uint8_t bits) {
 
   // Draw an integer with optional leading zeros and optional decimal point
   void Max7219::print(const uint8_t start, int16_t value, uint8_t size, const bool leadzero=false, bool dec=false) {
+    if (suspended) return;
     constexpr uint8_t led_numeral[10] = { 0x7E, 0x60, 0x6D, 0x79, 0x63, 0x5B, 0x5F, 0x70, 0x7F, 0x7A },
                       led_decimal = 0x80, led_minus = 0x01;
-
     bool blank = false, neg = value < 0;
     if (neg) value *= -1;
     while (size--) {
@@ -295,6 +290,7 @@ void Max7219::led_toggle(const uint8_t x, const uint8_t y) {
 }
 
 void Max7219::send_row(const uint8_t row) {
+  if (suspended) return;
   #if _ROT == 0 || _ROT == 180            // Native Lines are horizontal too
     #if MAX7219_X_LEDS <= 8
       refresh_unit_line(LED_IND(0, row)); // A single unit line
@@ -308,6 +304,7 @@ void Max7219::send_row(const uint8_t row) {
 }
 
 void Max7219::send_column(const uint8_t col) {
+  if (suspended) return;
   #if _ROT == 90 || _ROT == 270           // Native Lines are vertical too
     #if MAX7219_Y_LEDS <= 8
       refresh_unit_line(LED_IND(col, 0)); // A single unit line
@@ -332,25 +329,25 @@ void Max7219::fill() {
 
 void Max7219::clear_row(const uint8_t row) {
   if (row >= MAX7219_Y_LEDS) return error(PSTR("clear_row"), row);
-  for (uint8_t x = 0; x < MAX7219_X_LEDS; x++) CLR_7219(x, row);
+  LOOP_L_N(x, MAX7219_X_LEDS) CLR_7219(x, row);
   send_row(row);
 }
 
 void Max7219::clear_column(const uint8_t col) {
   if (col >= MAX7219_X_LEDS) return error(PSTR("set_column"), col);
-  for (uint8_t y = 0; y < MAX7219_Y_LEDS; y++) CLR_7219(col, y);
+  LOOP_L_N(y, MAX7219_Y_LEDS) CLR_7219(col, y);
   send_column(col);
 }
 
 /**
  * Plot the low order bits of val to the specified row of the matrix.
- * With 4 Max7219 units in the chain, it's possible to set 32 bits at once with
- * one call to the function (if rotated 90° or 180°).
+ * With 4 Max7219 units in the chain, it's possible to set 32 bits at
+ * once with a single call to the function (if rotated 90° or 270°).
  */
 void Max7219::set_row(const uint8_t row, const uint32_t val) {
   if (row >= MAX7219_Y_LEDS) return error(PSTR("set_row"), row);
   uint32_t mask = _BV32(MAX7219_X_LEDS - 1);
-  for (uint8_t x = 0; x < MAX7219_X_LEDS; x++) {
+  LOOP_L_N(x, MAX7219_X_LEDS) {
     if (val & mask) SET_7219(x, row); else CLR_7219(x, row);
     mask >>= 1;
   }
@@ -359,13 +356,13 @@ void Max7219::set_row(const uint8_t row, const uint32_t val) {
 
 /**
  * Plot the low order bits of val to the specified column of the matrix.
- * With 4 Max7219 units in the chain, it's possible to set 32 bits at once with
- * one call to the function (if rotated 90° or 180°).
+ * With 4 Max7219 units in the chain, it's possible to set 32 bits at
+ * once with a single call to the function (if rotated 0° or 180°).
  */
 void Max7219::set_column(const uint8_t col, const uint32_t val) {
   if (col >= MAX7219_X_LEDS) return error(PSTR("set_column"), col);
   uint32_t mask = _BV32(MAX7219_Y_LEDS - 1);
-  for (uint8_t y = 0; y < MAX7219_Y_LEDS; y++) {
+  LOOP_L_N(y, MAX7219_Y_LEDS) {
     if (val & mask) SET_7219(col, y); else CLR_7219(col, y);
     mask >>= 1;
   }
@@ -430,58 +427,106 @@ void Max7219::set_columns_32bits(const uint8_t x, uint32_t val) {
 
 // Initialize the Max7219
 void Max7219::register_setup() {
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_scanLimit, 0x07);
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_decodeMode, 0x00);       // Using an led matrix (not digits)
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_shutdown, 0x01);         // Not in shutdown mode
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_displayTest, 0x00);      // No display test
   pulse_load();                               // Tell the chips to load the clocked out data
 
-  for (uint8_t i = 0; i < MAX7219_NUMBER_UNITS; i++)
+  LOOP_L_N(i, MAX7219_NUMBER_UNITS)
     send(max7219_reg_intensity, 0x01 & 0x0F); // The first 0x0F is the value you can set
                                               // Range: 0x00 to 0x0F
   pulse_load();                               // Tell the chips to load the clocked out data
 }
 
 #ifdef MAX7219_INIT_TEST
-#if MAX7219_INIT_TEST == 2
-
-  #define MAX7219_LEDS (MAX7219_X_LEDS * MAX7219_Y_LEDS)
-
-  void Max7219::spiral(const bool on, const uint16_t del) {
-    constexpr int8_t way[][2] = { { 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 } };
-    int8_t px = 0, py = 0, dir = 0;
-    for (IF<(MAX7219_LEDS > 255), uint16_t, uint8_t>::type i = MAX7219_LEDS; i--;) {
-      led_set(px, py, on);
-      delay(del);
-      const int8_t x = px + way[dir][0], y = py + way[dir][1];
-      if (!WITHIN(x, 0, MAX7219_X_LEDS - 1) || !WITHIN(y, 0, MAX7219_Y_LEDS - 1) || BIT_7219(x, y) == on)
-        dir = (dir + 1) & 0x3;
-      px += way[dir][0];
-      py += way[dir][1];
+
+  uint8_t test_mode = 0;
+  millis_t next_patt_ms;
+  bool patt_on;
+
+  #if MAX7219_INIT_TEST == 2
+
+    #define MAX7219_LEDS (MAX7219_X_LEDS * MAX7219_Y_LEDS)
+
+    constexpr millis_t pattern_delay = 4;
+
+    int8_t spiralx, spiraly, spiral_dir;
+    IF<(MAX7219_LEDS > 255), uint16_t, uint8_t>::type spiral_count;
+
+    void Max7219::test_pattern() {
+      constexpr int8_t way[][2] = { { 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 } };
+      led_set(spiralx, spiraly, patt_on);
+      const int8_t x = spiralx + way[spiral_dir][0], y = spiraly + way[spiral_dir][1];
+      if (!WITHIN(x, 0, MAX7219_X_LEDS - 1) || !WITHIN(y, 0, MAX7219_Y_LEDS - 1) || BIT_7219(x, y) == patt_on)
+        spiral_dir = (spiral_dir + 1) & 0x3;
+      spiralx += way[spiral_dir][0];
+      spiraly += way[spiral_dir][1];
+      if (!spiral_count--) {
+        if (!patt_on)
+          test_mode = 0;
+        else {
+          spiral_count = MAX7219_LEDS;
+          spiralx = spiraly = spiral_dir = 0;
+          patt_on = false;
+        }
+      }
     }
-  }
 
-#else
+  #else
 
-  void Max7219::sweep(const int8_t dir, const uint16_t ms, const bool on) {
-    uint8_t x = dir > 0 ? 0 : MAX7219_X_LEDS - 1;
-    for (uint8_t i = MAX7219_X_LEDS; i--; x += dir) {
-      set_column(x, on ? 0xFFFFFFFF : 0x00000000);
-      delay(ms);
+    constexpr millis_t pattern_delay = 20;
+    int8_t sweep_count, sweepx, sweep_dir;
+
+    void Max7219::test_pattern() {
+      set_column(sweepx, patt_on ? 0xFFFFFFFF : 0x00000000);
+      sweepx += sweep_dir;
+      if (!WITHIN(sweepx, 0, MAX7219_X_LEDS - 1)) {
+        if (!patt_on) {
+          sweep_dir *= -1;
+          sweepx += sweep_dir;
+        }
+        else
+          sweepx -= MAX7219_X_LEDS * sweep_dir;
+        patt_on ^= true;
+        next_patt_ms += 100;
+        if (++test_mode > 4) test_mode = 0;
+      }
     }
+
+  #endif
+
+  void Max7219::run_test_pattern() {
+    const millis_t ms = millis();
+    if (PENDING(ms, next_patt_ms)) return;
+    next_patt_ms = ms + pattern_delay;
+    test_pattern();
+  }
+
+  void Max7219::start_test_pattern() {
+    clear();
+    test_mode = 1;
+    patt_on = true;
+    #if MAX7219_INIT_TEST == 2
+      spiralx = spiraly = spiral_dir = 0;
+      spiral_count = MAX7219_LEDS;
+    #else
+      sweep_dir = 1;
+      sweepx = 0;
+      sweep_count = MAX7219_X_LEDS;
+    #endif
   }
 
-#endif
 #endif // MAX7219_INIT_TEST
 
 void Max7219::init() {
@@ -492,26 +537,14 @@ void Max7219::init() {
 
   register_setup();
 
-  for (uint8_t i = 0; i <= 7; i++) {  // Empty registers to turn all LEDs off
+  LOOP_LE_N(i, 7) {  // Empty registers to turn all LEDs off
     led_line[i] = 0x00;
     send(max7219_reg_digit0 + i, 0);
     pulse_load();                     // Tell the chips to load the clocked out data
   }
 
   #ifdef MAX7219_INIT_TEST
-    #if MAX7219_INIT_TEST == 2
-      spiral(true, 8);
-      delay(150);
-      spiral(false, 8);
-    #else
-      // Do an aesthetically-pleasing pattern to fully test the Max7219 module and LEDs.
-      // Light up and turn off columns, both forward and backward.
-      sweep(1, 20, true);
-      sweep(1, 20, false);
-      delay(150);
-      sweep(-1, 20, true);
-      sweep(-1, 20, false);
-    #endif
+    start_test_pattern();
   #endif
 }
 
@@ -604,6 +637,13 @@ void Max7219::idle_tasks() {
     register_setup();
   }
 
+  #ifdef MAX7219_INIT_TEST
+    if (test_mode) {
+      run_test_pattern();
+      return;
+    }
+  #endif
+
   #if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
     if (do_blink) {
       led_toggle(MAX7219_X_LEDS - 1, MAX7219_Y_LEDS - 1);
@@ -649,6 +689,12 @@ void Max7219::idle_tasks() {
       last_depth = current_depth;
     }
   #endif
+
+  // After resume() automatically do a refresh()
+  if (suspended == 0x80) {
+    suspended = 0;
+    refresh();
+  }
 }
 
 #endif // MAX7219_DEBUG
diff --git a/Marlin/src/feature/Max7219_Debug_LEDs.h b/Marlin/src/feature/max7219.h
similarity index 92%
rename from Marlin/src/feature/Max7219_Debug_LEDs.h
rename to Marlin/src/feature/max7219.h
index d0b242454450..19170b2d5906 100644
--- a/Marlin/src/feature/Max7219_Debug_LEDs.h
+++ b/Marlin/src/feature/max7219.h
@@ -88,6 +88,12 @@ class Max7219 {
   // Refresh all units
   static inline void refresh() { for (uint8_t i = 0; i < 8; i++) refresh_line(i); }
 
+  // Suspend / resume updates to the LED unit
+  // Use these methods to speed up multiple changes
+  // or to apply updates from interrupt context.
+  static inline void suspend() { suspended++; }
+  static inline void resume() { suspended--; suspended |= 0x80; }
+
   // Update a single native line on all units
   static void refresh_line(const uint8_t line);
 
@@ -126,6 +132,7 @@ class Max7219 {
   static void idle_tasks();
 
 private:
+  static uint8_t suspended;
   static void error(const char * const func, const int32_t v1, const int32_t v2=-1);
   static void noop();
   static void set(const uint8_t line, const uint8_t bits);
@@ -136,11 +143,9 @@ class Max7219 {
   static void quantity16(const uint8_t y, const uint8_t ov, const uint8_t nv);
 
   #ifdef MAX7219_INIT_TEST
-  #if MAX7219_INIT_TEST == 2
-    static void spiral(const bool on, const uint16_t del);
-  #else
-    static void sweep(const int8_t dir, const uint16_t ms, const bool on);
-  #endif
+    static void test_pattern();
+    static void run_test_pattern();
+    static void start_test_pattern();
   #endif
 };
 
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index de1cda14beca..d6ae2bb6290b 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -98,13 +98,13 @@ void Mixer::normalize(const uint8_t tool_index) {
 void Mixer::reset_vtools() {
   // Virtual Tools 0, 1, 2, 3 = Filament 1, 2, 3, 4, etc.
   // Every virtual tool gets a pure filament
-  for (uint8_t t = 0; t < MIXING_VIRTUAL_TOOLS && t < MIXING_STEPPERS; t++)
+  LOOP_L_N(t, MIXING_VIRTUAL_TOOLS && t < MIXING_STEPPERS)
     MIXER_STEPPER_LOOP(i)
       color[t][i] = (t == i) ? COLOR_A_MASK : 0;
 
   // Remaining virtual tools are 100% filament 1
   #if MIXING_VIRTUAL_TOOLS > MIXING_STEPPERS
-    for (uint8_t t = MIXING_STEPPERS; t < MIXING_VIRTUAL_TOOLS; t++)
+    LOOP_S_L_N(t, MIXING_STEPPERS, MIXING_VIRTUAL_TOOLS)
       MIXER_STEPPER_LOOP(i)
         color[t][i] = (i == 0) ? COLOR_A_MASK : 0;
   #endif
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/mmu2/mmu2.cpp
similarity index 98%
rename from Marlin/src/feature/prusa_MMU2/mmu2.cpp
rename to Marlin/src/feature/mmu2/mmu2.cpp
index d71edbac35f4..4506883f464e 100644
--- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp
+++ b/Marlin/src/feature/mmu2/mmu2.cpp
@@ -43,7 +43,7 @@ MMU2 mmu2;
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(MMU2_DEBUG)
@@ -381,7 +381,7 @@ bool MMU2::rx_str_P(const char* str) {
 void MMU2::tx_str_P(const char* str) {
   clear_rx_buffer();
   uint8_t len = strlen_P(str);
-  for (uint8_t i = 0; i < len; i++) mmuSerial.write(pgm_read_byte(str++));
+  LOOP_L_N(i, len) mmuSerial.write(pgm_read_byte(str++));
   rx_buffer[0] = '\0';
   last_request = millis();
 }
@@ -392,7 +392,7 @@ void MMU2::tx_str_P(const char* str) {
 void MMU2::tx_printf_P(const char* format, int argument = -1) {
   clear_rx_buffer();
   uint8_t len = sprintf_P(tx_buffer, format, argument);
-  for (uint8_t i = 0; i < len; i++) mmuSerial.write(tx_buffer[i]);
+  LOOP_L_N(i, len) mmuSerial.write(tx_buffer[i]);
   rx_buffer[0] = '\0';
   last_request = millis();
 }
@@ -403,7 +403,7 @@ void MMU2::tx_printf_P(const char* format, int argument = -1) {
 void MMU2::tx_printf_P(const char* format, int argument1, int argument2) {
   clear_rx_buffer();
   uint8_t len = sprintf_P(tx_buffer, format, argument1, argument2);
-  for (uint8_t i = 0; i < len; i++) mmuSerial.write(tx_buffer[i]);
+  LOOP_L_N(i, len) mmuSerial.write(tx_buffer[i]);
   rx_buffer[0] = '\0';
   last_request = millis();
 }
@@ -707,14 +707,13 @@ void MMU2::filament_runout() {
     if (recover)  {
       LCD_MESSAGEPGM(MSG_MMU2_EJECT_RECOVER);
       BUZZ(200, 404);
-      wait_for_user = true;
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR);
       #endif
       #if ENABLED(EXTENSIBLE_UI)
         ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover"));
       #endif
-      while (wait_for_user) idle();
+      wait_for_user_response();
       BUZZ(200, 404);
       BUZZ(200, 404);
 
@@ -780,7 +779,7 @@ void MMU2::filament_runout() {
 
     const E_Step* step = sequence;
 
-    for (uint8_t i = 0; i < steps; i++) {
+    LOOP_L_N(i, steps) {
       const float es = pgm_read_float(&(step->extrude));
       const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
 
diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.h b/Marlin/src/feature/mmu2/mmu2.h
similarity index 100%
rename from Marlin/src/feature/prusa_MMU2/mmu2.h
rename to Marlin/src/feature/mmu2/mmu2.h
diff --git a/Marlin/src/feature/prusa_MMU2/serial-protocol.md b/Marlin/src/feature/mmu2/serial-protocol.md
similarity index 100%
rename from Marlin/src/feature/prusa_MMU2/serial-protocol.md
rename to Marlin/src/feature/mmu2/serial-protocol.md
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 95b5cc953f86..9c615b6ff82f 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -50,7 +50,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #include "../core/language.h"
@@ -134,15 +134,6 @@ static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) {
   return thermalManager.wait_for_hotend(active_extruder);
 }
 
-void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s) {
-  #if HAS_FILAMENT_SENSOR
-    runout.reset();
-  #endif
-  current_position.e += length / planner.e_factor[active_extruder];
-  line_to_current_position(fr_mm_s);
-  planner.synchronize();
-}
-
 /**
  * Load filament into the hotend
  *
@@ -184,7 +175,6 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
     #endif
 
     KEEPALIVE_STATE(PAUSED_FOR_USER);
-    wait_for_user = true;    // LCD click or M108 will clear this
     #if ENABLED(HOST_PROMPT_SUPPORT)
       const char tool = '0'
         #if NUM_RUNOUT_SENSORS > 1
@@ -202,7 +192,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
       #if HAS_BUZZER
         filament_change_beep(max_beep_count);
       #endif
-      idle(true);
+      idle_no_sleep();
     }
   }
 
@@ -218,7 +208,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
   #endif
 
   // Slow Load filament
-  if (slow_load_length) do_pause_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
+  if (slow_load_length) unscaled_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
 
   // Fast Load Filament
   if (fast_load_length) {
@@ -227,7 +217,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
       planner.settings.retract_acceleration = FILAMENT_CHANGE_FAST_LOAD_ACCEL;
     #endif
 
-    do_pause_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE);
+    unscaled_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE);
 
     #if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0
       planner.settings.retract_acceleration = saved_acceleration;
@@ -246,15 +236,15 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
       if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_PURGE);
     #endif
 
-    wait_for_user = true;
     #if ENABLED(HOST_PROMPT_SUPPORT)
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR);
     #endif
     #if ENABLED(EXTENSIBLE_UI)
       ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging..."));
     #endif
+    wait_for_user = true; // A click or M108 breaks the purge_length loop
     for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
-      do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
+      unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
     wait_for_user = false;
 
   #else
@@ -267,7 +257,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
         #endif
 
         // Extrude filament to get into hotend
-        do_pause_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
+        unscaled_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
       }
 
       #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -280,7 +270,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
           lcd_pause_show_message(PAUSE_MESSAGE_OPTION);
-          while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle(true);
+          while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle_no_sleep();
         }
       #endif
 
@@ -332,13 +322,13 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
   #endif
 
   // Retract filament
-  do_pause_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier);
+  unscaled_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier);
 
   // Wait for filament to cool
   safe_delay(FILAMENT_UNLOAD_PURGE_DELAY);
 
   // Quickly purge
-  do_pause_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier,
+  unscaled_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier,
                   (FILAMENT_UNLOAD_PURGE_FEEDRATE) * mix_multiplier);
 
   // Unload filament
@@ -347,7 +337,7 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
     planner.settings.retract_acceleration = FILAMENT_CHANGE_UNLOAD_ACCEL;
   #endif
 
-  do_pause_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier);
+  unscaled_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier);
 
   #if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0
     planner.settings.retract_acceleration = saved_acceleration;
@@ -437,7 +427,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
 
   // Initial retract before move to filament change position
   if (retract && thermalManager.hotEnoughToExtrude(active_extruder))
-    do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
+    unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
 
   // Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos)
   if (!axes_need_homing())
@@ -508,13 +498,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
   // Wait for filament insert by user and press button
   KEEPALIVE_STATE(PAUSED_FOR_USER);
-  wait_for_user = true;    // LCD click or M108 will clear this
   #if ENABLED(HOST_PROMPT_SUPPORT)
     host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Nozzle Parked"), CONTINUE_STR);
   #endif
   #if ENABLED(EXTENSIBLE_UI)
     ExtUI::onUserConfirmRequired_P(PSTR("Nozzle Parked"));
   #endif
+  wait_for_user = true;    // LCD click or M108 will clear this
   while (wait_for_user) {
     #if HAS_BUZZER
       filament_change_beep(max_beep_count);
@@ -540,8 +530,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
         ExtUI::onUserConfirmRequired_P(PSTR("HeaterTimeout"));
       #endif
 
-      // Wait for LCD click or M108
-      while (wait_for_user) idle(true);
+      wait_for_user_response(0, true); // Wait for LCD click or M108
 
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_INFO, PSTR("Reheating"));
@@ -576,8 +565,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
         filament_change_beep(max_beep_count, true);
       #endif
     }
-
-    idle(true);
+    idle_no_sleep();
   }
   #if ENABLED(DUAL_X_CARRIAGE)
     active_extruder = saved_ext;
@@ -634,11 +622,11 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
   #if ENABLED(FWRETRACT)
     // If retracted before goto pause
     if (fwretract.retracted[active_extruder])
-      do_pause_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
+      unscaled_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s);
   #endif
 
   // If resume_position is negative
-  if (resume_position.e < 0) do_pause_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
+  if (resume_position.e < 0) unscaled_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
 
   // Move XY to starting position, then Z
   do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE));
@@ -647,7 +635,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
   do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE));
 
   #if ADVANCED_PAUSE_RESUME_PRIME != 0
-    do_pause_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
+    unscaled_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
   #endif
 
   // Now all extrusion positions are resumed and ready to be confirmed
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index 5ac67a565c36..f1c8eed4d367 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -83,8 +83,6 @@ extern uint8_t did_pause_print;
   #define DXC_PASS
 #endif
 
-void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s);
-
 bool pause_print(const float &retract, const xyz_pos_t &park_point, const float &unload_length=0, const bool show_lcd=false DXC_PARAMS);
 
 void wait_for_confirmation(const bool is_reload=false, const int8_t max_beep_count=0 DXC_PARAMS);
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index f1979c376192..1fa751811e61 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -46,8 +46,8 @@ bool Power::is_power_needed() {
     HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
   #endif
 
-  #if ENABLED(AUTO_POWER_CONTROLLERFAN, USE_CONTROLLER_FAN) && HAS_CONTROLLER_FAN
-    if (controllerfan_speed) return true;
+  #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
+    if (controllerFan.state()) return true;
   #endif
 
   #if ENABLED(AUTO_POWER_CHAMBER_FAN)
@@ -108,7 +108,7 @@ void Power::power_on() {
   if (!powersupply_on) {
     PSU_PIN_ON();
 
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
       delay(PSU_POWERUP_DELAY); // Wait for power to settle
       restore_stepper_drivers();
     #endif
diff --git a/Marlin/src/feature/power_loss_recovery.cpp b/Marlin/src/feature/powerloss.cpp
similarity index 98%
rename from Marlin/src/feature/power_loss_recovery.cpp
rename to Marlin/src/feature/powerloss.cpp
index f331a9f94d68..bb0062d4ec63 100644
--- a/Marlin/src/feature/power_loss_recovery.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(POWER_LOSS_RECOVERY)
 
-#include "power_loss_recovery.h"
+#include "powerloss.h"
 #include "../core/macros.h"
 
 bool PrintJobRecovery::enabled; // Initialized by settings.load()
@@ -100,13 +100,11 @@ void PrintJobRecovery::changed() {
  * If a saved state exists send 'M1000 S' to initiate job recovery.
  */
 void PrintJobRecovery::check() {
-  if (enabled) {
-    if (!card.isMounted()) card.mount();
-    if (card.isMounted()) {
-      load();
-      if (!valid()) return purge();
-      queue.inject_P(PSTR("M1000 S"));
-    }
+  //if (!card.isMounted()) card.mount();
+  if (card.isMounted()) {
+    load();
+    if (!valid()) return purge();
+    queue.inject_P(PSTR("M1000 S"));
   }
 }
 
@@ -393,7 +391,7 @@ void PrintJobRecovery::resume() {
 
   // Restore retract and hop state
   #if ENABLED(FWRETRACT)
-    for (uint8_t e = 0; e < EXTRUDERS; e++) {
+    LOOP_L_N(e, EXTRUDERS) {
       if (info.retract[e] != 0.0) {
         fwretract.current_retract[e] = info.retract[e];
         fwretract.retracted[e] = true;
diff --git a/Marlin/src/feature/power_loss_recovery.h b/Marlin/src/feature/powerloss.h
similarity index 97%
rename from Marlin/src/feature/power_loss_recovery.h
rename to Marlin/src/feature/powerloss.h
index 6c4b5d5c3fbc..049656078501 100644
--- a/Marlin/src/feature/power_loss_recovery.h
+++ b/Marlin/src/feature/powerloss.h
@@ -159,11 +159,7 @@ class PrintJobRecovery {
     static inline void cancel() { purge(); card.autostart_index = 0; }
 
     static void load();
-    static void save(const bool force=false
-      #if ENABLED(SAVE_EACH_CMD_MODE)
-        || true
-      #endif
-    );
+    static void save(const bool force=ENABLED(SAVE_EACH_CMD_MODE));
 
   #if PIN_EXISTS(POWER_LOSS)
     static inline void outage() {
diff --git a/Marlin/src/feature/probe_temp_compensation.cpp b/Marlin/src/feature/probe_temp_comp.cpp
similarity index 97%
rename from Marlin/src/feature/probe_temp_compensation.cpp
rename to Marlin/src/feature/probe_temp_comp.cpp
index edb70ff268ad..6b787f420a33 100644
--- a/Marlin/src/feature/probe_temp_compensation.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -24,7 +24,7 @@
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
 
-#include "probe_temp_compensation.h"
+#include "probe_temp_comp.h"
 #include <math.h>
 
 ProbeTempComp temp_comp;
@@ -54,7 +54,7 @@ uint8_t ProbeTempComp::calib_idx; // = 0
 float ProbeTempComp::init_measurement; // = 0.0
 
 void ProbeTempComp::clear_offsets(const TempSensorID tsi) {
-  for (uint8_t i = 0; i < cali_info[tsi].measurements; ++i)
+  LOOP_L_N(i, cali_info[tsi].measurements)
     sensor_z_offsets[tsi][i] = 0;
   calib_idx = 0;
 }
@@ -66,7 +66,7 @@ bool ProbeTempComp::set_offset(const TempSensorID tsi, const uint8_t idx, const
 }
 
 void ProbeTempComp::print_offsets() {
-  for (uint8_t s = 0; s < TSI_COUNT; s++) {
+  LOOP_L_N(s, TSI_COUNT) {
     float temp = cali_info[s].start_temp;
     for (int16_t i = -1; i < cali_info[s].measurements; ++i) {
       serialprintPGM(s == TSI_BED ? PSTR("Bed") :
@@ -198,7 +198,7 @@ bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d
         sum_x2 = sq(start_temp),
         sum_xy = 0, sum_y = 0;
 
-  for (uint8_t i = 0; i < calib_idx; ++i) {
+  LOOP_L_N(i, calib_idx) {
     const float xi = start_temp + (i + 1) * res_temp,
                 yi = static_cast<float>(data[i]);
     sum_x += xi;
diff --git a/Marlin/src/feature/probe_temp_compensation.h b/Marlin/src/feature/probe_temp_comp.h
similarity index 86%
rename from Marlin/src/feature/probe_temp_compensation.h
rename to Marlin/src/feature/probe_temp_comp.h
index c9ab93e4a99a..2ed10eeb990a 100644
--- a/Marlin/src/feature/probe_temp_compensation.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -57,16 +57,16 @@ class ProbeTempComp {
     static const temp_calib_t cali_info[TSI_COUNT];
 
     // Where to park nozzle to wait for probe cooldown
-    static constexpr xyz_pos_t park_point = xyz_pos_t({ PTC_PARK_POS_X, PTC_PARK_POS_Y, PTC_PARK_POS_Z });
+    static constexpr float park_point_x = PTC_PARK_POS_X,
+                           park_point_y = PTC_PARK_POS_Y,
+                           park_point_z = PTC_PARK_POS_Z,
+                           // XY coordinates of nozzle for probing the bed
+                           measure_point_x     = PTC_PROBE_POS_X,   // Coordinates to probe
+                           measure_point_y     = PTC_PROBE_POS_Y;
+                           //measure_point_x     = 12.0f,           // Coordinates to probe on MK52 magnetic heatbed
+                           //measure_point_y     =  7.3f;
 
     static constexpr int  max_bed_temp         = PTC_MAX_BED_TEMP,  // Max temperature to avoid heating errors
-
-                          // XY coordinates of nozzle for probing the bed
-                          measure_point_x      = PTC_PROBE_POS_X,   // X-coordinate to probe
-                          measure_point_y      = PTC_PROBE_POS_Y,   // Y-coordinate to probe
-                          //measure_point_x    = 12.0f,             // X-coordinate to probe on MK52 magnetic heatbed
-                          //measure_point_y    =  7.3f,             // Y-coordinate to probe on MK52 magnetic heatbed
-
                           probe_calib_bed_temp = max_bed_temp,      // Bed temperature while calibrating probe
                           bed_calib_probe_temp = 30;                // Probe temperature while calibrating bed
 
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 3cf81303ddbe..bd4a653e9903 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -69,7 +69,7 @@ void FilamentSensorBase::filament_present(const uint8_t extruder) {
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 void event_filament_runout() {
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 813f44e05e7d..b975551c6e58 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -34,7 +34,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -184,7 +184,7 @@ class FilamentSensorBase {
         #ifdef FILAMENT_RUNOUT_SENSOR_DEBUG
           if (change) {
             SERIAL_ECHOPGM("Motion detected:");
-            for (uint8_t e = 0; e < NUM_RUNOUT_SENSORS; e++)
+            LOOP_L_N(e, NUM_RUNOUT_SENSORS)
               if (TEST(change, e)) SERIAL_CHAR(' ', '0' + e);
             SERIAL_EOL();
           }
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index a2723fd3935b..e5e69eed50b3 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -22,7 +22,7 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "tmc_util.h"
 #include "../MarlinCore.h"
@@ -954,7 +954,7 @@
     static void tmc_get_ic_registers(TMC2208Stepper, const TMC_get_registers_enum) { SERIAL_CHAR('\t'); }
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     template<class TMC>
     static void tmc_get_registers(TMC &st, const TMC_get_registers_enum i) {
       switch (i) {
@@ -1257,4 +1257,4 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
   if (axis_connection) ui.set_status_P(GET_TEXT(MSG_ERROR_TMC));
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 5102a9d5bfa0..ccae8b660ca4 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -24,7 +24,7 @@
 #include "../inc/MarlinConfig.h"
 #include "../lcd/ultralcd.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include <TMCStepper.h>
 #include "../module/planner.h"
@@ -400,4 +400,4 @@ void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z
   void tmc_init_cs_pins();
 #endif
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index f0687b34b318..9dbb1deb4f9d 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -49,37 +49,27 @@ void TWIBus::address(const uint8_t adr) {
 
   addr = adr;
 
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("address"), adr);
-  #endif
+  debug(PSTR("address"), adr);
 }
 
 void TWIBus::addbyte(const char c) {
   if (buffer_s >= COUNT(buffer)) return;
   buffer[buffer_s++] = c;
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("addbyte"), c);
-  #endif
+  debug(PSTR("addbyte"), c);
 }
 
 void TWIBus::addbytes(char src[], uint8_t bytes) {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("addbytes"), bytes);
-  #endif
+  debug(PSTR("addbytes"), bytes);
   while (bytes--) addbyte(*src++);
 }
 
 void TWIBus::addstring(char str[]) {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("addstring"), str);
-  #endif
+  debug(PSTR("addstring"), str);
   while (char c = *str++) addbyte(c);
 }
 
 void TWIBus::send() {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("send"), addr);
-  #endif
+  debug(PSTR("send"), addr);
 
   Wire.beginTransmission(I2C_ADDRESS(addr));
   Wire.write(buffer, buffer_s);
@@ -89,37 +79,33 @@ void TWIBus::send() {
 }
 
 // static
-void TWIBus::echoprefix(uint8_t bytes, const char prefix[], uint8_t adr) {
+void TWIBus::echoprefix(uint8_t bytes, const char pref[], uint8_t adr) {
   SERIAL_ECHO_START();
-  serialprintPGM(prefix);
+  serialprintPGM(pref);
   SERIAL_ECHOPAIR(": from:", adr, " bytes:", bytes, " data:");
 }
 
 // static
-void TWIBus::echodata(uint8_t bytes, const char prefix[], uint8_t adr) {
-  echoprefix(bytes, prefix, adr);
+void TWIBus::echodata(uint8_t bytes, const char pref[], uint8_t adr) {
+  echoprefix(bytes, pref, adr);
   while (bytes-- && Wire.available()) SERIAL_CHAR(Wire.read());
   SERIAL_EOL();
 }
 
-void TWIBus::echobuffer(const char prefix[], uint8_t adr) {
-  echoprefix(buffer_s, prefix, adr);
-  for (uint8_t i = 0; i < buffer_s; i++) SERIAL_CHAR(buffer[i]);
+void TWIBus::echobuffer(const char pref[], uint8_t adr) {
+  echoprefix(buffer_s, pref, adr);
+  LOOP_L_N(i, buffer_s) SERIAL_CHAR(buffer[i]);
   SERIAL_EOL();
 }
 
 bool TWIBus::request(const uint8_t bytes) {
   if (!addr) return false;
 
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("request"), bytes);
-  #endif
+  debug(PSTR("request"), bytes);
 
   // requestFrom() is a blocking function
   if (Wire.requestFrom(addr, bytes) == 0) {
-    #if ENABLED(DEBUG_TWIBUS)
-      debug("request fail", addr);
-    #endif
+    debug("request fail", addr);
     return false;
   }
 
@@ -127,9 +113,7 @@ bool TWIBus::request(const uint8_t bytes) {
 }
 
 void TWIBus::relay(const uint8_t bytes) {
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("relay"), bytes);
-  #endif
+  debug(PSTR("relay"), bytes);
 
   if (request(bytes))
     echodata(bytes, PSTR("i2c-reply"), addr);
@@ -141,9 +125,7 @@ uint8_t TWIBus::capture(char *dst, const uint8_t bytes) {
   while (count < bytes && Wire.available())
     dst[count++] = Wire.read();
 
-  #if ENABLED(DEBUG_TWIBUS)
-    debug(PSTR("capture"), count);
-  #endif
+  debug(PSTR("capture"), count);
 
   return count;
 }
@@ -156,16 +138,12 @@ void TWIBus::flush() {
 #if I2C_SLAVE_ADDRESS > 0
 
   void TWIBus::receive(uint8_t bytes) {
-    #if ENABLED(DEBUG_TWIBUS)
-      debug(PSTR("receive"), bytes);
-    #endif
+    debug(PSTR("receive"), bytes);
     echodata(bytes, PSTR("i2c-receive"), 0);
   }
 
   void TWIBus::reply(char str[]/*=nullptr*/) {
-    #if ENABLED(DEBUG_TWIBUS)
-      debug(PSTR("reply"), str);
-    #endif
+    debug(PSTR("reply"), str);
 
     if (str) {
       reset();
diff --git a/Marlin/src/feature/twibus.h b/Marlin/src/feature/twibus.h
index faf9eb38cf18..2c1b20da5129 100644
--- a/Marlin/src/feature/twibus.h
+++ b/Marlin/src/feature/twibus.h
@@ -223,7 +223,6 @@ class TWIBus {
     #endif
 
     #if ENABLED(DEBUG_TWIBUS)
-
       /**
        * @brief Prints a debug message
        * @details Prints a simple debug message "TWIBus::function: value"
@@ -233,6 +232,10 @@ class TWIBus {
       static void debug(const char func[], char c);
       static void debug(const char func[], char adr[]);
       static inline void debug(const char func[], uint8_t v) { debug(func, (uint32_t)v); }
-
+    #else
+      static inline void debug(const char[], uint32_t) {}
+      static inline void debug(const char[], char) {}
+      static inline void debug(const char[], char[]) {}
+      static inline void debug(const char[], uint8_t) {}
     #endif
 };
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index b8ec262693f6..28fdf581ffd0 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -157,7 +157,7 @@ float g26_extrusion_multiplier,
       g26_layer_height,
       g26_prime_length;
 
-xy_pos_t g26_pos; // = { 0, 0 }
+xy_pos_t g26_xy_pos; // = { 0, 0 }
 
 int16_t g26_bed_temp,
         g26_hotend_temp;
@@ -187,29 +187,27 @@ mesh_index_pair find_closest_circle_to_print(const xy_pos_t &pos) {
 
   out_point.pos = -1;
 
-  for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-    for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
-      if (!circle_flags.marked(i, j)) {
-        // We found a circle that needs to be printed
-        const xy_pos_t m = { _GET_MESH_X(i), _GET_MESH_Y(j) };
+  GRID_LOOP(i, j) {
+    if (!circle_flags.marked(i, j)) {
+      // We found a circle that needs to be printed
+      const xy_pos_t m = { _GET_MESH_X(i), _GET_MESH_Y(j) };
 
-        // Get the distance to this intersection
-        float f = (pos - m).magnitude();
+      // Get the distance to this intersection
+      float f = (pos - m).magnitude();
 
-        // It is possible that we are being called with the values
-        // to let us find the closest circle to the start position.
-        // But if this is not the case, add a small weighting to the
-        // distance calculation to help it choose a better place to continue.
-        f += (g26_pos - m).magnitude() / 15.0f;
+      // It is possible that we are being called with the values
+      // to let us find the closest circle to the start position.
+      // But if this is not the case, add a small weighting to the
+      // distance calculation to help it choose a better place to continue.
+      f += (g26_xy_pos - m).magnitude() / 15.0f;
 
-        // Add the specified amount of Random Noise to our search
-        if (random_deviation > 1.0) f += random(0.0, random_deviation);
+      // Add the specified amount of Random Noise to our search
+      if (random_deviation > 1.0) f += random(0.0, random_deviation);
 
-        if (f < closest) {
-          closest = f;          // Found a closer un-printed location
-          out_point.pos.set(i, j);  // Save its data
-          out_point.distance = closest;
-        }
+      if (f < closest) {
+        closest = f;          // Found a closer un-printed location
+        out_point.pos.set(i, j);  // Save its data
+        out_point.distance = closest;
       }
     }
   }
@@ -308,51 +306,49 @@ inline bool look_for_lines_to_connect() {
   xyz_pos_t s, e;
   s.z = e.z = g26_layer_height;
 
-  for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
-    for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
+  GRID_LOOP(i, j) {
 
-      #if HAS_LCD_MENU
-        if (user_canceled()) return true;
-      #endif
+    #if HAS_LCD_MENU
+      if (user_canceled()) return true;
+    #endif
 
-      if (i < GRID_MAX_POINTS_X) {  // Can't connect to anything farther to the right than GRID_MAX_POINTS_X.
+    if (i < (GRID_MAX_POINTS_X)) {  // Can't connect to anything farther to the right than GRID_MAX_POINTS_X.
                                     // Already a half circle at the edge of the bed.
 
-        if (circle_flags.marked(i, j) && circle_flags.marked(i + 1, j)) {   // Test whether a leftward line can be done
-          if (!horizontal_mesh_line_flags.marked(i, j)) {
-            // Two circles need a horizontal line to connect them
-            s.x = _GET_MESH_X(  i  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
-            e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
+      if (circle_flags.marked(i, j) && circle_flags.marked(i + 1, j)) {   // Test whether a leftward line can be done
+        if (!horizontal_mesh_line_flags.marked(i, j)) {
+          // Two circles need a horizontal line to connect them
+          s.x = _GET_MESH_X(  i  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // right edge
+          e.x = _GET_MESH_X(i + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // left edge
 
-            LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
-            s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
-            LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
+          LIMIT(s.x, X_MIN_POS + 1, X_MAX_POS - 1);
+          s.y = e.y = constrain(_GET_MESH_Y(j), Y_MIN_POS + 1, Y_MAX_POS - 1);
+          LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
 
-            if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
-              print_line_from_here_to_there(s, e);
+          if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+            print_line_from_here_to_there(s, e);
 
-            horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
-          }
+          horizontal_mesh_line_flags.mark(i, j); // Mark done, even if skipped
         }
+      }
 
-        if (j < GRID_MAX_POINTS_Y) {  // Can't connect to anything further back than GRID_MAX_POINTS_Y.
+      if (j < (GRID_MAX_POINTS_Y)) {  // Can't connect to anything further back than GRID_MAX_POINTS_Y.
                                       // Already a half circle at the edge of the bed.
 
-          if (circle_flags.marked(i, j) && circle_flags.marked(i, j + 1)) {   // Test whether a downward line can be done
-            if (!vertical_mesh_line_flags.marked(i, j)) {
-              // Two circles that need a vertical line to connect them
-              s.y = _GET_MESH_Y(  j  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
-              e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
+        if (circle_flags.marked(i, j) && circle_flags.marked(i, j + 1)) {   // Test whether a downward line can be done
+          if (!vertical_mesh_line_flags.marked(i, j)) {
+            // Two circles that need a vertical line to connect them
+            s.y = _GET_MESH_Y(  j  ) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // top edge
+            e.y = _GET_MESH_Y(j + 1) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)); // bottom edge
 
-              s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
-              LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
-              LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
+            s.x = e.x = constrain(_GET_MESH_X(i), X_MIN_POS + 1, X_MAX_POS - 1);
+            LIMIT(s.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
+            LIMIT(e.y, Y_MIN_POS + 1, Y_MAX_POS - 1);
 
-              if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
-                print_line_from_here_to_there(s, e);
+            if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+              print_line_from_here_to_there(s, e);
 
-              vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
-            }
+            vertical_mesh_line_flags.mark(i, j); // Mark done, even if skipped
           }
         }
       }
@@ -628,9 +624,9 @@ void GcodeSuite::G26() {
     return;
   }
 
-  g26_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
-              parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
-  if (!position_is_reachable(g26_pos.x, g26_pos.y)) {
+  g26_xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
+                 parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
+  if (!position_is_reachable(g26_xy_pos)) {
     SERIAL_ECHOLNPGM("?Specified X,Y coordinate out of bounds.");
     return;
   }
@@ -640,10 +636,8 @@ void GcodeSuite::G26() {
    */
   set_bed_leveling_enabled(!parser.seen('D'));
 
-  if (current_position.z < Z_CLEARANCE_BETWEEN_PROBES) {
+  if (current_position.z < Z_CLEARANCE_BETWEEN_PROBES)
     do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
-    current_position = destination;
-  }
 
   #if DISABLED(NO_VOLUMETRICS)
     bool volumetric_was_enabled = parser.volumetric_enabled;
@@ -697,7 +691,7 @@ void GcodeSuite::G26() {
       #error "A_CNT must be a positive value. Please change A_INT."
     #endif
     float trig_table[A_CNT];
-    for (uint8_t i = 0; i < A_CNT; i++)
+    LOOP_L_N(i, A_CNT)
       trig_table[i] = INTERSECTION_CIRCLE_RADIUS * cos(RADIANS(i * A_INT));
 
   #endif // !ARC_SUPPORT
@@ -705,7 +699,7 @@ void GcodeSuite::G26() {
   mesh_index_pair location;
   do {
     // Find the nearest confluence
-    location = find_closest_circle_to_print(g26_continue_with_closest ? xy_pos_t(current_position) : g26_pos);
+    location = find_closest_circle_to_print(g26_continue_with_closest ? xy_pos_t(current_position) : g26_xy_pos);
 
     if (location.valid()) {
       const xy_pos_t circle = _GET_MESH_POS(location.pos);
@@ -836,12 +830,9 @@ void GcodeSuite::G26() {
 
   retract_filament(destination);
   destination.z = Z_CLEARANCE_BETWEEN_PROBES;
+  move_to(destination, 0);                                    // Raise the nozzle
 
-  move_to(destination, 0); // Raise the nozzle
-
-  destination.set(g26_pos.x, g26_pos.y);                      // Move back to the starting position
-  //destination.z = Z_CLEARANCE_BETWEEN_PROBES;               // Keep the nozzle where it is
-
+  destination = g26_xy_pos;                                   // Move back to the starting XY position
   move_to(destination, 0);                                    // Move back to the starting position
 
   #if DISABLED(NO_VOLUMETRICS)
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index b84c60a6ae87..d042ace8da1f 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 //#define M420_C_USE_MEAN
@@ -71,13 +71,12 @@ void GcodeSuite::M420() {
         bilinear_grid_spacing.set((x_max - x_min) / (GRID_MAX_POINTS_X - 1),
                                   (y_max - y_min) / (GRID_MAX_POINTS_Y - 1));
       #endif
-      for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
-        for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
-          Z_VALUES(x, y) = 0.001 * random(-200, 200);
-          #if ENABLED(EXTENSIBLE_UI)
-            ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y));
-          #endif
-        }
+      GRID_LOOP(x, y) {
+        Z_VALUES(x, y) = 0.001 * random(-200, 200);
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y));
+        #endif
+      }
       SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
       SERIAL_ECHOPAIR(" (", x_min);
       SERIAL_CHAR(','); SERIAL_ECHO(y_min);
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 5173505164fb..de6954598321 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -37,7 +37,7 @@
 #include "../../queue.h"
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
-  #include "../../../feature/probe_temp_compensation.h"
+  #include "../../../feature/probe_temp_comp.h"
   #include "../../../module/temperature.h"
 #endif
 
@@ -57,7 +57,7 @@
 #include "../../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 #if HOTENDS > 1
@@ -417,17 +417,7 @@ G29_TYPE GcodeSuite::G29() {
         );
       }
 
-      if (
-        #if IS_SCARA || ENABLED(DELTA)
-             !position_is_reachable_by_probe(probe_position_lf.x, 0)
-          || !position_is_reachable_by_probe(probe_position_rb.x, 0)
-          || !position_is_reachable_by_probe(0, probe_position_lf.y)
-          || !position_is_reachable_by_probe(0, probe_position_rb.y)
-        #else
-             !position_is_reachable_by_probe(probe_position_lf)
-          || !position_is_reachable_by_probe(probe_position_rb)
-        #endif
-      ) {
+      if (!probe.good_bounds(probe_position_lf, probe_position_rb)) {
         SERIAL_ECHOLNPGM("? (L,R,F,B) out of bounds.");
         G29_RETURN(false);
       }
@@ -704,7 +694,7 @@ G29_TYPE GcodeSuite::G29() {
 
           #if IS_KINEMATIC
             // Avoid probing outside the round or hexagonal area
-            if (!position_is_reachable_by_probe(probePos)) continue;
+            if (!probe.can_reach(probePos)) continue;
           #endif
 
           if (verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", int(pt_index), "/", int(GRID_MAX_POINTS), ".");
@@ -756,7 +746,7 @@ G29_TYPE GcodeSuite::G29() {
 
       // Probe at 3 arbitrary points
 
-      for (uint8_t i = 0; i < 3; ++i) {
+      LOOP_L_N(i, 3) {
         if (verbose_level) SERIAL_ECHOLNPAIR("Probing point ", int(i), "/3.");
         #if HAS_DISPLAY
           ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i));
@@ -871,7 +861,7 @@ G29_TYPE GcodeSuite::G29() {
         auto print_topo_map = [&](PGM_P const title, const bool get_min) {
           serialprintPGM(title);
           for (int8_t yy = abl_grid_points.y - 1; yy >= 0; yy--) {
-            for (uint8_t xx = 0; xx < abl_grid_points.x; xx++) {
+            LOOP_L_N(xx, abl_grid_points.x) {
               const int ind = indexIntoAB[xx][yy];
               xyz_float_t tmp = { eqnAMatrix[ind + 0 * abl_points],
                                   eqnAMatrix[ind + 1 * abl_points], 0 };
@@ -944,7 +934,12 @@ G29_TYPE GcodeSuite::G29() {
 
         // Unapply the offset because it is going to be immediately applied
         // and cause compensation movement in Z
-        current_position.z -= bilinear_z_offset(current_position);
+        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+          const float fade_scaling_factor = planner.fade_scaling_factor_for_z(current_position.z);
+        #else
+          constexpr float fade_scaling_factor = 1.0f;
+        #endif
+        current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position);
 
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(" corrected Z:", current_position.z);
       }
diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index 85ff70757514..3cd2673d66c2 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -32,7 +32,7 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 0a9a7f439bfc..6c8fafe23ff2 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -39,7 +39,7 @@
 #include "../../../module/stepper.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 // Save 130 bytes with non-duplication of PSTR
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index ca4af1e0c026..bd65c21ad3c8 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -32,7 +32,7 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 6841636cf0a7..fafce9a89692 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -62,13 +62,7 @@
     current_position.set(0.0, 0.0);
     sync_plan_position();
 
-    const int x_axis_home_dir =
-      #if ENABLED(DUAL_X_CARRIAGE)
-        x_home_dir(active_extruder)
-      #else
-        home_dir(X_AXIS)
-      #endif
-    ;
+    const int x_axis_home_dir = x_home_dir(active_extruder);
 
     const float mlx = max_length(X_AXIS),
                 mly = max_length(Y_AXIS),
@@ -106,8 +100,6 @@
       #if AXIS_HAS_STALLGUARD(Y2)
         tmc_disable_stallguard(stepperY2, stealth_states.y2);
       #endif
-      do_blocking_move_to_xy(-0.5 * x_axis_home_dir, -0.5 * home_dir(Y_AXIS), fr_mm_s / 2);
-      safe_delay(100);
     #endif
   }
 
@@ -210,7 +202,7 @@
  *  Z   Home to the Z endstop
  *
  */
-void GcodeSuite::G28(const bool always_home_all) {
+void GcodeSuite::G28() {
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOLNPGM(">>> G28");
     log_machine_info();
@@ -263,28 +255,28 @@ void GcodeSuite::G28(const bool always_home_all) {
   #define HAS_HOMING_CURRENT (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2))
 
   #if HAS_HOMING_CURRENT
-    auto debug_current = [](const char * const s, const int16_t a, const int16_t b){
-      DEBUG_ECHO(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
+    auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b){
+      serialprintPGM(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
     };
     #if HAS_CURRENT_HOME(X)
       const int16_t tmc_save_current_X = stepperX.getMilliamps();
       stepperX.rms_current(X_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("X", tmc_save_current_X, X_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("X"), tmc_save_current_X, X_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(X2)
       const int16_t tmc_save_current_X2 = stepperX2.getMilliamps();
       stepperX2.rms_current(X2_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("X2", tmc_save_current_X2, X2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("X2"), tmc_save_current_X2, X2_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(Y)
       const int16_t tmc_save_current_Y = stepperY.getMilliamps();
       stepperY.rms_current(Y_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("Y", tmc_save_current_Y, Y_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("Y"), tmc_save_current_Y, Y_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(Y2)
       const int16_t tmc_save_current_Y2 = stepperY2.getMilliamps();
       stepperY2.rms_current(Y2_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current("Y2", tmc_save_current_Y2, Y2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
     #endif
   #endif
 
@@ -310,8 +302,9 @@ void GcodeSuite::G28(const bool always_home_all) {
 
   #if ENABLED(DELTA)
 
+    constexpr bool doZ = true; // for NANODLP_Z_SYNC if your DLP is on a DELTA
+
     home_delta();
-    UNUSED(always_home_all);
 
     #if ENABLED(IMPROVE_HOMING_RELIABILITY)
       end_slow_homing(slow_homing);
@@ -320,7 +313,7 @@ void GcodeSuite::G28(const bool always_home_all) {
   #else // NOT DELTA
 
     const bool homeX = parser.seen('X'), homeY = parser.seen('Y'), homeZ = parser.seen('Z'),
-               home_all = always_home_all || (homeX == homeY && homeX == homeZ),
+               home_all = homeX == homeY && homeX == homeZ, // All or None
                doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ;
 
     destination = current_position;
@@ -331,12 +324,10 @@ void GcodeSuite::G28(const bool always_home_all) {
 
     #endif
 
-    const float z_homing_height = (
-      #if ENABLED(UNKNOWN_Z_NO_RAISE)
-        !TEST(axis_known_position, Z_AXIS) ? 0 :
-      #endif
-          (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT)
-    );
+    const float z_homing_height =
+      (DISABLED(UNKNOWN_Z_NO_RAISE) || TEST(axis_known_position, Z_AXIS))
+        ? (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT)
+        : 0;
 
     if (z_homing_height && (doX || doY)) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
@@ -354,22 +345,11 @@ void GcodeSuite::G28(const bool always_home_all) {
     #endif
 
     // Home Y (before X)
-    #if ENABLED(HOME_Y_BEFORE_X)
-
-      if (doY
-        #if ENABLED(CODEPENDENT_XY_HOMING)
-          || doX
-        #endif
-      ) homeaxis(Y_AXIS);
-
-    #endif
+    if (ENABLED(HOME_Y_BEFORE_X) && (doY || (ENABLED(CODEPENDENT_XY_HOMING) && doX)))
+      homeaxis(Y_AXIS);
 
     // Home X
-    if (doX
-      #if ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X)
-        || doY
-      #endif
-    ) {
+    if (doX || (doY && ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X))) {
 
       #if ENABLED(DUAL_X_CARRIAGE)
 
@@ -397,9 +377,8 @@ void GcodeSuite::G28(const bool always_home_all) {
     }
 
     // Home Y (after X)
-    #if DISABLED(HOME_Y_BEFORE_X)
-      if (doY) homeaxis(Y_AXIS);
-    #endif
+    if (DISABLED(HOME_Y_BEFORE_X) && doY)
+      homeaxis(Y_AXIS);
 
     #if ENABLED(IMPROVE_HOMING_RELIABILITY)
       end_slow_homing(slow_homing);
@@ -488,7 +467,7 @@ void GcodeSuite::G28(const bool always_home_all) {
     do_blocking_move_to_z(delta_clip_start_height);
   #endif
 
-  #if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G28)
+  #if ENABLED(RESTORE_LEVELING_AFTER_G28)
     set_bed_leveling_enabled(leveling_was_active);
   #endif
 
@@ -496,12 +475,7 @@ void GcodeSuite::G28(const bool always_home_all) {
 
   // Restore the active tool after homing
   #if HOTENDS > 1 && (DISABLED(DELTA) || ENABLED(DELTA_HOME_TO_SAFE_ZONE))
-    #if EITHER(PARKING_EXTRUDER, DUAL_X_CARRIAGE)
-      #define NO_FETCH false // fetch the previous toolhead
-    #else
-      #define NO_FETCH true
-    #endif
-    tool_change(old_tool_index, NO_FETCH);
+    tool_change(old_tool_index, NONE(PARKING_EXTRUDER, DUAL_X_CARRIAGE));   // Do move if one of these
   #endif
 
   #if HAS_HOMING_CURRENT
@@ -524,15 +498,8 @@ void GcodeSuite::G28(const bool always_home_all) {
 
   report_current_position();
 
-  #if ENABLED(NANODLP_Z_SYNC)
-    #if ENABLED(NANODLP_ALL_AXIS)
-      #define _HOME_SYNC true       // For any axis, output sync text.
-    #else
-      #define _HOME_SYNC doZ        // Only for Z-axis
-    #endif
-    if (_HOME_SYNC)
-      SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
-  #endif
+  if (ENABLED(NANODLP_Z_SYNC) && (doZ || ENABLED(NANODLP_ALL_AXIS)))
+    SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
 
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G28");
 
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index e7bc63828f1f..d1b828d079b8 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -64,6 +64,7 @@ inline void set_all_z_lock(const bool lock) {
  *   I<iterations>
  *   T<accuracy>
  *   A<amplification>
+ *   R<recalculate> points based on current probe offsets
  */
 void GcodeSuite::G34() {
   if (DEBUGGING(LEVELING)) {
@@ -73,8 +74,10 @@ void GcodeSuite::G34() {
 
   do { // break out on error
 
-    #if NUM_Z_STEPPER_DRIVERS >= 4
-      SERIAL_ECHOLNPGM("Alignment not supported for over 3 steppers");
+    #if NUM_Z_STEPPER_DRIVERS == 4
+      SERIAL_ECHOLNPGM("Alignment for 4 steppers is Experimental!");
+    #elif NUM_Z_STEPPER_DRIVERS > 4
+      SERIAL_ECHOLNPGM("Alignment not supported for over 4 steppers");
       break;
     #endif
 
@@ -101,6 +104,8 @@ void GcodeSuite::G34() {
         }
       #endif
 
+    if (parser.seen('R')) z_stepper_align.reset_to_default();
+
     const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE;
 
     // Wait for planner moves to finish!
@@ -139,13 +144,18 @@ void GcodeSuite::G34() {
 
     // Compute a worst-case clearance height to probe from. After the first
     // iteration this will be re-calculated based on the actual bed position
-    float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * (
+    auto magnitude2 = [&](const uint8_t i, const uint8_t j) {
+      const xy_pos_t diff = z_stepper_align.xy[i] - z_stepper_align.xy[j];
+      return HYPOT2(diff.x, diff.y);
+    };
+    float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * SQRT(
       #if NUM_Z_STEPPER_DRIVERS == 3
-         SQRT(_MAX(HYPOT2(z_stepper_align.xy[0].x - z_stepper_align.xy[0].y, z_stepper_align.xy[1].x - z_stepper_align.xy[1].y),
-                   HYPOT2(z_stepper_align.xy[1].x - z_stepper_align.xy[1].y, z_stepper_align.xy[2].x - z_stepper_align.xy[2].y),
-                   HYPOT2(z_stepper_align.xy[2].x - z_stepper_align.xy[2].y, z_stepper_align.xy[0].x - z_stepper_align.xy[0].y)))
+         _MAX(magnitude2(0, 1), magnitude2(1, 2), magnitude2(2, 0))
+      #elif NUM_Z_STEPPER_DRIVERS == 4
+         _MAX(magnitude2(0, 1), magnitude2(1, 2), magnitude2(2, 3),
+              magnitude2(3, 0), magnitude2(0, 2), magnitude2(1, 3))
       #else
-         HYPOT(z_stepper_align.xy[0].x - z_stepper_align.xy[0].y, z_stepper_align.xy[1].x - z_stepper_align.xy[1].y)
+         magnitude2(0, 1)
       #endif
     );
 
@@ -153,42 +163,55 @@ void GcodeSuite::G34() {
     if (!all_axes_known()) home_all_axes();
 
     // Move the Z coordinate realm towards the positive - dirty trick
-    current_position.z -= z_probe * 0.5f;
+    current_position.z += z_probe * 0.5f;
+    sync_plan_position();
+    // Now, the Z origin lies below the build plate. That allows to probe deeper, before run_z_probe throws an error.
+    // This hack is un-done at the end of G34 - either by re-homing, or by using the probed heights of the last iteration.
 
-    float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f),
-          z_measured[NUM_Z_STEPPER_DRIVERS] = { 0 },
+    #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N(NUM_Z_STEPPER_DRIVERS, 10000.0f, 10000.0f, 10000.0f, 10000.0f);
+    #else
+      float last_z_align_level_indicator = 10000.0f;
+    #endif
+    float z_measured[NUM_Z_STEPPER_DRIVERS] = { 0 },
           z_maxdiff = 0.0f,
           amplification = z_auto_align_amplification;
 
+    // These are needed after the for-loop
     uint8_t iteration;
     bool err_break = false;
+    float z_measured_min;
 
     #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
       bool adjustment_reverse = false;
     #endif
 
+    // 'iteration' is declared above and is also used after the for-loop.
+    // *not* the same as LOOP_L_N(iteration, z_auto_align_iterations)
     for (iteration = 0; iteration < z_auto_align_iterations; ++iteration) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
 
       SERIAL_ECHOLNPAIR("\nITERATION: ", int(iteration + 1));
 
       // Initialize minimum value
-      float z_measured_min =  100000.0f,
-            z_measured_max = -100000.0f;
+      z_measured_min =  100000.0f;
+      float z_measured_max = -100000.0f;
 
       // Probe all positions (one per Z-Stepper)
-      for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
+      LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
         // iteration odd/even --> downward / upward stepper sequence
         const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
 
         // Safe clearance even on an incline
-        if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
+        if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
 
         if (DEBUGGING(LEVELING))
           DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
 
         // Probe a Z height for each stepper.
-        const float z_probed_height = probe.probe_at_point(z_stepper_align.xy[iprobe], raise_after, 0, true);
+        // Probing sanity check is disabled, as it would trigger even in normal cases because
+        // current_position.z has been manually altered in the "dirty trick" above.
+        const float z_probed_height = probe.probe_at_point(z_stepper_align.xy[iprobe], raise_after, 0, true, false);
         if (isnan(z_probed_height)) {
           SERIAL_ECHOLNPGM("Probing failed.");
           err_break = true;
@@ -227,15 +250,15 @@ void GcodeSuite::G34() {
         // This allows the actual adjustment logic to be shared by both algorithms.
         linear_fit_data lfd;
         incremental_LSF_reset(&lfd);
-        for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
-          SERIAL_ECHOLNPAIR("PROBEPT_", i + '1', ": ", z_measured[i]);
+        LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+          SERIAL_ECHOLNPAIR("PROBEPT_", int(i), ": ", z_measured[i]);
           incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
         }
         finish_incremental_LSF(&lfd);
 
         z_measured_min = 100000.0f;
-        for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i) {
-          z_measured[i] = -(lfd.A * z_stepper_align.stepper_xy[i].x + lfd.B * z_stepper_align.stepper_xy[i].y);
+        LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+          z_measured[i] = -(lfd.A * z_stepper_align.stepper_xy[i].x + lfd.B * z_stepper_align.stepper_xy[i].y + lfd.D);
           z_measured_min = _MIN(z_measured_min, z_measured[i]);
         }
 
@@ -250,12 +273,37 @@ void GcodeSuite::G34() {
         #endif
       );
 
+      #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+        // Check if the applied corrections go in the correct direction.
+        // Calculate the sum of the absolute deviations from the mean of the probe measurements.
+        // Compare to the last iteration to ensure it's getting better.
+
+        // Calculate mean value as a reference
+        float z_measured_mean = 0.0f;
+        LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS) z_measured_mean += z_measured[zstepper];
+        z_measured_mean /= NUM_Z_STEPPER_DRIVERS;
+
+        // Calculate the sum of the absolute deviations from the mean value
+        float z_align_level_indicator = 0.0f;
+        LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS)
+          z_align_level_indicator += ABS(z_measured[zstepper] - z_measured_mean);
+
+        // If it's getting worse, stop and throw an error
+        if (last_z_align_level_indicator < z_align_level_indicator * 0.7f) {
+          SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
+          err_break = true;
+          break;
+        }
+
+        last_z_align_level_indicator = z_align_level_indicator;
+      #endif
+
       // The following correction actions are to be enabled for select Z-steppers only
       stepper.set_separate_multi_axis(true);
 
       bool success_break = true;
       // Correct the individual stepper offsets
-      for (uint8_t zstepper = 0; zstepper < NUM_Z_STEPPER_DRIVERS; ++zstepper) {
+      LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS) {
         // Calculate current stepper move
         float z_align_move = z_measured[zstepper] - z_measured_min;
         const float z_align_abs = ABS(z_align_move);
@@ -263,21 +311,16 @@ void GcodeSuite::G34() {
         #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
           // Optimize one iteration's correction based on the first measurements
           if (z_align_abs) amplification = (iteration == 1) ? _MIN(last_z_align_move[zstepper] / z_align_abs, 2.0f) : z_auto_align_amplification;
-        #endif
 
-        // Check for less accuracy compared to last move
-        if (last_z_align_move[zstepper] < z_align_abs * 0.7f) {
-          SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
-          #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+          // Check for less accuracy compared to last move
+          if (last_z_align_move[zstepper] < z_align_abs * 0.7f) {
+            SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
             adjustment_reverse = !adjustment_reverse;
-          #else
-            err_break = true;
-            break;
-          #endif
-        }
+          }
 
-        // Remember the alignment for the next iteration
-        last_z_align_move[zstepper] = z_align_abs;
+          // Remember the alignment for the next iteration
+          last_z_align_move[zstepper] = z_align_abs;
+        #endif
 
         // Stop early if all measured points achieve accuracy target
         if (z_align_abs > z_auto_align_accuracy) success_break = false;
@@ -289,9 +332,12 @@ void GcodeSuite::G34() {
         switch (zstepper) {
           case 0: stepper.set_z_lock(false); break;
           case 1: stepper.set_z2_lock(false); break;
-          #if NUM_Z_STEPPER_DRIVERS == 3
+          #if NUM_Z_STEPPER_DRIVERS >= 3
             case 2: stepper.set_z3_lock(false); break;
           #endif
+          #if NUM_Z_STEPPER_DRIVERS == 4
+            case 3: stepper.set_z4_lock(false); break;
+          #endif
         }
 
         #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
@@ -315,36 +361,39 @@ void GcodeSuite::G34() {
 
     } // for (iteration)
 
-    if (err_break) { SERIAL_ECHOLNPGM("G34 aborted."); break; }
+    if (err_break)
+      SERIAL_ECHOLNPGM("G34 aborted.");
+    else {
+      SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " of ", int(z_auto_align_iterations));
+      SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
+    }
 
-    SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " iterations of ", int(z_auto_align_iterations));
-    SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
+    // Stow the probe, as the last call to probe.probe_at_point(...) left
+    // the probe deployed if it was successful.
+    probe.stow();
+
+    #if ENABLED(HOME_AFTER_G34)
+      // After this operation the z position needs correction
+      set_axis_not_trusted(Z_AXIS);
+      // Home Z after the alignment procedure
+      process_subcommands_now_P(PSTR("G28Z"));
+    #else
+      // Use the probed height from the last iteration to determine the Z height.
+      // z_measured_min is used, because all steppers are aligned to z_measured_min.
+      // Ideally, this would be equal to the 'z_probe * 0.5f' which was added earlier.
+      current_position.z -= z_measured_min - (float)Z_CLEARANCE_BETWEEN_PROBES;
+      sync_plan_position();
+    #endif
 
     // Restore the active tool after homing
     #if HOTENDS > 1
-      tool_change(old_tool_index, (
-        #if ENABLED(PARKING_EXTRUDER)
-          false // Fetch the previous toolhead
-        #else
-          true
-        #endif
-      ));
+      tool_change(old_tool_index, DISABLED(PARKING_EXTRUDER)); // Fetch previous tool for parking extruder
     #endif
 
     #if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G34)
       set_bed_leveling_enabled(leveling_was_active);
     #endif
 
-    // After this operation the z position needs correction
-    set_axis_is_not_at_home(Z_AXIS);
-
-    // Stow the probe, as the last call to probe.probe_at_point(...) left
-    // the probe deployed if it was successful.
-    probe.stow();
-
-    // Home Z after the alignment procedure
-    process_subcommands_now_P(PSTR("G28 Z"));
-
   }while(0);
 
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G34");
@@ -363,15 +412,22 @@ void GcodeSuite::G34() {
  * S and W require an X and/or Y parameter
  *   X<pos>   : X position to set (Unchanged if omitted)
  *   Y<pos>   : Y position to set (Unchanged if omitted)
+ *
+ * R : Recalculate points based on current probe offsets
  */
 void GcodeSuite::M422() {
 
+  if (parser.seen('R')) {
+    z_stepper_align.reset_to_default();
+    return;
+  }
+
   if (!parser.seen_any()) {
-    for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i)
-      SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + '1', SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
+    LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
+      SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), int(i + 1), SP_X_STR, z_stepper_align.xy[i].x, SP_Y_STR, z_stepper_align.xy[i].y);
     #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-      for (uint8_t i = 0; i < NUM_Z_STEPPER_DRIVERS; ++i)
-        SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + '1', SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
+      LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS)
+        SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), int(i + 1), SP_X_STR, z_stepper_align.stepper_xy[i].x, SP_Y_STR, z_stepper_align.stepper_xy[i].y);
     #endif
     return;
   }
@@ -432,11 +488,11 @@ void GcodeSuite::M422() {
   };
 
   if (is_probe_point) {
-    if (!position_is_reachable_by_probe(pos.x, Y_CENTER)) {
+    if (!probe.can_reach(pos.x, Y_CENTER)) {
       SERIAL_ECHOLNPGM("?(X) out of bounds.");
       return;
     }
-    if (!position_is_reachable_by_probe(pos)) {
+    if (!probe.can_reach(pos)) {
       SERIAL_ECHOLNPGM("?(Y) out of bounds.");
       return;
     }
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index d2db4ce30869..42c56fe51d82 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -37,6 +37,21 @@
 #include "../../module/endstops.h"
 #include "../../feature/bedlevel/bedlevel.h"
 
+#if !AXIS_CAN_CALIBRATE(X)
+  #undef CALIBRATION_MEASURE_LEFT
+  #undef CALIBRATION_MEASURE_RIGHT
+#endif
+
+#if !AXIS_CAN_CALIBRATE(Y)
+  #undef CALIBRATION_MEASURE_FRONT
+  #undef CALIBRATION_MEASURE_BACK
+#endif
+
+#if !AXIS_CAN_CALIBRATE(Z)
+  #undef CALIBRATION_MEASURE_AT_TOP_EDGES
+#endif
+
+
 /**
  * G425 backs away from the calibration object by various distances
  * depending on the confidence level:
@@ -56,8 +71,12 @@
   #define CALIBRATION_MEASUREMENT_CERTAIN   0.5 // mm
 #endif
 
-#define HAS_X_CENTER BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
-#define HAS_Y_CENTER BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+#if BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
+  #define HAS_X_CENTER 1
+#endif
+#if BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+  #define HAS_Y_CENTER 1
+#endif
 
 enum side_t : uint8_t { TOP, RIGHT, FRONT, LEFT, BACK, NUM_SIDES };
 
@@ -120,7 +139,7 @@ inline void park_above_object(measurements_t &m, const float uncertainty) {
 #if HAS_HOTEND_OFFSET
 
   inline void normalize_hotend_offsets() {
-    for (uint8_t e = 1; e < HOTENDS; e++)
+    LOOP_S_L_N(e, 1, HOTENDS)
       hotend_offset[e] -= hotend_offset[0];
     hotend_offset[0].reset();
   }
@@ -203,42 +222,52 @@ inline float measure(const AxisEnum axis, const int dir, const bool stop_state,
 inline void probe_side(measurements_t &m, const float uncertainty, const side_t side, const bool probe_top_at_edge=false) {
   const xyz_float_t dimensions = CALIBRATION_OBJECT_DIMENSIONS;
   AxisEnum axis;
-  float dir;
+  float dir = 1;
 
   park_above_object(m, uncertainty);
 
   switch (side) {
-    case TOP: {
-      const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
-      m.obj_center.z = measurement - dimensions.z / 2;
-      m.obj_side[TOP] = measurement;
-      return;
-    }
-    case RIGHT: axis = X_AXIS; dir = -1; break;
-    case FRONT: axis = Y_AXIS; dir =  1; break;
-    case LEFT:  axis = X_AXIS; dir =  1; break;
-    case BACK:  axis = Y_AXIS; dir = -1; break;
+    #if AXIS_CAN_CALIBRATE(Z)
+      case TOP: {
+        const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
+        m.obj_center.z = measurement - dimensions.z / 2;
+        m.obj_side[TOP] = measurement;
+        return;
+      }
+    #endif
+    #if AXIS_CAN_CALIBRATE(X)
+      case LEFT:  axis = X_AXIS; break;
+      case RIGHT: axis = X_AXIS; dir = -1; break;
+    #endif
+    #if AXIS_CAN_CALIBRATE(Y)
+      case FRONT: axis = Y_AXIS; break;
+      case BACK:  axis = Y_AXIS; dir = -1; break;
+    #endif
     default: return;
   }
 
   if (probe_top_at_edge) {
-    // Probe top nearest the side we are probing
-    current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]);
-    calibration_move();
-    m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
-    m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2;
+    #if AXIS_CAN_CALIBRATE(Z)
+      // Probe top nearest the side we are probing
+      current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]);
+      calibration_move();
+      m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty);
+      m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2;
+    #endif
   }
 
-  // Move to safe distance to the side of the calibration object
-  current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty);
-  calibration_move();
+  if (AXIS_CAN_CALIBRATE(X) && axis == X_AXIS || AXIS_CAN_CALIBRATE(Y) && axis == Y_AXIS) {
+    // Move to safe distance to the side of the calibration object
+    current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty);
+    calibration_move();
 
-  // Plunge below the side of the calibration object and measure
-  current_position.z = m.obj_side[TOP] - CALIBRATION_NOZZLE_TIP_HEIGHT * 0.7;
-  calibration_move();
-  const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty);
-  m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2);
-  m.obj_side[side] = measurement;
+    // Plunge below the side of the calibration object and measure
+    current_position.z = m.obj_side[TOP] - (CALIBRATION_NOZZLE_TIP_HEIGHT) * 0.7f;
+    calibration_move();
+    const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty);
+    m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2);
+    m.obj_side[side] = measurement;
+  }
 }
 
 /**
@@ -248,7 +277,7 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
  *   uncertainty        in     - How far away from the calibration object to begin probing
  */
 inline void probe_sides(measurements_t &m, const float uncertainty) {
-  #ifdef CALIBRATION_MEASURE_AT_TOP_EDGES
+  #if ENABLED(CALIBRATION_MEASURE_AT_TOP_EDGES)
     constexpr bool probe_top_at_edge = true;
   #else
     // Probing at the exact center only works if the center is flat. Probing on a washer
@@ -257,18 +286,18 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     probe_side(m, uncertainty, TOP);
   #endif
 
-  #ifdef CALIBRATION_MEASURE_RIGHT
+  #if ENABLED(CALIBRATION_MEASURE_RIGHT)
     probe_side(m, uncertainty, RIGHT, probe_top_at_edge);
   #endif
 
-  #ifdef CALIBRATION_MEASURE_FRONT
+  #if ENABLED(CALIBRATION_MEASURE_FRONT)
     probe_side(m, uncertainty, FRONT, probe_top_at_edge);
   #endif
 
-  #ifdef CALIBRATION_MEASURE_LEFT
+  #if ENABLED(CALIBRATION_MEASURE_LEFT)
     probe_side(m, uncertainty, LEFT,  probe_top_at_edge);
   #endif
-  #ifdef CALIBRATION_MEASURE_BACK
+  #if ENABLED(CALIBRATION_MEASURE_BACK)
     probe_side(m, uncertainty, BACK,  probe_top_at_edge);
   #endif
 
@@ -309,7 +338,9 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
 #if ENABLED(CALIBRATION_REPORTING)
   inline void report_measured_faces(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Sides:");
-    SERIAL_ECHOLNPAIR("  Top: ", m.obj_side[TOP]);
+    #if AXIS_CAN_CALIBRATE(Z)
+      SERIAL_ECHOLNPAIR("  Top: ", m.obj_side[TOP]);
+    #endif
     #if ENABLED(CALIBRATION_MEASURE_LEFT)
       SERIAL_ECHOLNPAIR("  Left: ", m.obj_side[LEFT]);
     #endif
@@ -339,19 +370,25 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
 
   inline void report_measured_backlash(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Backlash:");
-    #if ENABLED(CALIBRATION_MEASURE_LEFT)
-      SERIAL_ECHOLNPAIR("  Left: ", m.backlash[LEFT]);
-    #endif
-    #if ENABLED(CALIBRATION_MEASURE_RIGHT)
-      SERIAL_ECHOLNPAIR("  Right: ", m.backlash[RIGHT]);
+    #if AXIS_CAN_CALIBRATE(X)
+      #if ENABLED(CALIBRATION_MEASURE_LEFT)
+        SERIAL_ECHOLNPAIR("  Left: ", m.backlash[LEFT]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_RIGHT)
+        SERIAL_ECHOLNPAIR("  Right: ", m.backlash[RIGHT]);
+      #endif
     #endif
-    #if ENABLED(CALIBRATION_MEASURE_FRONT)
-      SERIAL_ECHOLNPAIR("  Front: ", m.backlash[FRONT]);
+    #if AXIS_CAN_CALIBRATE(Y)
+      #if ENABLED(CALIBRATION_MEASURE_FRONT)
+        SERIAL_ECHOLNPAIR("  Front: ", m.backlash[FRONT]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_BACK)
+        SERIAL_ECHOLNPAIR("  Back: ", m.backlash[BACK]);
+      #endif
     #endif
-    #if ENABLED(CALIBRATION_MEASURE_BACK)
-      SERIAL_ECHOLNPAIR("  Back: ", m.backlash[BACK]);
+    #if AXIS_CAN_CALIBRATE(Z)
+      SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     #endif
-    SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     SERIAL_EOL();
   }
 
@@ -365,7 +402,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #if HAS_Y_CENTER
       SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.pos_error.y);
     #endif
-    SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+    if (AXIS_CAN_CALIBRATE(Z)) SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
     SERIAL_EOL();
   }
 
@@ -389,7 +426,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     // This function requires normalize_hotend_offsets() to be called
     //
     inline void report_hotend_offsets() {
-      for (uint8_t e = 1; e < HOTENDS; e++)
+      LOOP_S_L_N(e, 1, HOTENDS)
         SERIAL_ECHOLNPAIR_P(PSTR("T"), int(e), PSTR(" Hotend Offset X"), hotend_offset[e].x, SP_Y_STR, hotend_offset[e].y, SP_Z_STR, hotend_offset[e].z);
     }
   #endif
@@ -413,6 +450,7 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
     probe_sides(m, uncertainty);
 
     #if ENABLED(BACKLASH_GCODE)
+
       #if HAS_X_CENTER
         backlash.distance_mm.x = (m.backlash[LEFT] + m.backlash[RIGHT]) / 2;
       #elif ENABLED(CALIBRATION_MEASURE_LEFT)
@@ -429,18 +467,18 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
         backlash.distance_mm.y = m.backlash[BACK];
       #endif
 
-      backlash.distance_mm.z = m.backlash[TOP];
+      if (AXIS_CAN_CALIBRATE(Z)) backlash.distance_mm.z = m.backlash[TOP];
     #endif
   }
 
   #if ENABLED(BACKLASH_GCODE)
     // Turn on backlash compensation and move in all
-    // directions to take up any backlash
+    // allowed directions to take up any backlash
     {
       // New scope for TEMPORARY_BACKLASH_CORRECTION
       TEMPORARY_BACKLASH_CORRECTION(all_on);
       TEMPORARY_BACKLASH_SMOOTHING(0.0f);
-      const xyz_float_t move = { 3, 3, 3 };
+      const xyz_float_t move = { AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3 };
       current_position += move; calibration_move();
       current_position -= move; calibration_move();
     }
@@ -478,26 +516,18 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const
 
   // Adjust the hotend offset
   #if HAS_HOTEND_OFFSET
-    #if HAS_X_CENTER
-      hotend_offset[extruder].x += m.pos_error.x;
-    #endif
-    #if HAS_Y_CENTER
-      hotend_offset[extruder].y += m.pos_error.y;
-    #endif
-    hotend_offset[extruder].z += m.pos_error.z;
+    if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) hotend_offset[extruder].x += m.pos_error.x;
+    if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) hotend_offset[extruder].y += m.pos_error.y;
+                             if (AXIS_CAN_CALIBRATE(Z)) hotend_offset[extruder].z += m.pos_error.z;
     normalize_hotend_offsets();
   #endif
 
   // Correct for positional error, so the object
   // is at the known actual spot
   planner.synchronize();
-  #if HAS_X_CENTER
-    update_measurements(m, X_AXIS);
-  #endif
-  #if HAS_Y_CENTER
-    update_measurements(m, Y_AXIS);
-  #endif
-  update_measurements(m, Z_AXIS);
+  if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) update_measurements(m, X_AXIS);
+  if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) update_measurements(m, Y_AXIS);
+                           if (AXIS_CAN_CALIBRATE(Z)) update_measurements(m, Z_AXIS);
 
   sync_plan_position();
 }
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 4340084ec6d4..c878f83a17f2 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -35,7 +35,7 @@
 #include "../../feature/bedlevel/bedlevel.h"
 #include "../../module/temperature.h"
 #include "../../module/probe.h"
-#include "../../feature/probe_temp_compensation.h"
+#include "../../feature/probe_temp_comp.h"
 
 /**
  * G76: calibrate probe and/or bed temperature offsets
@@ -86,142 +86,115 @@ void GcodeSuite::G76() {
     return;
   #endif
 
+  auto report_temps = [](millis_t &ntr, millis_t timeout=0) {
+    idle_no_sleep();
+    const millis_t ms = millis();
+    if (ELAPSED(ms, ntr)) {
+      ntr = ms + 1000;
+      thermalManager.print_heater_states(active_extruder);
+    }
+    return (timeout && ELAPSED(ms, timeout));
+  };
+
+  auto wait_for_temps = [&](const float tb, const float tp, millis_t &ntr, const millis_t timeout=0) {
+    SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
+    while (fabs(thermalManager.degBed() - tb) > 0.1f || thermalManager.degProbe() > tp)
+      if (report_temps(ntr, timeout)) return true;
+    return false;
+  };
+
+  auto g76_probe = [](const xy_pos_t &xypos) {
+    do_blocking_move_to_z(5.0); // Raise nozzle before probing
+    const float measured_z = probe.probe_at_point(xypos, PROBE_PT_NONE, 0, false);  // verbose=0, probe_relative=false
+    if (isnan(measured_z))
+      SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
+    else
+      SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+    return measured_z;
+  };
+
   #if ENABLED(BLTOUCH)
     // Make sure any BLTouch error condition is cleared
     bltouch_command(BLTOUCH_RESET, BLTOUCH_RESET_DELAY);
     set_bltouch_deployed(false);
   #endif
 
-  bool do_bed_cal = parser.boolval('B'),
-       do_probe_cal = parser.boolval('P');
-  if (!do_bed_cal && !do_probe_cal)
-    do_bed_cal = do_probe_cal = true;
+  bool do_bed_cal = parser.boolval('B'), do_probe_cal = parser.boolval('P');
+  if (!do_bed_cal && !do_probe_cal) do_bed_cal = do_probe_cal = true;
 
   // Synchronize with planner
   planner.synchronize();
 
-  // Report temperatures every second and handle heating timeouts
-  millis_t next_temp_report = millis() + 1000;
+  const xyz_pos_t parkpos = { temp_comp.park_point_x, temp_comp.park_point_y, temp_comp.park_point_z };
+  const xy_pos_t ppos = { temp_comp.measure_point_x, temp_comp.measure_point_y };
 
   if (do_bed_cal || do_probe_cal) {
     // Ensure park position is reachable
-    if (!position_is_reachable(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y)
-      || !(WITHIN(ProbeTempComp::park_point.z, Z_MIN_POS - 0.001f, Z_MAX_POS + 0.001f))
-    ) {
-      SERIAL_ECHOLNPGM("!Park position unreachable - aborting.");
-      return;
+    bool reachable = position_is_reachable(parkpos) || WITHIN(parkpos.z, Z_MIN_POS - fslop, Z_MAX_POS + fslop);
+    if (!reachable)
+      SERIAL_ECHOLNPGM("!Park");
+    else {
+      // Ensure probe position is reachable
+      reachable = probe.can_reach(ppos);
+      if (!reachable) SERIAL_ECHOLNPGM("!Probe");
     }
-    // Ensure probe position is reachable
-    destination.set(
-      temp_comp.measure_point_x - probe.offset_xy.x,
-      temp_comp.measure_point_y - probe.offset_xy.y
-    );
-    if (!position_is_reachable_by_probe(destination)) {
-      SERIAL_ECHOLNPGM("!Probe position unreachable - aborting.");
+
+    if (!reachable) {
+      SERIAL_ECHOLNPGM(" position unreachable - aborting.");
       return;
     }
 
-    G28(true);
+    process_subcommands_now_P(PSTR("G28"));
   }
 
+  remember_feedrate_scaling_off();
+
+  // Nozzle position based on probe position
+  const xy_pos_t noz_pos = ppos - probe.offset_xy;
+
   /******************************************
    * Calibrate bed temperature offsets
    ******************************************/
 
+  // Report temperatures every second and handle heating timeouts
+  millis_t next_temp_report = millis() + 1000;
+
   if (do_bed_cal) {
 
     uint16_t target_bed = temp_comp.cali_info_init[TSI_BED].start_temp,
              target_probe = temp_comp.bed_calib_probe_temp;
 
-    SERIAL_ECHOLNPGM("Waiting for printer to cool down.");
-    while (thermalManager.degBed() > target_bed
-      || thermalManager.degProbe() > target_probe
-    ) {
-      idle(
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          true
-        #endif
-      );
-      const millis_t ms = millis();
-      if (ELAPSED(ms, next_temp_report)) {
-        thermalManager.print_heater_states(active_extruder);
-        next_temp_report = ms + 1000;
-      }
-    }
+    SERIAL_ECHOLNPGM("Waiting for cooling.");
+    while (thermalManager.degBed() > target_bed || thermalManager.degProbe() > target_probe)
+      report_temps(next_temp_report);
 
     // Disable leveling so it won't mess with us
     #if HAS_LEVELING
       set_bed_leveling_enabled(false);
     #endif
 
-    bool timeout = false;
-    while (true) {
+    for (;;) {
       thermalManager.setTargetBed(target_bed);
 
-      SERIAL_ECHOLNPAIR("Target Bed: ", target_bed, "; Probe: ", target_probe);
+      SERIAL_ECHOLNPAIR("Target Bed:", target_bed, " Probe:", target_probe);
 
       // Park nozzle
-      do_blocking_move_to(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y, ProbeTempComp::park_point.z);
+      do_blocking_move_to(parkpos);
 
       // Wait for heatbed to reach target temp and probe to cool below target temp
-      SERIAL_ECHOLNPGM("Waiting for bed and probe to reach target temp.");
-      const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
-      while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1 || thermalManager.degProbe() > target_probe) {
-        idle(
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            true
-          #endif
-        );
-        const millis_t ms = millis();
-        if (ELAPSED(ms, next_temp_report)) {
-          thermalManager.print_heater_states(active_extruder);
-          next_temp_report = ms + 1000;
-        }
-        if (ELAPSED(ms, probe_timeout_ms)) {
-          SERIAL_ECHOLNPGM("!Bed heating timeout.");
-          timeout = true;
-          break;
-        }
+      if (wait_for_temps(target_bed, target_probe, next_temp_report, millis() + 900UL * 1000UL)) {
+        SERIAL_ECHOLNPGM("!Bed heating timeout.");
+        break;
       }
 
-      if (timeout) break;
-
-      // Move probe to probing point and wait for probe to reach target temp
-      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y, 0.5);
-      do_blocking_move_to(destination.x, destination.y, destination.z);
+      // Move the nozzle to the probing point and wait for the probe to reach target temp
+      do_blocking_move_to_xy(noz_pos);
       SERIAL_ECHOLNPGM("Waiting for probe heating.");
-      while (thermalManager.degProbe() < target_probe) {
-        idle(
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            true
-          #endif
-        );
-        const millis_t ms = millis();
-        if (ELAPSED(ms, next_temp_report)) {
-          thermalManager.print_heater_states(active_extruder);
-          next_temp_report = ms + 1000;
-        }
-      }
+      while (thermalManager.degProbe() < target_probe)
+        report_temps(next_temp_report);
 
-      // Raise nozzle before probing
-      destination.z = 5.0;
-      do_blocking_move_to_z(destination.z);
-
-      // Do a single probe
-      remember_feedrate_scaling_off();
-      const float measured_z = probe.probe_at_point(
-        destination.x + probe.offset_xy.x,
-        destination.y + probe.offset_xy.y,
-        PROBE_PT_NONE
-      );
-      restore_feedrate_and_scaling();
-
-      if (isnan(measured_z)) {
-        SERIAL_ECHOLNPGM("!Received NAN measurement - aborting.");
-        break;
-      }
-      else
-        SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+      const float measured_z = g76_probe(noz_pos);
+      if (isnan(measured_z)) break;
 
       if (target_bed == temp_comp.cali_info_init[TSI_BED].start_temp)
         temp_comp.prepare_new_calibration(measured_z);
@@ -236,7 +209,7 @@ void GcodeSuite::G76() {
     if (temp_comp.finish_calibration(TSI_BED))
       SERIAL_ECHOLNPGM("Successfully calibrated bed.");
     else
-      SERIAL_ECHOLNPGM("!Failed to calibrated bed - reset calibration values.");
+      SERIAL_ECHOLNPGM("!Failed to calibrate bed. Values reset.");
 
     // Cleanup
     thermalManager.setTargetBed(0);
@@ -252,27 +225,16 @@ void GcodeSuite::G76() {
   if (do_probe_cal) {
 
     // Park nozzle
-    do_blocking_move_to(ProbeTempComp::park_point.x, ProbeTempComp::park_point.y, ProbeTempComp::park_point.z);
+    do_blocking_move_to(parkpos);
 
     // Initialize temperatures
-    uint16_t target_bed = temp_comp.probe_calib_bed_temp,
-             target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
+    const uint16_t target_bed = temp_comp.probe_calib_bed_temp;
     thermalManager.setTargetBed(target_bed);
-    SERIAL_ECHOLNPGM("Waiting for bed and probe temperature.");
-    while (fabs(thermalManager.degBed() - float(target_bed)) > 0.1f
-           || thermalManager.degProbe() > target_probe
-    ) {
-      idle(
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          true
-        #endif
-      );
-      const millis_t ms = millis();
-      if (ELAPSED(ms, next_temp_report)) {
-        thermalManager.print_heater_states(active_extruder);
-        next_temp_report = ms + 1000;
-      }
-    }
+
+    uint16_t target_probe = temp_comp.cali_info_init[TSI_PROBE].start_temp;
+
+    // Wait for heatbed to reach target temp and probe to cool below target temp
+    wait_for_temps(target_bed, target_probe, next_temp_report);
 
     // Disable leveling so it won't mess with us
     #if HAS_LEVELING
@@ -280,57 +242,23 @@ void GcodeSuite::G76() {
     #endif
 
     bool timeout = false;
-    while (true) {
+    for (;;) {
       // Move probe to probing point and wait for it to reach target temperature
-      destination.set(temp_comp.measure_point_x, temp_comp.measure_point_y, 0.5);
-      do_blocking_move_to(destination);
-
-      SERIAL_ECHOLNPAIR(
-        "Bed temp: ", target_bed,
-        "; Probe temp: ", target_probe,
-        "  Waiting for probe heating."
-      );
+      do_blocking_move_to_xy(noz_pos);
 
+      SERIAL_ECHOLNPAIR("Waiting for probe heating. Bed:", target_bed, " Probe:", target_probe);
       const millis_t probe_timeout_ms = millis() + 900UL * 1000UL;
       while (thermalManager.degProbe() < target_probe) {
-        idle(
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            true
-          #endif
-        );
-        const millis_t ms = millis();
-        if (ELAPSED(ms, next_temp_report)) {
-          thermalManager.print_heater_states(active_extruder);
-          next_temp_report = ms + 1000;
-        }
-        if (ELAPSED(ms, probe_timeout_ms)) {
-          SERIAL_ECHOLNPGM("!Probe heating aborted due to timeout.");
+        if (report_temps(next_temp_report, probe_timeout_ms)) {
+          SERIAL_ECHOLNPGM("!Probe heating timed out.");
           timeout = true;
           break;
         }
       }
-
       if (timeout) break;
 
-      // Raise nozzle before probing
-      destination.z = 5.0;
-      do_blocking_move_to_z(destination.z);
-
-      // Do a single probe
-      remember_feedrate_scaling_off();
-      const float measured_z = probe.probe_at_point(
-        destination.x + probe.offset_xy.x,
-        destination.y + probe.offset_xy.y,
-        PROBE_PT_NONE
-      );
-      restore_feedrate_and_scaling();
-
-      if (isnan(measured_z)) {
-        SERIAL_ECHOLNPGM("!Received NAN measurement - aborting.");
-        break;
-      }
-      else
-        SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+      const float measured_z = g76_probe(noz_pos);
+      if (isnan(measured_z)) break;
 
       if (target_probe == temp_comp.cali_info_init[TSI_PROBE].start_temp)
         temp_comp.prepare_new_calibration(measured_z);
@@ -343,9 +271,10 @@ void GcodeSuite::G76() {
 
     SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
     if (temp_comp.finish_calibration(TSI_PROBE))
-      SERIAL_ECHOLNPGM("Successfully calibrated probe.");
+      SERIAL_ECHOPGM("Successfully calibrated");
     else
-      SERIAL_ECHOLNPGM("!Failed to calibrated probe.");
+      SERIAL_ECHOPGM("!Failed to calibrate");
+    SERIAL_ECHOLNPGM(" probe.");
 
     // Cleanup
     thermalManager.setTargetBed(0);
@@ -356,6 +285,8 @@ void GcodeSuite::G76() {
     SERIAL_ECHOLNPGM("Final compensation values:");
     temp_comp.print_offsets();
   } // do_probe_cal
+
+  restore_feedrate_and_scaling();
 }
 
 /**
diff --git a/Marlin/src/gcode/calibrate/M100.cpp b/Marlin/src/gcode/calibrate/M100.cpp
index 274caeec1ddc..6b8a0de528f7 100644
--- a/Marlin/src/gcode/calibrate/M100.cpp
+++ b/Marlin/src/gcode/calibrate/M100.cpp
@@ -158,14 +158,14 @@ inline int32_t count_test_bytes(const char * const start_free_memory) {
     while (start_free_memory < end_free_memory) {
       print_hex_address(start_free_memory);             // Print the address
       SERIAL_CHAR(':');
-      for (uint8_t i = 0; i < 16; i++) {  // and 16 data bytes
+      LOOP_L_N(i, 16) {  // and 16 data bytes
         if (i == 8) SERIAL_CHAR('-');
         print_hex_byte(start_free_memory[i]);
         SERIAL_CHAR(' ');
       }
       serial_delay(25);
       SERIAL_CHAR('|');                   // Point out non test bytes
-      for (uint8_t i = 0; i < 16; i++) {
+      LOOP_L_N(i, 16) {
         char ccc = (char)start_free_memory[i]; // cast to char before automatically casting to char on assignment, in case the compiler is broken
         ccc = (ccc == TEST_BYTE) ? ' ' : '?';
         SERIAL_CHAR(ccc);
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index a54c7cf746fc..980152a4b169 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::M425() {
   bool noArgs = true;
 
   LOOP_XYZ(a) {
-    if (parser.seen(axis_codes[a])) {
+    if (CAN_CALIBRATE(a) && parser.seen(XYZ_CHAR(a))) {
       planner.synchronize();
       backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
       noArgs = false;
@@ -74,8 +74,8 @@ void GcodeSuite::M425() {
     SERIAL_ECHOLNPGM("active:");
     SERIAL_ECHOLNPAIR("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
-    LOOP_XYZ(a) {
-      SERIAL_CHAR(' ', axis_codes[a]);
+    LOOP_XYZ(a) if (CAN_CALIBRATE(a)) {
+      SERIAL_CHAR(' ', XYZ_CHAR(a));
       SERIAL_ECHO(backlash.distance_mm[a]);
       SERIAL_EOL();
     }
@@ -87,8 +87,8 @@ void GcodeSuite::M425() {
     #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
       SERIAL_ECHOPGM("  Average measured backlash (mm):");
       if (backlash.has_any_measurement()) {
-        LOOP_XYZ(a) if (backlash.has_measurement(AxisEnum(a))) {
-          SERIAL_CHAR(' ', axis_codes[a]);
+        LOOP_XYZ(a) if (CAN_CALIBRATE(a) && backlash.has_measurement(AxisEnum(a))) {
+          SERIAL_CHAR(' ', XYZ_CHAR(a));
           SERIAL_ECHO(backlash.get_measurement(AxisEnum(a)));
         }
       }
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 8fba7a646fe9..c1e8b0e9f8f0 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -80,11 +80,11 @@ void GcodeSuite::M48() {
   xy_float_t next_pos = current_position;
 
   const xy_pos_t probe_pos = {
-    parser.linearval('X', next_pos.x + probe.offset_xy.x),
-    parser.linearval('Y', next_pos.y + probe.offset_xy.y)
+    parser.linearval('X', next_pos.x + probe.offset_xy.x),  // If no X use the probe's current X position
+    parser.linearval('Y', next_pos.y + probe.offset_xy.y)   // If no Y, ditto
   };
 
-  if (!position_is_reachable_by_probe(probe_pos)) {
+  if (!probe.can_reach(probe_pos)) {
     SERIAL_ECHOLNPGM("? (X,Y) out of bounds.");
     return;
   }
@@ -126,7 +126,7 @@ void GcodeSuite::M48() {
   if (probing_good) {
     randomSeed(millis());
 
-    for (uint8_t n = 0; n < n_samples; n++) {
+    LOOP_L_N(n, n_samples) {
       #if HAS_SPI_LCD
         // Display M48 progress in the status bar
         ui.status_printf_P(0, PSTR(S_FMT ": %d/%d"), GET_TEXT(MSG_M48_POINT), int(n + 1), int(n_samples));
@@ -149,7 +149,7 @@ void GcodeSuite::M48() {
           SERIAL_ECHOLNPGM("CW");
         }
 
-        for (uint8_t l = 0; l < n_legs - 1; l++) {
+        LOOP_L_N(l, n_legs - 1) {
           float delta_angle;
 
           if (schizoid_flag) {
@@ -179,7 +179,7 @@ void GcodeSuite::M48() {
           #else
             // If we have gone out too far, we can do a simple fix and scale the numbers
             // back in closer to the origin.
-            while (!position_is_reachable_by_probe(next_pos)) {
+            while (!probe.can_reach(next_pos)) {
               next_pos *= 0.8f;
               if (verbose_level > 3)
                 SERIAL_ECHOLNPAIR_P(PSTR("Moving inward: X"), next_pos.x, SP_Y_STR, next_pos.y);
@@ -204,7 +204,7 @@ void GcodeSuite::M48() {
        * Get the current mean for the data points we have so far
        */
       float sum = 0.0;
-      for (uint8_t j = 0; j <= n; j++) sum += sample_set[j];
+      LOOP_LE_N(j, n) sum += sample_set[j];
       mean = sum / (n + 1);
 
       NOMORE(min, sample_set[n]);
@@ -215,7 +215,7 @@ void GcodeSuite::M48() {
        * data points we have so far
        */
       sum = 0.0;
-      for (uint8_t j = 0; j <= n; j++)
+      LOOP_LE_N(j, n)
         sum += sq(sample_set[j] - mean);
 
       sigma = SQRT(sum / (n + 1));
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index 094b32708b4d..721cbcfaa053 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -40,10 +40,10 @@
   void GcodeSuite::M666() {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> M666");
     LOOP_XYZ(i) {
-      if (parser.seen(axis_codes[i])) {
+      if (parser.seen(XYZ_CHAR(i))) {
         const float v = parser.value_linear_units();
         if (v * Z_HOME_DIR <= 0) delta_endstop_adj[i] = v;
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", axis_codes[i], "] = ", delta_endstop_adj[i]);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", XYZ_CHAR(i), "] = ", delta_endstop_adj[i]);
       }
     }
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< M666");
diff --git a/Marlin/src/gcode/config/M220.cpp b/Marlin/src/gcode/config/M220.cpp
index e09a5f7534d6..f24c11e23de0 100644
--- a/Marlin/src/gcode/config/M220.cpp
+++ b/Marlin/src/gcode/config/M220.cpp
@@ -29,6 +29,8 @@
  * Parameters
  *   S<percent> : Set the feed rate percentage factor
  *
+ * Report the current speed percentage factor if no parameter is specified
+ *
  * With PRUSA_MMU2...
  *   B : Flag to back up the current factor
  *   R : Flag to restore the last-saved factor
@@ -43,4 +45,9 @@ void GcodeSuite::M220() {
 
   if (parser.seenval('S')) feedrate_percentage = parser.value_int();
 
+  if (!parser.seen_any()) {
+    SERIAL_ECHOPAIR("FR:", feedrate_percentage);
+    SERIAL_CHAR('%');
+    SERIAL_EOL();
+  }
 }
diff --git a/Marlin/src/gcode/config/M305.cpp b/Marlin/src/gcode/config/M305.cpp
index 47a81cdb6c81..d45e18f1b3a9 100644
--- a/Marlin/src/gcode/config/M305.cpp
+++ b/Marlin/src/gcode/config/M305.cpp
@@ -71,7 +71,7 @@ void GcodeSuite::M305() {
         SERIAL_ECHO_MSG("!Invalid Steinhart-Hart C coeff. (-0.01 < C < +0.01)");
   }                       // If not setting then report parameters
   else if (t_index < 0) { // ...all user thermistors
-    for (uint8_t i = 0; i < USER_THERMISTORS; i++)
+    LOOP_L_N(i, USER_THERMISTORS)
       thermalManager.log_user_thermistor(i);
   }
   else                    // ...one user thermistor
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 0dd0013e05ea..baf5efb137f6 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -43,7 +43,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #ifndef GET_PIN_MAP_PIN_M43
@@ -57,16 +57,21 @@ inline void toggle_pins() {
             end = PARSED_PIN_INDEX('L', NUM_DIGITAL_PINS - 1),
             wait = parser.intval('W', 500);
 
-  for (uint8_t i = start; i <= end; i++) {
+  LOOP_S_LE_N(i, start, end) {
     pin_t pin = GET_PIN_MAP_PIN_M43(i);
     if (!VALID_PIN(pin)) continue;
     if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) {
-      report_pin_state_extended(pin, ignore_protection, true, "Untouched ");
+      report_pin_state_extended(pin, ignore_protection, true, PSTR("Untouched "));
       SERIAL_EOL();
     }
     else {
       watchdog_refresh();
-      report_pin_state_extended(pin, ignore_protection, true, "Pulsing   ");
+      report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing   "));
+      #ifdef __STM32F1__
+        const auto prior_mode = _GET_MODE(i);
+      #else
+        const bool prior_mode = GET_PINMODE(pin);
+      #endif
       #if AVR_AT90USB1286_FAMILY // Teensy IDEs don't know about these pins so must use FASTIO
         if (pin == TEENSY_E2) {
           SET_OUTPUT(TEENSY_E2);
@@ -95,6 +100,11 @@ inline void toggle_pins() {
           watchdog_refresh();
         }
       }
+      #ifdef __STM32F1__
+        _SET_MODE(i, prior_mode);
+      #else
+        pinMode(pin, prior_mode);
+      #endif
     }
     SERIAL_EOL();
   }
@@ -313,7 +323,7 @@ void GcodeSuite::M43() {
       NOLESS(first_pin, 2); // Don't hijack the UART pins
     #endif
     uint8_t pin_state[last_pin - first_pin + 1];
-    for (uint8_t i = first_pin; i <= last_pin; i++) {
+    LOOP_S_LE_N(i, first_pin, last_pin) {
       pin_t pin = GET_PIN_MAP_PIN_M43(i);
       if (!VALID_PIN(pin)) continue;
       if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
@@ -339,7 +349,7 @@ void GcodeSuite::M43() {
     #endif
 
     for (;;) {
-      for (uint8_t i = first_pin; i <= last_pin; i++) {
+      LOOP_S_LE_N(i, first_pin, last_pin) {
         pin_t pin = GET_PIN_MAP_PIN_M43(i);
         if (!VALID_PIN(pin)) continue;
         if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
@@ -365,7 +375,7 @@ void GcodeSuite::M43() {
   }
   else {
     // Report current state of selected pin(s)
-    for (uint8_t i = first_pin; i <= last_pin; i++) {
+    LOOP_S_LE_N(i, first_pin, last_pin) {
       pin_t pin = GET_PIN_MAP_PIN_M43(i);
       if (VALID_PIN(pin)) report_pin_state_extended(pin, ignore_protection, true);
     }
diff --git a/Marlin/src/gcode/config/M672.cpp b/Marlin/src/gcode/config/M672.cpp
index ca4b028dc7da..cc160bde665a 100644
--- a/Marlin/src/gcode/config/M672.cpp
+++ b/Marlin/src/gcode/config/M672.cpp
@@ -62,7 +62,7 @@
 //  b3 b2 b1 b0 ~b0  ... lo bits, NOT last bit
 //
 void M672_send(uint8_t b) {    // bit rate requirement: 1KHz +/- 30%
-  for (uint8_t bits = 0; bits < 14; bits++) {
+  LOOP_L_N(bits, 14) {
     switch (bits) {
       default: { OUT_WRITE(SMART_EFFECTOR_MOD_PIN, !!(b & 0x80)); b <<= 1; break; } // send bit, shift next into place
       case  7:
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 642de9672579..bc86ff4d3256 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -34,7 +34,7 @@ void report_M92(const bool echo=true, const int8_t e=-1) {
   SERIAL_EOL();
 
   #if ENABLED(DISTINCT_E_FACTORS)
-    for (uint8_t i = 0; i < E_STEPPERS; i++) {
+    LOOP_L_N(i, E_STEPPERS) {
       if (e >= 0 && i != e) continue;
       if (echo) SERIAL_ECHO_START(); else SERIAL_CHAR(' ');
       SERIAL_ECHOLNPAIR_P(PSTR(" M92 T"), (int)i,
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index bb1a77836be1..20ed44fb2ebe 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -49,7 +49,7 @@ void GcodeSuite::M111() {
   SERIAL_ECHOPGM(STR_DEBUG_PREFIX);
   if (marlin_debug_flags) {
     uint8_t comma = 0;
-    for (uint8_t i = 0; i < COUNT(debug_strings); i++) {
+    LOOP_L_N(i, COUNT(debug_strings)) {
       if (TEST(marlin_debug_flags, i)) {
         if (comma++) SERIAL_CHAR(',');
         serialprintPGM((char*)pgm_read_ptr(&debug_strings[i]));
diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index ae448a63ec18..54b29a21d361 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -33,7 +33,7 @@
  * Warning: Steps-per-unit remains unchanged.
  */
 void GcodeSuite::M350() {
-  if (parser.seen('S')) for (uint8_t i = 0; i <= 4; i++) stepper.microstep_mode(i, parser.value_byte());
+  if (parser.seen('S')) LOOP_LE_N(i, 4) stepper.microstep_mode(i, parser.value_byte());
   LOOP_XYZE(i) if (parser.seen(axis_codes[i])) stepper.microstep_mode(i, parser.value_byte());
   if (parser.seen('B')) stepper.microstep_mode(4, parser.value_byte());
   stepper.microstep_readings();
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 7106ce55027b..74625b03184a 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -37,16 +37,33 @@
  *
  *  S<byte> Pin status from 0 - 255
  *  I       Flag to ignore Marlin's pin protection
+ *
+ *  M<mode> Pin mode: 0=INPUT  1=OUTPUT  2=INPUT_PULLUP  3=INPUT_PULLDOWN
  */
 void GcodeSuite::M42() {
-  if (!parser.seenval('S')) return;
-  const byte pin_status = parser.value_byte();
-
   const int pin_index = PARSED_PIN_INDEX('P', GET_PIN_MAP_INDEX(LED_PIN));
   if (pin_index < 0) return;
 
   const pin_t pin = GET_PIN_MAP_PIN(pin_index);
 
+  if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
+
+  if (parser.seenval('M')) {
+    switch (parser.value_byte()) {
+      case 0: pinMode(pin, INPUT); break;
+      case 1: pinMode(pin, OUTPUT); break;
+      case 2: pinMode(pin, INPUT_PULLUP); break;
+      #ifdef INPUT_PULLDOWN
+        case 3: pinMode(pin, INPUT_PULLDOWN); break;
+      #endif
+      default: SERIAL_ECHOLNPGM("Invalid Pin Mode");
+    }
+    return;
+  }
+
+  if (!parser.seenval('S')) return;
+  const byte pin_status = parser.value_byte();
+
   #if FAN_COUNT > 0
     switch (pin) {
       #if HAS_FAN0
@@ -76,8 +93,6 @@ void GcodeSuite::M42() {
     }
   #endif
 
-  if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
-
   pinMode(pin, OUTPUT);
   extDigitalWrite(pin, pin_status);
   analogWrite(pin, pin_status);
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 99bab4ddc960..ab5efbbb48bd 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -138,7 +138,7 @@
 
         HOTEND_LOOP() {
           DEBUG_ECHOPAIR_P(SP_T_STR, int(e));
-          LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", int(e), "].", axis_codes[a] | 0x20, "=", hotend_offset[e][a]);
+          LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", int(e), "].", XYZ_CHAR(a) | 0x20, "=", hotend_offset[e][a]);
           DEBUG_EOL();
         }
         DEBUG_EOL();
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index f9c40a20a9ce..e8d9aa2fdf0c 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -44,7 +44,7 @@
   // Could be moved to a feature, but this is all the data
   bool powersupply_on;
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     #include "../../feature/tmc_util.h"
   #endif
 
diff --git a/Marlin/src/gcode/control/M999.cpp b/Marlin/src/gcode/control/M999.cpp
index c498e66cabf0..79cd5e1854e2 100644
--- a/Marlin/src/gcode/control/M999.cpp
+++ b/Marlin/src/gcode/control/M999.cpp
@@ -23,7 +23,7 @@
 #include "../gcode.h"
 
 #include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
-#include "../../MarlinCore.h"   // for Running
+#include "../../MarlinCore.h"   // for marlin_state
 #include "../queue.h"           // for flush_and_request_resend
 
 /**
@@ -37,7 +37,7 @@
  *
  */
 void GcodeSuite::M999() {
-  Running = true;
+  marlin_state = MF_RUNNING;
   ui.reset_alert_level();
 
   if (parser.boolval('S')) return;
diff --git a/Marlin/src/gcode/control/T.cpp b/Marlin/src/gcode/control/T.cpp
index cb2fce6c25e7..e6b3bb5d6817 100644
--- a/Marlin/src/gcode/control/T.cpp
+++ b/Marlin/src/gcode/control/T.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../../feature/prusa_MMU2/mmu2.h"
+  #include "../../feature/mmu2/mmu2.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index fd500261b6ee..b3985401cf1a 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -29,11 +29,10 @@
 #include "../../../module/stepper.h"
 
 #if ENABLED(EXTRA_LIN_ADVANCE_K)
-  float saved_extruder_advance_K[EXTRUDERS];
+  float other_extruder_advance_K[EXTRUDERS];
   uint8_t lin_adv_slot = 0;
 #endif
 
-
 /**
  * M900: Get or Set Linear Advance K-factor
  *  T<tool>     Which tool to address
@@ -43,100 +42,106 @@
  */
 void GcodeSuite::M900() {
 
+  auto echo_value_oor = [](const char ltr, const bool ten=true) {
+    SERIAL_CHAR('?'); SERIAL_CHAR(ltr);
+    SERIAL_ECHOPGM(" value out of range");
+    if (ten) SERIAL_ECHOPGM(" (0-10)");
+    SERIAL_ECHOLNPGM(".");
+  };
+
   #if EXTRUDERS < 2
     constexpr uint8_t tool_index = 0;
   #else
     const uint8_t tool_index = parser.intval('T', active_extruder);
     if (tool_index >= EXTRUDERS) {
-      SERIAL_ECHOLNPGM("?T value out of range.");
+      echo_value_oor('T', false);
       return;
     }
   #endif
 
+  float &kref = planner.extruder_advance_K[tool_index], newK = kref;
+  const float oldK = newK;
+
   #if ENABLED(EXTRA_LIN_ADVANCE_K)
 
-    bool ext_slot = TEST(lin_adv_slot, tool_index);
-
-    if (parser.seenval('S')) {
-      const bool slot = parser.value_bool();
-      if (ext_slot != slot) {
-        ext_slot = slot;
-        SET_BIT_TO(lin_adv_slot, tool_index, slot);
-        planner.synchronize();
-        const float temp = planner.extruder_advance_K[tool_index];
-        planner.extruder_advance_K[tool_index] = saved_extruder_advance_K[tool_index];
-        saved_extruder_advance_K[tool_index] = temp;
-      }
+    float &lref = other_extruder_advance_K[tool_index];
+
+    const bool old_slot = TEST(lin_adv_slot, tool_index), // The tool's current slot (0 or 1)
+               new_slot = parser.boolval('S', old_slot);  // The passed slot (default = current)
+
+    // If a new slot is being selected swap the current and
+    // saved K values. Do here so K/L will apply correctly.
+    if (new_slot != old_slot) {                       // Not the same slot?
+      SET_BIT_TO(lin_adv_slot, tool_index, new_slot); // Update the slot for the tool
+      newK = lref;                                    // Get new K value from backup
+      lref = oldK;                                    // Save K to backup
     }
 
+    // Set the main K value. Apply if the main slot is active.
     if (parser.seenval('K')) {
-      const float newK = parser.value_float();
-      if (WITHIN(newK, 0, 10)) {
-        if (ext_slot)
-          saved_extruder_advance_K[tool_index] = newK;
-        else {
-          planner.synchronize();
-          planner.extruder_advance_K[tool_index] = newK;
-        }
-      }
-      else
-        SERIAL_ECHOLNPGM("?K value out of range (0-10).");
+      const float K = parser.value_float();
+      if (!WITHIN(K, 0, 10)) echo_value_oor('K');
+      else if (new_slot)        lref = K;             // S1 Knn
+      else                      newK = K;             // S0 Knn
     }
 
+    // Set the extra K value. Apply if the extra slot is active.
     if (parser.seenval('L')) {
-      const float newL = parser.value_float();
-      if (WITHIN(newL, 0, 10)) {
-        if (!ext_slot)
-          saved_extruder_advance_K[tool_index] = newL;
-        else {
-          planner.synchronize();
-          planner.extruder_advance_K[tool_index] = newL;
-        }
-      }
+      const float L = parser.value_float();
+      if (!WITHIN(L, 0, 10)) echo_value_oor('L');
+      else if (!new_slot)       lref = L;             // S0 Lnn
+      else                      newK = L;             // S1 Lnn
+    }
+
+  #else
+
+    if (parser.seenval('K')) {
+      const float K = parser.value_float();
+      if (WITHIN(K, 0, 10))
+        newK = K;
       else
-        SERIAL_ECHOLNPGM("?L value out of range (0-10).");
+        echo_value_oor('K');
     }
 
-    if (!parser.seen_any()) {
+  #endif
+
+  if (newK != oldK) {
+    planner.synchronize();
+    kref = newK;
+  }
+
+  if (!parser.seen_any()) {
+
+    #if ENABLED(EXTRA_LIN_ADVANCE_K)
+
       #if EXTRUDERS < 2
-        SERIAL_ECHOLNPAIR("Advance S", ext_slot, " K", planner.extruder_advance_K[0],
-                          "(Slot ", 1 - ext_slot, " K", saved_extruder_advance_K[0], ")");
+        SERIAL_ECHOLNPAIR("Advance S", int(new_slot), " K", kref, "(S", int(!new_slot), " K", lref, ")");
       #else
         LOOP_L_N(i, EXTRUDERS) {
-          const int slot = (int)TEST(lin_adv_slot, i);
-          SERIAL_ECHOLNPAIR("Advance T", int(i), " S", slot, " K", planner.extruder_advance_K[i],
-                            "(Slot ", 1 - slot, " K", saved_extruder_advance_K[i], ")");
+          const bool slot = TEST(lin_adv_slot, i);
+          SERIAL_ECHOLNPAIR("Advance T", int(i), " S", int(slot), " K", planner.extruder_advance_K[i],
+                            "(S", int(!slot), " K", other_extruder_advance_K[i], ")");
           SERIAL_EOL();
         }
       #endif
-    }
 
-  #else
+    #else
 
-    if (parser.seenval('K')) {
-      const float newK = parser.value_float();
-      if (WITHIN(newK, 0, 10)) {
-        planner.synchronize();
-        planner.extruder_advance_K[tool_index] = newK;
-      }
-      else
-        SERIAL_ECHOLNPGM("?K value out of range (0-10).");
-    }
-    else {
       SERIAL_ECHO_START();
       #if EXTRUDERS < 2
         SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
       #else
         SERIAL_ECHOPGM("Advance K");
         LOOP_L_N(i, EXTRUDERS) {
-          SERIAL_CHAR(' '); SERIAL_ECHO(int(i));
-          SERIAL_CHAR('='); SERIAL_ECHO(planner.extruder_advance_K[i]);
+          SERIAL_CHAR(' ', '0' + i, ':');
+          SERIAL_ECHO(planner.extruder_advance_K[i]);
         }
         SERIAL_EOL();
       #endif
-    }
 
-  #endif
+    #endif
+  }
+
 }
 
 #endif // LIN_ADVANCE
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index 804eec205f63..33ef9bf1a186 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -48,14 +48,8 @@
 
   #ifdef PHOTO_RETRACT_MM
     inline void e_move_m240(const float length, const feedRate_t &fr_mm_s) {
-      if (length && thermalManager.hotEnoughToExtrude(active_extruder)) {
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          do_pause_e_move(length, fr_mm_s);
-        #else
-          current_position.e += length / planner.e_factor[active_extruder];
-          line_to_current_position(fr_mm_s);
-        #endif
-      }
+      if (length && thermalManager.hotEnoughToExtrude(active_extruder))
+        unscaled_e_move(length, fr_mm_s);
     }
   #endif
 
@@ -90,7 +84,7 @@
 
     inline void spin_photo_pin() {
       static constexpr uint32_t sequence[] = PHOTO_PULSES_US;
-      for (uint8_t i = 0; i < COUNT(sequence); i++)
+      LOOP_L_N(i, COUNT(sequence))
         pulse_photo_pin(sequence[i], !(i & 1));
     }
 
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
new file mode 100644
index 000000000000..e00fa77d62b6
--- /dev/null
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -0,0 +1,81 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+
+#include "../../gcode.h"
+#include "../../../feature/controllerfan.h"
+
+void M710_report(const bool forReplay) {
+  if (!forReplay) { SERIAL_ECHOLNPGM("; Controller Fan"); SERIAL_ECHO_START(); }
+  SERIAL_ECHOLNPAIR("M710 "
+    "S", int(controllerFan.settings.active_speed),
+    "I", int(controllerFan.settings.idle_speed),
+    "A", int(controllerFan.settings.auto_mode),
+    "D", controllerFan.settings.duration,
+    " ; (", (int(controllerFan.settings.active_speed) * 100) / 255, "%"
+    " ", (int(controllerFan.settings.idle_speed) * 100) / 255, "%)"
+  );
+}
+
+/**
+ * M710: Set controller fan settings
+ *
+ *  R         : Reset to defaults
+ *  S[0-255]  : Fan speed when motors are active
+ *  I[0-255]  : Fan speed when motors are idle
+ *  A[0|1]    : Turn auto mode on or off
+ *  D         : Set auto mode idle duration
+ *
+ * Examples:
+ *   M710                   ; Report current Settings
+ *   M710 R                 ; Reset SIAD to defaults
+ *   M710 I64               ; Set controller fan Idle Speed to 25%
+ *   M710 S255              ; Set controller fan Active Speed to 100%
+ *   M710 S0                ; Set controller fan Active Speed to OFF
+ *   M710 I255 A0           ; Set controller fan Idle Speed to 100% with Auto Mode OFF
+ *   M710 I127 A1 S255 D160 ; Set controller fan idle speed 50%, AutoMode On, Fan speed 100%, duration to 160 Secs
+ */
+void GcodeSuite::M710() {
+
+  const bool seenR = parser.seen('R');
+  if (seenR) controllerFan.reset();
+
+  const bool seenS = parser.seenval('S');
+  if (seenS) controllerFan.settings.active_speed = parser.value_byte();
+
+  const bool seenI = parser.seenval('I');
+  if (seenI) controllerFan.settings.idle_speed = parser.value_byte();
+
+  const bool seenA = parser.seenval('A');
+  if (seenA) controllerFan.settings.auto_mode = parser.value_bool();
+
+  const bool seenD = parser.seenval('D');
+  if (seenD) controllerFan.settings.duration = parser.value_ushort();
+
+  if (!(seenR || seenS || seenI || seenA || seenD))
+    M710_report(false);
+}
+
+#endif // CONTROLLER_FAN_EDITABLE
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index a8ded07d774a..fe8e37ebdd0e 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -46,7 +46,7 @@ void GcodeSuite::M907() {
 
     LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper.digipot_current(i, parser.value_int());
     if (parser.seenval('B')) stepper.digipot_current(4, parser.value_int());
-    if (parser.seenval('S')) for (uint8_t i = 0; i <= 4; i++) stepper.digipot_current(i, parser.value_int());
+    if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.digipot_current(i, parser.value_int());
 
   #elif HAS_MOTOR_CURRENT_PWM
 
@@ -74,7 +74,7 @@ void GcodeSuite::M907() {
   #if ENABLED(DAC_STEPPER_CURRENT)
     if (parser.seenval('S')) {
       const float dac_percent = parser.value_float();
-      for (uint8_t i = 0; i <= 4; i++) dac_current_percent(i, dac_percent);
+      LOOP_LE_N(i, 4) dac_current_percent(i, dac_percent);
     }
     LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) dac_current_percent(i, parser.value_float());
   #endif
diff --git a/Marlin/src/gcode/feature/leds/M7219.cpp b/Marlin/src/gcode/feature/leds/M7219.cpp
index a02ea0cc3078..acbd55957f9e 100644
--- a/Marlin/src/gcode/feature/leds/M7219.cpp
+++ b/Marlin/src/gcode/feature/leds/M7219.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(MAX7219_GCODE)
 
 #include "../../gcode.h"
-#include "../../../feature/Max7219_Debug_LEDs.h"
+#include "../../../feature/max7219.h"
 
 /**
  * M7219: Control the Max7219 LED matrix
@@ -79,7 +79,7 @@ void GcodeSuite::M7219() {
   }
 
   if (parser.seen('P')) {
-    for (uint8_t r = 0; r < MAX7219_LINES; r++) {
+    LOOP_L_N(r, MAX7219_LINES) {
       SERIAL_ECHOPGM("led_line[");
       if (r < 10) SERIAL_CHAR(' ');
       SERIAL_ECHO(int(r));
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index e6e5180192e6..60e6bcf0408f 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -56,16 +56,16 @@ void GcodeSuite::G61(void) {
 
   SERIAL_ECHOPAIR(STR_RESTORING_POS " S", int(slot));
   LOOP_XYZ(i) {
-    destination[i] = parser.seen(axis_codes[i])
+    destination[i] = parser.seen(XYZ_CHAR(i))
       ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
       : current_position[i];
-    SERIAL_CHAR(' ', axis_codes[i]);
+    SERIAL_CHAR(' ', XYZ_CHAR(i));
     SERIAL_ECHO_F(destination[i]);
   }
   SERIAL_EOL();
 
   // Move to the saved position
-  prepare_move_to_destination();
+  prepare_line_to_destination();
 }
 
 #endif // SAVED_POSITIONS
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 6cf0847a9dc4..206815a200ec 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../feature/power_loss_recovery.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index be76814c0d9a..aa3c3c4c30b1 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -39,7 +39,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../../../feature/prusa_MMU2/mmu2.h"
+  #include "../../../feature/mmu2/mmu2.h"
 #endif
 
 #if ENABLED(MIXING_EXTRUDER)
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 546fea9bdeb5..8d8cdc755717 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -25,11 +25,11 @@
 #if ENABLED(POWER_LOSS_RECOVERY)
 
 #include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
 #include "../../../lcd/ultralcd.h"
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
@@ -63,7 +63,7 @@ void GcodeSuite::M1000() {
       #if HAS_LCD_MENU
         ui.goto_screen(menu_job_recovery);
       #elif ENABLED(EXTENSIBLE_UI)
-        ExtUI::OnPowerLossResume();
+        ExtUI::onPowerLossResume();
       #else
         SERIAL_ECHO_MSG("Resume requires LCD.");
       #endif
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 2b3f478b203a..67e756d5d230 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(POWER_LOSS_RECOVERY)
 
 #include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
 #include "../../../lcd/ultralcd.h"
 
diff --git a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
index b9b74ebf71dd..0a9c519451a0 100644
--- a/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
+++ b/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(PRUSA_MMU2)
 
 #include "../../gcode.h"
-#include "../../../feature/prusa_MMU2/mmu2.h"
+#include "../../../feature/mmu2/mmu2.h"
 
 /**
  * M403: Set filament type for MMU2
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index bba6e7e752aa..0eb93a8006d7 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
@@ -53,4 +53,4 @@ void GcodeSuite::M122() {
   test_tmc_connection(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index bb2659913ac7..95ad310ed0e0 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
@@ -170,4 +170,4 @@ void GcodeSuite::M906() {
   }
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 505ac14d8777..582e779cc2d6 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
@@ -348,7 +348,7 @@
 
     bool report = true;
     const uint8_t index = parser.byteval('I');
-    LOOP_XYZ(i) if (parser.seen(axis_codes[i])) {
+    LOOP_XYZ(i) if (parser.seen(XYZ_CHAR(i))) {
       const int16_t value = parser.value_int();
       report = false;
       switch (i) {
@@ -426,4 +426,4 @@
   }
 #endif // USE_SENSORLESS
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0d2b656dd6e7..1f9d710bb4c7 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -46,7 +46,7 @@ GcodeSuite gcode;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   #include "../sd/cardreader.h"
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if ENABLED(CANCEL_OBJECTS)
@@ -135,7 +135,7 @@ void GcodeSuite::get_destination_from_command() {
 
   // Get new XYZ position, whether absolute or relative
   LOOP_XYZ(i) {
-    if ( (seen[i] = parser.seenval(axis_codes[i])) ) {
+    if ( (seen[i] = parser.seenval(XYZ_CHAR(i))) ) {
       const float v = parser.value_axis_units((AxisEnum)i);
       if (skip_move)
         destination[i] = current_position[i];
@@ -277,7 +277,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 27: G27(); break;                                    // G27: Nozzle Park
       #endif
 
-      case 28: G28(false); break;                                 // G28: Home all axes, one at a time
+      case 28: G28(); break;                                      // G28: Home one or more axes
 
       #if HAS_LEVELING
         case 29:                                                  // G29: Bed leveling calibration
@@ -752,6 +752,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 702: M702(); break;                                  // M702: Unload Filament
       #endif
 
+      #if ENABLED(CONTROLLER_FAN_EDITABLE)
+        case 710: M710(); break;                                  // M710: Set Controller Fan settings
+      #endif
+
       #if ENABLED(GCODE_MACROS)
         case 810: case 811: case 812: case 813: case 814:
         case 815: case 816: case 817: case 818: case 819:
@@ -785,7 +789,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         #endif
       #endif
 
-      #if HAS_TRINAMIC
+      #if HAS_TRINAMIC_CONFIG
         case 122: M122(); break;                                  // M122: Report driver configuration and status
         case 906: M906(); break;                                  // M906: Set motor current in milliamps using axis codes X, Y, Z, E
         #if HAS_STEALTHCHOP
@@ -853,7 +857,11 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
 
       #if ENABLED(POWER_LOSS_RECOVERY)
         case 413: M413(); break;                                  // M413: Enable/disable/query Power-Loss Recovery
-        case 1000: M1000(); break;                                // M1000: Resume from power-loss
+        case 1000: M1000(); break;                                // M1000: [INTERNAL] Resume from power-loss
+      #endif
+
+      #if ENABLED(SDSUPPORT)
+        case 1001: M1001(); break;                                // M1001: [INTERNAL] Handle SD completion
       #endif
 
       #if ENABLED(MAX7219_GCODE)
@@ -930,6 +938,7 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
     char * const delim = strchr(gcode, '\n');         // Get address of next newline
     if (delim) *delim = '\0';                         // Replace with nul
     parser.parse(gcode);                              // Parse the current command
+    if (delim) *delim = '\n';                         // Put back the newline
     process_parsed_command(true);                     // Process it
     if (!delim) break;                                // Last command?
     gcode = delim + 1;                                // Get the next command
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index c44c17081131..8e5d054d9995 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -287,7 +287,7 @@
 #include "parser.h"
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "../feature/I2CPositionEncoder.h"
+  #include "../feature/encoder_i2c.h"
 #endif
 
 enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };
@@ -434,7 +434,7 @@ class GcodeSuite {
     static void G27();
   #endif
 
-  static void G28(const bool always_home_all);
+  static void G28();
 
   #if HAS_LEVELING
     #if ENABLED(G29_RETRY_AND_RECOVER)
@@ -912,7 +912,7 @@ class GcodeSuite {
     static void M900();
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     static void M122();
     static void M906();
     #if HAS_STEALTHCHOP
@@ -968,10 +968,18 @@ class GcodeSuite {
     static void M1000();
   #endif
 
+  #if ENABLED(SDSUPPORT)
+    static void M1001();
+  #endif
+
   #if ENABLED(MAX7219_GCODE)
     static void M7219();
   #endif
 
+  #if ENABLED(CONTROLLER_FAN_EDITABLE)
+    static void M710();
+  #endif
+
   static void T(const uint8_t tool_index);
 
 };
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 0ed10beb54c2..91a746dd7610 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -25,7 +25,7 @@
 #include "../../module/stepper.h"
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "../../feature/I2CPositionEncoder.h"
+  #include "../../feature/encoder_i2c.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index e4cac5174bf7..13e82a0c7316 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -38,7 +38,7 @@
  */
 void GcodeSuite::M206() {
   LOOP_XYZ(i)
-    if (parser.seen(axis_codes[i]))
+    if (parser.seen(XYZ_CHAR(i)))
       set_home_offset((AxisEnum)i, parser.value_linear_units());
 
   #if ENABLED(MORGAN_SCARA)
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index acdd925301a7..ec5b950b6494 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -34,40 +34,44 @@
     #include "../../core/debug_out.h"
   #endif
 
-  void report_xyze(const xyze_pos_t &pos, const uint8_t n=4, const uint8_t precision=3) {
+  void report_xyze(const xyze_pos_t &pos, const uint8_t n=XYZE, const uint8_t precision=3) {
     char str[12];
-    for (uint8_t a = 0; a < n; a++) {
+    LOOP_L_N(a, n) {
       SERIAL_CHAR(' ', axis_codes[a], ':');
       SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
     }
     SERIAL_EOL();
   }
+  inline void report_xyz(const xyze_pos_t &pos) { report_xyze(pos, 3); }
 
   void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) {
     char str[12];
-    for (uint8_t a = X_AXIS; a <= Z_AXIS; a++) {
-      SERIAL_CHAR(' ', axis_codes[a], ':');
+    LOOP_XYZ(a) {
+      SERIAL_CHAR(' ', XYZ_CHAR(a), ':');
       SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
     }
     SERIAL_EOL();
   }
-  inline void report_xyz(const xyze_pos_t &pos) { report_xyze(pos, 3); }
 
   void report_current_position_detail() {
 
+    // Position as sent by G-code
     SERIAL_ECHOPGM("\nLogical:");
     report_xyz(current_position.asLogical());
 
+    // Cartesian position in native machine space
     SERIAL_ECHOPGM("Raw:    ");
     report_xyz(current_position);
 
     xyze_pos_t leveled = current_position;
 
     #if HAS_LEVELING
+      // Current position with leveling applied
       SERIAL_ECHOPGM("Leveled:");
       planner.apply_leveling(leveled);
       report_xyz(leveled);
 
+      // Test planner un-leveling. This should match the Raw result.
       SERIAL_ECHOPGM("UnLevel:");
       xyze_pos_t unleveled = leveled;
       planner.unapply_leveling(unleveled);
@@ -75,6 +79,7 @@
     #endif
 
     #if IS_KINEMATIC
+      // Kinematics applied to the leveled position
       #if IS_SCARA
         SERIAL_ECHOPGM("ScaraK: ");
       #else
@@ -180,12 +185,21 @@
 #endif // M114_DETAIL
 
 /**
- * M114: Report current position to host
+ * M114: Report the current position to host.
+ *       Since steppers are moving, the count positions are
+ *       projected by using planner calculations.
+ *   D - Report more detail. This syncs the planner. (Requires M114_DETAIL)
+ *   E - Report E stepper position (Requires M114_DETAIL)
+ *   R - Report the realtime position instead of projected.
  */
 void GcodeSuite::M114() {
 
   #if ENABLED(M114_DETAIL)
     if (parser.seen('D')) {
+      #if DISABLED(M114_LEGACY)
+        planner.synchronize();
+      #endif
+      report_current_position();
       report_current_position_detail();
       return;
     }
@@ -195,6 +209,12 @@ void GcodeSuite::M114() {
     }
   #endif
 
-  planner.synchronize();
-  report_current_position();
+  #if ENABLED(M114_REALTIME)
+    if (parser.seen('R')) { report_real_position(); return; }
+  #endif
+
+  #if ENABLED(M114_LEGACY)
+    planner.synchronize();
+  #endif
+  report_current_position_projected();
 }
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 4d2c5d5d6996..d74f909c4782 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -54,39 +54,19 @@ void GcodeSuite::M115() {
     #endif
 
     // SERIAL_XON_XOFF
-    cap_line(PSTR("SERIAL_XON_XOFF")
-      #if ENABLED(SERIAL_XON_XOFF)
-        , true
-      #endif
-    );
+    cap_line(PSTR("SERIAL_XON_XOFF"), ENABLED(SERIAL_XON_XOFF));
 
     // BINARY_FILE_TRANSFER (M28 B1)
-    cap_line(PSTR("BINARY_FILE_TRANSFER")
-      #if ENABLED(BINARY_FILE_TRANSFER)
-        , true
-      #endif
-    );
+    cap_line(PSTR("BINARY_FILE_TRANSFER"), ENABLED(BINARY_FILE_TRANSFER));
 
     // EEPROM (M500, M501)
-    cap_line(PSTR("EEPROM")
-      #if ENABLED(EEPROM_SETTINGS)
-        , true
-      #endif
-    );
+    cap_line(PSTR("EEPROM"), ENABLED(EEPROM_SETTINGS));
 
     // Volumetric Extrusion (M200)
-    cap_line(PSTR("VOLUMETRIC")
-      #if DISABLED(NO_VOLUMETRICS)
-        , true
-      #endif
-    );
+    cap_line(PSTR("VOLUMETRIC"), DISABLED(NO_VOLUMETRICS));
 
     // AUTOREPORT_TEMP (M155)
-    cap_line(PSTR("AUTOREPORT_TEMP")
-      #if ENABLED(AUTO_REPORT_TEMPERATURES)
-        , true
-      #endif
-    );
+    cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES));
 
     // PROGRESS (M530 S L, M531 <file>, M532 X L)
     cap_line(PSTR("PROGRESS"));
@@ -95,93 +75,42 @@ void GcodeSuite::M115() {
     cap_line(PSTR("PRINT_JOB"), true);
 
     // AUTOLEVEL (G29)
-    cap_line(PSTR("AUTOLEVEL")
-      #if HAS_AUTOLEVEL
-        , true
-      #endif
-    );
+    cap_line(PSTR("AUTOLEVEL"), ENABLED(HAS_AUTOLEVEL));
 
     // Z_PROBE (G30)
-    cap_line(PSTR("Z_PROBE")
-      #if HAS_BED_PROBE
-        , true
-      #endif
-    );
+    cap_line(PSTR("Z_PROBE"), ENABLED(HAS_BED_PROBE));
 
     // MESH_REPORT (M420 V)
-    cap_line(PSTR("LEVELING_DATA")
-      #if HAS_LEVELING
-        , true
-      #endif
-    );
+    cap_line(PSTR("LEVELING_DATA"), ENABLED(HAS_LEVELING));
 
     // BUILD_PERCENT (M73)
-    cap_line(PSTR("BUILD_PERCENT")
-      #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-        , true
-      #endif
-    );
+    cap_line(PSTR("BUILD_PERCENT"), ENABLED(LCD_SET_PROGRESS_MANUALLY));
 
     // SOFTWARE_POWER (M80, M81)
-    cap_line(PSTR("SOFTWARE_POWER")
-      #if ENABLED(PSU_CONTROL)
-        , true
-      #endif
-    );
+    cap_line(PSTR("SOFTWARE_POWER"), ENABLED(PSU_CONTROL));
 
     // CASE LIGHTS (M355)
-    cap_line(PSTR("TOGGLE_LIGHTS")
-      #if HAS_CASE_LIGHT
-        , true
-      #endif
-    );
-    cap_line(PSTR("CASE_LIGHT_BRIGHTNESS")
-      #if HAS_CASE_LIGHT
-        , PWM_PIN(CASE_LIGHT_PIN)
-      #endif
-    );
+    cap_line(PSTR("TOGGLE_LIGHTS"), ENABLED(HAS_CASE_LIGHT));
+
+    cap_line(PSTR("CASE_LIGHT_BRIGHTNESS"), TERN(HAS_CASE_LIGHT, PWM_PIN(CASE_LIGHT_PIN), 0));
 
     // EMERGENCY_PARSER (M108, M112, M410, M876)
-    cap_line(PSTR("EMERGENCY_PARSER")
-      #if ENABLED(EMERGENCY_PARSER)
-        , true
-      #endif
-    );
+    cap_line(PSTR("EMERGENCY_PARSER"), ENABLED(EMERGENCY_PARSER));
 
     // PROMPT SUPPORT (M876)
-    cap_line(PSTR("PROMPT_SUPPORT")
-      #if ENABLED(HOST_PROMPT_SUPPORT)
-        , true
-      #endif
-    );
+    cap_line(PSTR("PROMPT_SUPPORT"), ENABLED(HOST_PROMPT_SUPPORT));
 
     // AUTOREPORT_SD_STATUS (M27 extension)
-    cap_line(PSTR("AUTOREPORT_SD_STATUS")
-      #if ENABLED(AUTO_REPORT_SD_STATUS)
-        , true
-      #endif
-    );
+    cap_line(PSTR("AUTOREPORT_SD_STATUS"), ENABLED(AUTO_REPORT_SD_STATUS));
 
     // THERMAL_PROTECTION
-    cap_line(PSTR("THERMAL_PROTECTION")
-      #if (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) && (ENABLED(THERMAL_PROTECTION_BED) || !HAS_HEATED_BED) && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER)
-        , true
-      #endif
-    );
+    cap_line(PSTR("THERMAL_PROTECTION"), ENABLED(THERMALLY_SAFE));
 
     // MOTION_MODES (M80-M89)
-    cap_line(PSTR("MOTION_MODES")
-      #if ENABLED(GCODE_MOTION_MODES)
-        , true
-      #endif
-    );
+    cap_line(PSTR("MOTION_MODES"), ENABLED(GCODE_MOTION_MODES));
 
     // CHAMBER_TEMPERATURE (M141, M191)
-    cap_line(PSTR("CHAMBER_TEMPERATURE")
-      #if HAS_HEATED_CHAMBER
-        , true
-      #endif
-    );
+    cap_line(PSTR("CHAMBER_TEMPERATURE"), ENABLED(HAS_HEATED_CHAMBER));
 
   #endif // EXTENDED_CAPABILITIES_REPORT
 }
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 2b35ddf3ff53..190023b0904f 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -24,21 +24,17 @@
 
 #if HAS_RESUME_CONTINUE
 
+#include "../../inc/MarlinConfig.h"
+
 #include "../gcode.h"
-#include "../../module/planner.h"
 
-#include "../../inc/MarlinConfig.h"
+#include "../../module/planner.h" // for synchronize()
+#include "../../MarlinCore.h"     // for wait_for_user_response()
 
 #if HAS_LCD_MENU
   #include "../../lcd/ultralcd.h"
-#endif
-
-#if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
-#endif
-
-#if HAS_LEDS_OFF_FLAG
-  #include "../../feature/leds/printer_event_leds.h"
+#elif ENABLED(EXTENSIBLE_UI)
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -50,32 +46,16 @@
  * M1: Conditional stop   - Wait for user button press on LCD
  */
 void GcodeSuite::M0_M1() {
-  const char * const args = parser.string_arg;
-
   millis_t ms = 0;
-  bool hasP = false, hasS = false;
-  if (parser.seenval('P')) {
-    ms = parser.value_millis(); // milliseconds to wait
-    hasP = ms > 0;
-  }
-  if (parser.seenval('S')) {
-    ms = parser.value_millis_from_seconds(); // seconds to wait
-    hasS = ms > 0;
-  }
-
-  const bool has_message = !hasP && !hasS && args && *args;
+  if (parser.seenval('P')) ms = parser.value_millis();              // Milliseconds to wait
+  if (parser.seenval('S')) ms = parser.value_millis_from_seconds(); // Seconds to wait
 
   planner.synchronize();
 
-  #if HAS_LEDS_OFF_FLAG
-    if (parser.seen('Q'))
-      printerEventLEDs.onPrintCompleted();  // Change LED color for Print Completed
-  #endif
-
   #if HAS_LCD_MENU
 
-    if (has_message)
-      ui.set_status(args, true);
+    if (parser.string_arg)
+      ui.set_status(parser.string_arg, true);
     else {
       LCD_MESSAGEPGM(MSG_USERWAIT);
       #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
@@ -84,40 +64,28 @@ void GcodeSuite::M0_M1() {
     }
 
   #elif ENABLED(EXTENSIBLE_UI)
-
-    if (has_message)
-      ExtUI::onUserConfirmRequired(args); // Can this take an SRAM string??
+    if (parser.string_arg)
+      ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
     else
       ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
-
   #else
 
-    if (has_message) {
+    if (parser.string_arg) {
       SERIAL_ECHO_START();
-      SERIAL_ECHOLN(args);
+      SERIAL_ECHOLN(parser.string_arg);
     }
 
   #endif
 
-  KEEPALIVE_STATE(PAUSED_FOR_USER);
-  wait_for_user = true;
-
   #if ENABLED(HOST_PROMPT_SUPPORT)
     host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR);
   #endif
 
-  if (ms > 0) ms += millis();  // wait until this time for a click
-  while (wait_for_user && (ms == 0 || PENDING(millis(), ms))) idle();
-
-  #if HAS_LEDS_OFF_FLAG
-    printerEventLEDs.onResumeAfterWait();
-  #endif
+  wait_for_user_response(ms);
 
   #if HAS_LCD_MENU
     ui.reset_status();
   #endif
-
-  wait_for_user = false;
 }
 
 #endif // HAS_RESUME_CONTINUE
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 8f0dfc71b2f6..069d76fdad97 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -100,9 +100,9 @@ void GcodeSuite::G0_G1(
     #endif // FWRETRACT
 
     #if IS_SCARA
-      fast_move ? prepare_fast_move_to_destination() : prepare_move_to_destination();
+      fast_move ? prepare_fast_move_to_destination() : prepare_line_to_destination();
     #else
-      prepare_move_to_destination();
+      prepare_line_to_destination();
     #endif
 
     #ifdef G0_FEEDRATE
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index b11b1136b6e1..b0fb299ab26c 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -236,7 +236,7 @@ void plan_arc(
     planner.apply_leveling(raw);
   #endif
 
-  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, seg_length
+  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
     #if ENABLED(SCARA_FEEDRATE_SCALING)
       , inv_duration
     #endif
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 4f6489d3b912..5fef948fa483 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -76,8 +76,8 @@
  */
 void GcodeSuite::M290() {
   #if ENABLED(BABYSTEP_XY)
-    for (uint8_t a = X_AXIS; a <= Z_AXIS; a++)
-      if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) {
+    LOOP_XYZ(a)
+      if (parser.seenval(XYZ_CHAR(a)) || (a == Z_AXIS && parser.seenval('S'))) {
         const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
         babystep.add_mm((AxisEnum)a, offs);
         #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 0fac65300fb4..4ece6ede469e 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -312,7 +312,9 @@ void GCodeParser::parse(char *p) {
         char * const valptr = has_val ? is_str ? unescape_string(p) : p : nullptr;
       #else
         const bool has_val = valid_float(p);
-        char * const valptr = has_val ? p : nullptr;
+        #if ENABLED(FASTER_GCODE_PARSER)
+          char * const valptr = has_val ? p : nullptr;
+        #endif
       #endif
 
       #if ENABLED(DEBUG_GCODE_PARSER)
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index 8b2ada9ceca8..21d56b3fd47b 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -43,7 +43,7 @@ void GcodeSuite::G30() {
   const xy_pos_t pos = { parser.linearval('X', current_position.x + probe.offset_xy.x),
                          parser.linearval('Y', current_position.y + probe.offset_xy.y) };
 
-  if (!position_is_reachable_by_probe(pos)) return;
+  if (!probe.can_reach(pos)) return;
 
   // Disable leveling so the planner won't mess with us
   #if HAS_LEVELING
diff --git a/Marlin/src/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index 11b7ce5af74d..512e1ff89f49 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -34,7 +34,7 @@
 inline void G38_single_probe(const uint8_t move_value) {
   endstops.enable(true);
   G38_move = move_value;
-  prepare_move_to_destination();
+  prepare_line_to_destination();
   planner.synchronize();
   G38_move = 0;
   endstops.hit_on_purpose();
@@ -77,7 +77,7 @@ inline bool G38_run_probe() {
       // Move away by the retract distance
       destination = current_position + retract_mm;
       endstops.enable(false);
-      prepare_move_to_destination();
+      prepare_line_to_destination();
       planner.synchronize();
 
       REMEMBER(fr, feedrate_mm_s, feedrate_mm_s * 0.25);
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 7d17ca602b6f..abb50b960daa 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -44,7 +44,7 @@ GCodeQueue queue;
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 /**
@@ -94,7 +94,7 @@ static PGM_P injected_commands_P = nullptr;
 
 GCodeQueue::GCodeQueue() {
   // Send "ok" after commands by default
-  for (uint8_t i = 0; i < COUNT(send_ok); i++) send_ok[i] = true;
+  LOOP_L_N(i, COUNT(send_ok)) send_ok[i] = true;
 }
 
 /**
@@ -150,6 +150,8 @@ bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
   return true;
 }
 
+#define ISEOL(C) ((C) == '\n' || (C) == '\r')
+
 /**
  * Enqueue with Serial Echo
  * Return true if the command was consumed
@@ -160,7 +162,7 @@ bool GCodeQueue::enqueue_one(const char* cmd) {
   //SERIAL_ECHO(cmd);
   //SERIAL_ECHOPGM("\") \n");
 
-  if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true;
+  if (*cmd == 0 || ISEOL(*cmd)) return true;
 
   if (_enqueue(cmd)) {
     SERIAL_ECHO_MSG(STR_ENQUEUEING, cmd, "\"");
@@ -209,6 +211,21 @@ void GCodeQueue::inject_P(PGM_P const pgcode) { injected_commands_P = pgcode; }
  */
 void GCodeQueue::enqueue_one_now(const char* cmd) { while (!enqueue_one(cmd)) idle(); }
 
+/**
+ * Attempt to enqueue a single G-code command
+ * and return 'true' if successful.
+ */
+bool GCodeQueue::enqueue_one_P(PGM_P const pgcode) {
+  size_t i = 0;
+  PGM_P p = pgcode;
+  char c;
+  while ((c = pgm_read_byte(&p[i])) && c != '\n') i++;
+  char cmd[i + 1];
+  memcpy_P(cmd, p, i);
+  cmd[i] = '\0';
+  return _enqueue(cmd);
+}
+
 /**
  * Enqueue from program memory and return only when commands are actually enqueued
  * Never call this from a G-code handler!
@@ -361,6 +378,10 @@ inline void process_stream_char(const char c, uint8_t &sis, char (&buff)[MAX_CMD
     sis = PS_EOL;               // Skip the rest on overflow
 }
 
+/**
+ * Handle a line being completed. For an empty line
+ * keep sensor readings going and watchdog alive.
+ */
 inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind) {
   sis = PS_NORMAL;
   buff[ind] = 0;
@@ -406,14 +427,14 @@ void GCodeQueue::get_serial_commands() {
    * Loop while serial characters are incoming and the queue is not full
    */
   while (length < BUFSIZE && serial_data_available()) {
-    for (uint8_t i = 0; i < NUM_SERIAL; ++i) {
+    LOOP_L_N(i, NUM_SERIAL) {
 
       const int c = read_serial(i);
       if (c < 0) continue;
 
       const char serial_char = c;
 
-      if (serial_char == '\n' || serial_char == '\r') {
+      if (ISEOL(serial_char)) {
 
         // Reset our state, continue if the line was empty
         if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]))
@@ -530,7 +551,7 @@ void GCodeQueue::get_serial_commands() {
       if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(STR_SD_ERR_READ); continue; }
 
       const char sd_char = (char)n;
-      const bool is_eol = sd_char == '\n' || sd_char == '\r';
+      const bool is_eol = ISEOL(sd_char);
       if (is_eol || card_eof) {
 
         // Reset stream state, terminate the buffer, and commit a non-empty command
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 1ce64590c367..6a87d47ac8c8 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -77,6 +77,12 @@ class GCodeQueue {
    */
   static void enqueue_one_now(const char* cmd);
 
+  /**
+   * Attempt to enqueue a single G-code command
+   * and return 'true' if successful.
+   */
+  static bool enqueue_one_P(PGM_P const pgcode);
+
   /**
    * Enqueue from program memory and return only when commands are actually enqueued
    */
@@ -117,12 +123,6 @@ class GCodeQueue {
    */
   static void flush_and_request_resend();
 
-  /**
-   * Attempt to enqueue a single G-code command
-   * and return 'true' if successful.
-   */
-  FORCE_INLINE static bool enqueue_P(const char* cmd) { return _enqueue(cmd); }
-
 private:
 
   static uint8_t index_w;  // Ring buffer write position
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
new file mode 100644
index 000000000000..4261b57f97b3
--- /dev/null
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -0,0 +1,109 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(SDSUPPORT)
+
+#include "../gcode.h"
+#include "../../module/printcounter.h"
+
+#if EITHER(LCD_SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE)
+  #include "../../lcd/ultralcd.h"
+#endif
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../feature/powerloss.h"
+#endif
+
+#if HAS_LEDS_OFF_FLAG
+  #include "../../feature/leds/printer_event_leds.h"
+#endif
+
+#if ENABLED(EXTENSIBLE_UI)
+  #include "../../lcd/extui/ui_api.h"
+#endif
+
+#if ENABLED(HOST_ACTION_COMMANDS)
+  #include "../../feature/host_actions.h"
+#endif
+
+#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
+  #include "../../module/planner.h"
+#endif
+
+#ifndef PE_LEDS_COMPLETED_TIME
+  #define PE_LEDS_COMPLETED_TIME (30*60)
+#endif
+
+/**
+ * M1001: Execute actions for SD print completion
+ */
+void GcodeSuite::M1001() {
+
+  // Report total print time
+  const bool long_print = print_job_timer.duration() > 60;
+  if (long_print) gcode.process_subcommands_now_P(PSTR("M31"));
+
+  // Stop the print job timer
+  gcode.process_subcommands_now_P(PSTR("M77"));
+
+  // Set the progress bar "done" state
+  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+    ui.set_progress_done();
+  #endif
+
+  // Purge the recovery file
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    recovery.purge();
+  #endif
+
+  // Announce SD file completion
+  SERIAL_ECHOLNPGM(STR_FILE_PRINTED);
+
+  // Update the status LED color
+  #if HAS_LEDS_OFF_FLAG
+    if (long_print) {
+      printerEventLEDs.onPrintCompleted();
+      #if ENABLED(EXTENSIBLE_UI)
+        ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE));
+      #endif
+      #if ENABLED(HOST_PROMPT_SUPPORT)
+        host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR);
+      #endif
+      wait_for_user_response(1000UL * TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30));
+      printerEventLEDs.onResumeAfterWait();
+    }
+  #endif
+
+  // Wait for the queue to empty (and "clean"), inject SD_FINISHED_RELEASECOMMAND
+  #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
+    planner.finish_and_disable();
+  #endif
+
+  // Re-select the last printed file in the UI
+  #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
+    ui.reselect_last_file();
+  #endif
+}
+
+#endif // SDSUPPORT
diff --git a/Marlin/src/gcode/sdcard/M20.cpp b/Marlin/src/gcode/sd/M20.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M20.cpp
rename to Marlin/src/gcode/sd/M20.cpp
diff --git a/Marlin/src/gcode/sdcard/M21_M22.cpp b/Marlin/src/gcode/sd/M21_M22.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M21_M22.cpp
rename to Marlin/src/gcode/sd/M21_M22.cpp
diff --git a/Marlin/src/gcode/sdcard/M23.cpp b/Marlin/src/gcode/sd/M23.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M23.cpp
rename to Marlin/src/gcode/sd/M23.cpp
diff --git a/Marlin/src/gcode/sdcard/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
similarity index 98%
rename from Marlin/src/gcode/sdcard/M24_M25.cpp
rename to Marlin/src/gcode/sd/M24_M25.cpp
index db1a671fe406..c1e6dde8de75 100644
--- a/Marlin/src/gcode/sdcard/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -39,7 +39,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../feature/power_loss_recovery.h"
+  #include "../../feature/powerloss.h"
 #endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob
diff --git a/Marlin/src/gcode/sdcard/M26.cpp b/Marlin/src/gcode/sd/M26.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M26.cpp
rename to Marlin/src/gcode/sd/M26.cpp
diff --git a/Marlin/src/gcode/sdcard/M27.cpp b/Marlin/src/gcode/sd/M27.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M27.cpp
rename to Marlin/src/gcode/sd/M27.cpp
diff --git a/Marlin/src/gcode/sdcard/M28_M29.cpp b/Marlin/src/gcode/sd/M28_M29.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M28_M29.cpp
rename to Marlin/src/gcode/sd/M28_M29.cpp
diff --git a/Marlin/src/gcode/sdcard/M30.cpp b/Marlin/src/gcode/sd/M30.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M30.cpp
rename to Marlin/src/gcode/sd/M30.cpp
diff --git a/Marlin/src/gcode/sdcard/M32.cpp b/Marlin/src/gcode/sd/M32.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M32.cpp
rename to Marlin/src/gcode/sd/M32.cpp
diff --git a/Marlin/src/gcode/sdcard/M33.cpp b/Marlin/src/gcode/sd/M33.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M33.cpp
rename to Marlin/src/gcode/sd/M33.cpp
diff --git a/Marlin/src/gcode/sdcard/M34.cpp b/Marlin/src/gcode/sd/M34.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M34.cpp
rename to Marlin/src/gcode/sd/M34.cpp
diff --git a/Marlin/src/gcode/sdcard/M524.cpp b/Marlin/src/gcode/sd/M524.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M524.cpp
rename to Marlin/src/gcode/sd/M524.cpp
diff --git a/Marlin/src/gcode/sdcard/M928.cpp b/Marlin/src/gcode/sd/M928.cpp
similarity index 100%
rename from Marlin/src/gcode/sdcard/M928.cpp
rename to Marlin/src/gcode/sd/M928.cpp
diff --git a/Marlin/src/gcode/temperature/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
similarity index 99%
rename from Marlin/src/gcode/temperature/M104_M109.cpp
rename to Marlin/src/gcode/temp/M104_M109.cpp
index ab99ea940ced..434c6c96637f 100644
--- a/Marlin/src/gcode/temperature/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M104_M109.cpp
+ * gcode/temp/M104_M109.cpp
  *
  * Hotend target temperature control
  */
diff --git a/Marlin/src/gcode/temperature/M105.cpp b/Marlin/src/gcode/temp/M105.cpp
similarity index 100%
rename from Marlin/src/gcode/temperature/M105.cpp
rename to Marlin/src/gcode/temp/M105.cpp
diff --git a/Marlin/src/gcode/temperature/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
similarity index 100%
rename from Marlin/src/gcode/temperature/M106_M107.cpp
rename to Marlin/src/gcode/temp/M106_M107.cpp
diff --git a/Marlin/src/gcode/temperature/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
similarity index 98%
rename from Marlin/src/gcode/temperature/M140_M190.cpp
rename to Marlin/src/gcode/temp/M140_M190.cpp
index ad7608705a34..2da438707bbb 100644
--- a/Marlin/src/gcode/temperature/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M140_M190.cpp
+ * gcode/temp/M140_M190.cpp
  *
  * Bed target temperature control
  */
diff --git a/Marlin/src/gcode/temperature/M141_M191.cpp b/Marlin/src/gcode/temp/M141_M191.cpp
similarity index 98%
rename from Marlin/src/gcode/temperature/M141_M191.cpp
rename to Marlin/src/gcode/temp/M141_M191.cpp
index 66849b99e6be..3f02836476a1 100644
--- a/Marlin/src/gcode/temperature/M141_M191.cpp
+++ b/Marlin/src/gcode/temp/M141_M191.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M141_M191.cpp
+ * gcode/temp/M141_M191.cpp
  *
  * Chamber target temperature control
  */
diff --git a/Marlin/src/gcode/temperature/M155.cpp b/Marlin/src/gcode/temp/M155.cpp
similarity index 100%
rename from Marlin/src/gcode/temperature/M155.cpp
rename to Marlin/src/gcode/temp/M155.cpp
diff --git a/Marlin/src/gcode/temperature/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
similarity index 68%
rename from Marlin/src/gcode/temperature/M303.cpp
rename to Marlin/src/gcode/temp/M303.cpp
index 31f7bf350117..358a1436b171 100644
--- a/Marlin/src/gcode/temperature/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -28,18 +28,37 @@
 #include "../../module/temperature.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 /**
  * M303: PID relay autotune
  *
- *       S<temperature> sets the target temperature. (default 150C / 70C)
- *       E<extruder> (-1 for the bed) (default 0)
- *       C<cycles> Minimum 3. Default 5.
- *       U<bool> with a non-zero value will apply the result to current settings
+ *  S<temperature>  Set the target temperature. (Default: 150C / 70C)
+ *  E<extruder>     Extruder number to tune, or -1 for the bed. (Default: E0)
+ *  C<cycles>       Number of times to repeat the procedure. (Minimum: 3, Default: 5)
+ *  U<bool>         Flag to apply the result to the current PID values
+ *
+ * With PID_DEBUG:
+ *  D               Toggle PID debugging and EXIT without further action.
  */
+
+#if ENABLED(PID_DEBUG)
+  bool pid_debug_flag = 0;
+#endif
+
 void GcodeSuite::M303() {
+
+  #if ENABLED(PID_DEBUG)
+    if (parser.seen('D')) {
+      pid_debug_flag = !pid_debug_flag;
+      SERIAL_ECHO_START();
+      SERIAL_ECHOPGM("PID Debug ");
+      serialprintln_onoff(pid_debug_flag);
+      return;
+    }
+  #endif
+
   #if ENABLED(PIDTEMPBED)
     #define SI H_BED
   #else
@@ -54,7 +73,7 @@ void GcodeSuite::M303() {
   if (!WITHIN(e, SI, EI)) {
     SERIAL_ECHOLNPGM(STR_PID_BAD_EXTRUDER_NUM);
     #if ENABLED(EXTENSIBLE_UI)
-      ExtUI::OnPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM);
+      ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM);
     #endif
     return;
   }
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9227f2c81a0e..dd1f13fae0f8 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -26,6 +26,15 @@
  * Conditionals that need to be set before Configuration_adv.h or pins.h
  */
 
+#if ENABLED(MORGAN_SCARA)
+  #define IS_SCARA 1
+  #define IS_KINEMATIC 1
+#elif ENABLED(DELTA)
+  #define IS_KINEMATIC 1
+#else
+  #define IS_CARTESIAN 1
+#endif
+
 #if ENABLED(CARTESIO_UI)
 
   #define DOGLCD
@@ -65,7 +74,6 @@
     #define U8GLIB_ST7565_64128N
   #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
     #define U8GLIB_LM6059_AF
-    #define SD_DETECT_INVERTED
   #elif ENABLED(AZSMZ_12864)
     #define U8GLIB_ST7565_64128N
   #endif
@@ -193,7 +201,9 @@
 #endif
 
 // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
-#define HAS_SSD1306_OLED_I2C ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
+#if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
+  #define HAS_SSD1306_OLED_I2C 1
+#endif
 #if HAS_SSD1306_OLED_I2C
   #define IS_ULTRA_LCD
   #define DOGLCD
@@ -346,20 +356,36 @@
   #endif
 #endif
 
+// Aliases for LCD features
+#if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
+  #define HAS_DGUS_LCD 1
+#endif
+
 // Extensible UI serial touch screens. (See src/lcd/extensible_ui)
-#if ANY(MALYAN_LCD, DGUS_LCD, TOUCH_UI_FTDI_EVE)
+#if ANY(HAS_DGUS_LCD, MALYAN_LCD, TOUCH_UI_FTDI_EVE)
   #define IS_EXTUI
   #define EXTENSIBLE_UI
 #endif
 
 // Aliases for LCD features
-#define HAS_SPI_LCD          ENABLED(ULTRA_LCD)
-#define HAS_DISPLAY         (HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI))
-#define HAS_GRAPHICAL_LCD    ENABLED(DOGLCD)
-#define HAS_CHARACTER_LCD   (HAS_SPI_LCD && !HAS_GRAPHICAL_LCD)
-#define HAS_LCD_MENU        (ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS))
-#define HAS_ADC_BUTTONS      ENABLED(ADC_KEYPAD)
-#define HAS_DGUS_LCD         ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
+#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
+  #define HAS_DISPLAY 1
+  #if ENABLED(ULTRA_LCD)
+    #define HAS_SPI_LCD 1
+    #if ENABLED(DOGLCD)
+      #define HAS_GRAPHICAL_LCD 1
+    #else
+      #define HAS_CHARACTER_LCD 1
+    #endif
+  #endif
+#endif
+
+#if ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS)
+  #define HAS_LCD_MENU 1
+#endif
+#if ENABLED(ADC_KEYPAD)
+  #define HAS_ADC_BUTTONS 1
+#endif
 
 #if HAS_GRAPHICAL_LCD
   #ifndef LCD_PIXEL_WIDTH
@@ -433,22 +459,46 @@
 #ifndef HOTENDS
   #define HOTENDS EXTRUDERS
 #endif
-
 #ifndef E_STEPPERS
   #define E_STEPPERS EXTRUDERS
 #endif
-
 #ifndef E_MANUAL
   #define E_MANUAL EXTRUDERS
 #endif
 
+// Helper macros for extruder and hotend arrays
 #define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
+#define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
+#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1, v1, v1)
+#define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
+#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1, v1, v1)
 
-#define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
-#define SWITCHING_NOZZLE_TWO_SERVOS defined(SWITCHING_NOZZLE_E1_SERVO_NR)
+#if ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)
+  #define DO_SWITCH_EXTRUDER 1
+#endif
+
+#ifdef SWITCHING_NOZZLE_E1_SERVO_NR
+  #define SWITCHING_NOZZLE_TWO_SERVOS 1
+#endif
+
+#if HOTENDS > 1
+  #define HAS_HOTEND_OFFSET 1
+#endif
 
-#define HAS_HOTEND_OFFSET (HOTENDS > 1)
-#define HAS_DUPLICATION_MODE EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
+/**
+ * Default hotend offsets, if not defined
+ */
+#if HAS_HOTEND_OFFSET
+  #ifndef HOTEND_OFFSET_X
+    #define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
+  #endif
+  #ifndef HOTEND_OFFSET_Y
+    #define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
+  #endif
+  #ifndef HOTEND_OFFSET_Z
+    #define HOTEND_OFFSET_Z { 0 } // Z offsets for each extruder
+  #endif
+#endif
 
 /**
  * DISTINCT_E_FACTORS affects how some E factors are accessed
@@ -490,6 +540,10 @@
   #endif
 #endif
 
+#ifndef NUM_SERVOS
+  #define NUM_SERVOS 0
+#endif
+
 #ifndef PREHEAT_1_LABEL
   #define PREHEAT_1_LABEL "PLA"
 #endif
@@ -501,8 +555,12 @@
 /**
  * Set a flag for a servo probe (or BLTouch)
  */
-#define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
-#define HAS_SERVO_ANGLES (HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE))
+#if defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0
+  #define HAS_Z_SERVO_PROBE 1
+#endif
+#if HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
+  #define HAS_SERVO_ANGLES 1
+#endif
 #if !HAS_SERVO_ANGLES
   #undef EDITABLE_SERVO_ANGLES
 #endif
@@ -510,20 +568,31 @@
 /**
  * Set flags for enabled probes
  */
-#define HAS_BED_PROBE (HAS_Z_SERVO_PROBE || ANY(FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, SOLENOID_PROBE, SENSORLESS_PROBING, RACK_AND_PINION_PROBE))
-#define PROBE_SELECTED (HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING))
+#if ANY(HAS_Z_SERVO_PROBE, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, SOLENOID_PROBE, SENSORLESS_PROBING, RACK_AND_PINION_PROBE)
+  #define HAS_BED_PROBE 1
+#endif
+
+#if HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING)
+  #define PROBE_SELECTED 1
+#endif
 
 #if HAS_BED_PROBE
-  #define HAS_PROBE_XY_OFFSET   DISABLED(NOZZLE_AS_PROBE)
-  #define HAS_CUSTOM_PROBE_PIN  DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
-  #define HOMING_Z_WITH_PROBE   (Z_HOME_DIR < 0 && !HAS_CUSTOM_PROBE_PIN)
+  #if DISABLED(NOZZLE_AS_PROBE)
+    #define HAS_PROBE_XY_OFFSET 1
+  #endif
+  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+    #define HAS_CUSTOM_PROBE_PIN 1
+  #endif
+  #if Z_HOME_DIR < 0 && !HAS_CUSTOM_PROBE_PIN
+    #define HOMING_Z_WITH_PROBE 1
+  #endif
   #ifndef Z_PROBE_LOW_POINT
     #define Z_PROBE_LOW_POINT -5
   #endif
   #if ENABLED(Z_PROBE_ALLEN_KEY)
-    #define PROBE_TRIGGERED_WHEN_STOWED_TEST // Extra test for Allen Key Probe
+    #define PROBE_TRIGGERED_WHEN_STOWED_TEST 1 // Extra test for Allen Key Probe
   #endif
-  #ifdef MULTIPLE_PROBING
+  #if MULTIPLE_PROBING > 1
     #if EXTRA_PROBING
       #define TOTAL_PROBING (MULTIPLE_PROBING + EXTRA_PROBING)
     #else
@@ -535,27 +604,54 @@
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
 #endif
 
+/**
+ * Set granular options based on the specific type of leveling
+ */
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #undef LCD_BED_LEVELING
+  #if ENABLED(DELTA)
+    #define UBL_SEGMENTED 1
+  #endif
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
+  #define ABL_PLANAR 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
+  #define ABL_GRID 1
+#endif
+#if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
+  #define HAS_ABL_NOT_UBL 1
+#endif
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
+  #define HAS_MESH 1
+#endif
+#if EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
+  #define NEEDS_THREE_PROBE_POINTS 1
+#endif
+#if EITHER(HAS_ABL_NOT_UBL, AUTO_BED_LEVELING_UBL)
+  #define HAS_ABL_OR_UBL 1
+  #if DISABLED(PROBE_MANUALLY)
+    #define HAS_AUTOLEVEL 1
+  #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, MESH_BED_LEVELING)
+  #define HAS_LEVELING 1
+  #if DISABLED(AUTO_BED_LEVELING_UBL)
+    #define PLANNER_LEVELING 1
+  #endif
+#endif
+#if EITHER(HAS_ABL_OR_UBL, Z_MIN_PROBE_REPEATABILITY_TEST)
+  #define HAS_PROBING_PROCEDURE 1
+#endif
+#if !HAS_LEVELING
+  #undef RESTORE_LEVELING_AFTER_G28
+#endif
+
 #ifdef GRID_MAX_POINTS_X
   #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
+  #define GRID_LOOP(A,B) LOOP_L_N(A, GRID_MAX_POINTS_X) LOOP_L_N(B, GRID_MAX_POINTS_Y)
 #endif
 
-#define HAS_EXTRA_ENDSTOPS           ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
-#define HAS_SOFTWARE_ENDSTOPS        EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
-#define HAS_RESUME_CONTINUE          ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER)
-#define HAS_COLOR_LEDS               ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
-#define HAS_LEDS_OFF_FLAG            (BOTH(PRINTER_EVENT_LEDS, SDSUPPORT) && HAS_RESUME_CONTINUE)
-#define HAS_PRINT_PROGRESS           EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
-#define HAS_PRINT_PROGRESS_PERMYRIAD (HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME))
-#define HAS_SERVICE_INTERVALS        (ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0))
-#define HAS_FILAMENT_SENSOR          ENABLED(FILAMENT_RUNOUT_SENSOR)
-
-#define HAS_GAMES     ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
-#define HAS_GAME_MENU (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
-
-#define IS_SCARA     ENABLED(MORGAN_SCARA)
-#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
-#define IS_CARTESIAN !IS_KINEMATIC
-
 #ifndef INVERT_X_DIR
   #define INVERT_X_DIR false
 #endif
@@ -573,10 +669,28 @@
   #define BOOT_MARLIN_LOGO_SMALL
 #endif
 
-#define IS_RE_ARM_BOARD MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
+// This flag indicates some kind of jerk storage is needed
+#if ENABLED(CLASSIC_JERK) || IS_KINEMATIC
+  #define HAS_CLASSIC_JERK 1
+#endif
 
-#define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
+// E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA
+#if ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE))
+  #define HAS_CLASSIC_E_JERK 1
+#endif
 
 #ifndef SPI_SPEED
   #define SPI_SPEED SPI_FULL_SPEED
 #endif
+
+#if SERIAL_PORT == -1 || SERIAL_PORT_2 == -1
+  #define HAS_USB_SERIAL 1
+#endif
+
+/**
+ * This setting is also used by M109 when trying to calculate
+ * a ballpark safe margin to prevent wait-forever situation.
+ */
+#ifndef EXTRUDE_MINTEMP
+  #define EXTRUDE_MINTEMP 170
+#endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index e5cb00c11228..a52ae1af2976 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -56,11 +56,66 @@
   #undef SHOW_TEMP_ADC_VALUES
 #endif
 
+#if EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
+  #define HAS_DUPLICATION_MODE 1
+#endif
+
+#if ENABLED(PRINTCOUNTER) && (SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0)
+  #define HAS_SERVICE_INTERVALS 1
+#endif
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #define HAS_FILAMENT_SENSOR 1
+#endif
+
+#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
+  #define HAS_PRINT_PROGRESS 1
+#endif
+
+#if HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME)
+  #define HAS_PRINT_PROGRESS_PERMYRIAD 1
+#endif
+
+#if ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
+  #define HAS_GAMES 1
+  #if (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
+    #define HAS_GAME_MENU 1
+  #endif
+#endif
+
+#if ANY(FWRETRACT, HAS_LEVELING, SKEW_CORRECTION)
+  #define HAS_POSITION_MODIFIERS 1
+#endif
+
+#if ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
+  #define HAS_EXTRA_ENDSTOPS 1
+#endif
+#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
+  #define HAS_SOFTWARE_ENDSTOPS 1
+#endif
+#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS)
+  #define HAS_RESUME_CONTINUE 1
+#endif
+
+#if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
+  #define HAS_COLOR_LEDS 1
+#endif
+#if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
+  #define HAS_LEDS_OFF_FLAG 1
+#endif
+
 // Multiple Z steppers
 #ifndef NUM_Z_STEPPER_DRIVERS
   #define NUM_Z_STEPPER_DRIVERS 1
 #endif
 
+#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+  #undef Z_STEPPER_ALIGN_AMP
+#endif
+#ifndef Z_STEPPER_ALIGN_AMP
+  #define Z_STEPPER_ALIGN_AMP 1.0
+#endif
+
 #define HAS_CUTTER EITHER(SPINDLE_FEATURE, LASER_FEATURE)
 
 #if !defined(__AVR__) || !defined(USBCON)
@@ -121,9 +176,6 @@
   #define LED_CONTROL_MENU
   #define LED_USER_PRESET_STARTUP
   #define LED_COLOR_PRESETS
-  #ifndef LED_USER_PRESET_RED
-    #define LED_USER_PRESET_RED        255
-  #endif
   #ifndef LED_USER_PRESET_GREEN
     #define LED_USER_PRESET_GREEN      128
   #endif
@@ -135,15 +187,106 @@
   #endif
 #endif
 
+// Set defaults for unspecified LED user colors
+#if ENABLED(LED_CONTROL_MENU)
+  #ifndef LED_USER_PRESET_RED
+    #define LED_USER_PRESET_RED       255
+  #endif
+  #ifndef LED_USER_PRESET_GREEN
+    #define LED_USER_PRESET_GREEN     255
+  #endif
+  #ifndef LED_USER_PRESET_BLUE
+    #define LED_USER_PRESET_BLUE      255
+  #endif
+  #ifndef LED_USER_PRESET_WHITE
+    #define LED_USER_PRESET_WHITE     0
+  #endif
+  #ifndef LED_USER_PRESET_BRIGHTNESS
+    #ifdef NEOPIXEL_BRIGHTNESS
+      #define LED_USER_PRESET_BRIGHTNESS NEOPIXEL_BRIGHTNESS
+    #else
+      #define LED_USER_PRESET_BRIGHTNESS 255
+    #endif
+  #endif
+#endif
+
+// If platform requires early initialization of watchdog to properly boot
+#if ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM)
+  #define EARLY_WATCHDOG 1
+#endif
+
 // Extensible UI pin mapping for RepRapDiscount
-#define TOUCH_UI_ULTIPANEL ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
+#if ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
+  #define TOUCH_UI_ULTIPANEL 1
+#endif
 
 // Poll-based jogging for joystick and other devices
 #if ENABLED(JOYSTICK)
   #define POLL_JOG
 #endif
 
-// G60/G61 Position Save
-#if SAVED_POSITIONS > 256
-  #error "SAVED_POSITIONS must be an integer from 0 to 256."
+/**
+ * Driver Timings
+ * NOTE: Driver timing order is longest-to-shortest duration.
+ *       Preserve this ordering when adding new drivers.
+ */
+
+#ifndef MINIMUM_STEPPER_POST_DIR_DELAY
+  #if HAS_DRIVER(TB6560)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 15000
+  #elif HAS_DRIVER(TB6600)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 1500
+  #elif HAS_DRIVER(DRV8825)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 650
+  #elif HAS_DRIVER(LV8729)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 500
+  #elif HAS_DRIVER(A5984)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 400
+  #elif HAS_DRIVER(A4988)
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 200
+  #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 20
+  #else
+    #define MINIMUM_STEPPER_POST_DIR_DELAY 0   // Expect at least 10µS since one Stepper ISR must transpire
+  #endif
+#endif
+
+#ifndef MINIMUM_STEPPER_PRE_DIR_DELAY
+  #define MINIMUM_STEPPER_PRE_DIR_DELAY MINIMUM_STEPPER_POST_DIR_DELAY
+#endif
+
+#ifndef MINIMUM_STEPPER_PULSE
+  #if HAS_DRIVER(TB6560)
+    #define MINIMUM_STEPPER_PULSE 30
+  #elif HAS_DRIVER(TB6600)
+    #define MINIMUM_STEPPER_PULSE 3
+  #elif HAS_DRIVER(DRV8825)
+    #define MINIMUM_STEPPER_PULSE 2
+  #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
+    #define MINIMUM_STEPPER_PULSE 1
+  #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
+    #define MINIMUM_STEPPER_PULSE 0
+  #elif HAS_DRIVER(LV8729)
+    #define MINIMUM_STEPPER_PULSE 0
+  #else
+    #define MINIMUM_STEPPER_PULSE 2
+  #endif
+#endif
+
+#ifndef MAXIMUM_STEPPER_RATE
+  #if HAS_DRIVER(TB6560)
+    #define MAXIMUM_STEPPER_RATE 15000
+  #elif HAS_DRIVER(TB6600)
+    #define MAXIMUM_STEPPER_RATE 150000
+  #elif HAS_DRIVER(DRV8825)
+    #define MAXIMUM_STEPPER_RATE 250000
+  #elif HAS_DRIVER(A4988)
+    #define MAXIMUM_STEPPER_RATE 500000
+  #elif HAS_DRIVER(LV8729)
+    #define MAXIMUM_STEPPER_RATE 1000000
+  #elif HAS_TRINAMIC_CONFIG || HAS_TRINAMIC_STANDALONE
+    #define MAXIMUM_STEPPER_RATE 5000000
+  #else
+    #define MAXIMUM_STEPPER_RATE 250000
+  #endif
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 159aefa5d5fd..9ea298f02d46 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -30,6 +30,29 @@
   // Extras for CI testing
 #endif
 
+// Linear advance uses Jerk since E is an isolated axis
+#if DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE)
+  #define HAS_LINEAR_E_JERK 1
+#endif
+
+// Determine which type of 'EEPROM' is in use
+#if ENABLED(EEPROM_SETTINGS)
+  // EEPROM type may be defined by compile flags, configs, HALs, or pins
+  // Set additional flags to let HALs choose in their Conditionals_post.h
+  #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && ANY(I2C_EEPROM, SPI_EEPROM, QSPI_EEPROM)
+    #define USE_WIRED_EEPROM    1
+  #else
+    #define USE_FALLBACK_EEPROM 1
+  #endif
+#else
+  #undef I2C_EEPROM
+  #undef SPI_EEPROM
+  #undef QSPI_EEPROM
+  #undef SDCARD_EEPROM_EMULATION
+  #undef SRAM_EEPROM_EMULATION
+  #undef FLASH_EEPROM_EMULATION
+#endif
+
 #ifdef TEENSYDUINO
   #undef max
   #define max(a,b) ((a)>(b)?(a):(b))
@@ -40,9 +63,6 @@
   #define NOT_A_PIN 0 // For PINS_DEBUGGING
 #endif
 
-#define HAS_CLASSIC_JERK (ENABLED(CLASSIC_JERK) || IS_KINEMATIC)
-#define HAS_CLASSIC_E_JERK (ENABLED(CLASSIC_JERK) || DISABLED(LIN_ADVANCE))
-
 /**
  * Axis lengths and center
  */
@@ -66,13 +86,8 @@
 // Define center values for future use
 #define _X_HALF_BED ((X_BED_SIZE) / 2)
 #define _Y_HALF_BED ((Y_BED_SIZE) / 2)
-#if ENABLED(BED_CENTER_AT_0_0)
-  #define X_CENTER 0
-  #define Y_CENTER 0
-#else
-  #define X_CENTER _X_HALF_BED
-  #define Y_CENTER _Y_HALF_BED
-#endif
+#define X_CENTER TERN(BED_CENTER_AT_0_0, 0, _X_HALF_BED)
+#define Y_CENTER TERN(BED_CENTER_AT_0_0, 0, _Y_HALF_BED)
 
 // Get the linear boundaries of the bed
 #define X_MIN_BED (X_CENTER - _X_HALF_BED)
@@ -95,10 +110,18 @@
 /**
  * CoreXY, CoreXZ, and CoreYZ - and their reverse
  */
-#define CORE_IS_XY EITHER(COREXY, COREYX)
-#define CORE_IS_XZ EITHER(COREXZ, COREZX)
-#define CORE_IS_YZ EITHER(COREYZ, COREZY)
-#define IS_CORE (CORE_IS_XY || CORE_IS_XZ || CORE_IS_YZ)
+#if EITHER(COREXY, COREYX)
+  #define CORE_IS_XY 1
+#endif
+#if EITHER(COREXZ, COREZX)
+  #define CORE_IS_XZ 1
+#endif
+#if EITHER(COREYZ, COREZY)
+  #define CORE_IS_YZ 1
+#endif
+#if CORE_IS_XY || CORE_IS_XZ || CORE_IS_YZ
+  #define IS_CORE 1
+#endif
 #if IS_CORE
   #if CORE_IS_XY
     #define CORE_AXIS_1 A_AXIS
@@ -113,12 +136,21 @@
     #define CORE_AXIS_1 B_AXIS
     #define CORE_AXIS_2 C_AXIS
   #endif
-  #if ANY(COREYX, COREZX, COREZY)
-    #define CORESIGN(n) (-(n))
+  #define CORESIGN(n) (ANY(COREYX, COREZX, COREZY) ? (-(n)) : (n))
+#endif
+
+// Calibration codes only for non-core axes
+#if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE)
+  #if IS_CORE
+    #define X_AXIS_INDEX 0
+    #define Y_AXIS_INDEX 1
+    #define Z_AXIS_INDEX 2
+    #define CAN_CALIBRATE(A,B) (A##_AXIS_INDEX == B##_INDEX)
   #else
-    #define CORESIGN(n) (n)
+    #define CAN_CALIBRATE(...) 1
   #endif
 #endif
+#define AXIS_CAN_CALIBRATE(A) CAN_CALIBRATE(A,NORMAL_AXIS)
 
 /**
  * No adjustable bed on non-cartesians
@@ -142,33 +174,23 @@
  */
 #ifdef MANUAL_X_HOME_POS
   #define X_HOME_POS MANUAL_X_HOME_POS
-#elif ENABLED(BED_CENTER_AT_0_0)
-  #if ENABLED(DELTA)
-    #define X_HOME_POS 0
-  #else
-    #define X_HOME_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
-  #endif
 #else
-  #if ENABLED(DELTA)
-    #define X_HOME_POS (X_MIN_POS + (X_BED_SIZE) * 0.5)
+  #define X_END_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
+  #if ENABLED(BED_CENTER_AT_0_0)
+    #define X_HOME_POS TERN(DELTA, 0, X_END_POS)
   #else
-    #define X_HOME_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
+    #define X_HOME_POS TERN(DELTA, X_MIN_POS + (X_BED_SIZE) * 0.5, X_END_POS)
   #endif
 #endif
 
 #ifdef MANUAL_Y_HOME_POS
   #define Y_HOME_POS MANUAL_Y_HOME_POS
-#elif ENABLED(BED_CENTER_AT_0_0)
-  #if ENABLED(DELTA)
-    #define Y_HOME_POS 0
-  #else
-    #define Y_HOME_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
-  #endif
 #else
-  #if ENABLED(DELTA)
-    #define Y_HOME_POS (Y_MIN_POS + (Y_BED_SIZE) * 0.5)
+  #define Y_END_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
+  #if ENABLED(BED_CENTER_AT_0_0)
+    #define Y_HOME_POS TERN(DELTA, 0, Y_END_POS)
   #else
-    #define Y_HOME_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
+    #define Y_HOME_POS TERN(DELTA, Y_MIN_POS + (Y_BED_SIZE) * 0.5, Y_END_POS)
   #endif
 #endif
 
@@ -271,7 +293,10 @@
   #define _LCD_CONTRAST_INIT  17
 #endif
 
-#define HAS_LCD_CONTRAST defined(_LCD_CONTRAST_INIT)
+#ifdef _LCD_CONTRAST_INIT
+  #define HAS_LCD_CONTRAST 1
+#endif
+
 #if HAS_LCD_CONTRAST
   #ifndef LCD_CONTRAST_MIN
     #ifdef _LCD_CONTRAST_MIN
@@ -298,10 +323,18 @@
 #endif
 
 /**
- * Override here because this is set in Configuration_adv.h
+ * Override the SD_DETECT_STATE set in Configuration_adv.h
  */
-#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && !(defined(ARDUINO_GRAND_CENTRAL_M4) && SD_CONNECTION_IS(ONBOARD))
-  #undef SD_DETECT_INVERTED
+#if ENABLED(SDSUPPORT)
+  #if HAS_LCD_MENU && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+    #undef SD_DETECT_STATE
+    #if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+      #define SD_DETECT_STATE HIGH
+    #endif
+  #endif
+  #ifndef SD_DETECT_STATE
+    #define SD_DETECT_STATE LOW
+  #endif
 #endif
 
 /**
@@ -579,99 +612,6 @@
   HEATER_0_USES_THERMISTOR, HEATER_1_USES_THERMISTOR, HEATER_2_USES_THERMISTOR, HEATER_3_USES_THERMISTOR, \
   HEATER_4_USES_THERMISTOR, HEATER_5_USES_THERMISTOR, HEATER_6_USES_THERMISTOR, HEATER_7_USES_THERMISTOR )
 
-/**
- * Default hotend offsets, if not defined
- */
-#if HAS_HOTEND_OFFSET
-  #ifndef HOTEND_OFFSET_X
-    #define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
-  #endif
-  #ifndef HOTEND_OFFSET_Y
-    #define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
-  #endif
-  #ifndef HOTEND_OFFSET_Z
-    #define HOTEND_OFFSET_Z { 0 } // Z offsets for each extruder
-  #endif
-#endif
-
-/**
- * ARRAY_BY_EXTRUDERS based on EXTRUDERS
- */
-#define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
-#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1, v1, v1)
-
-/**
- * ARRAY_BY_HOTENDS based on HOTENDS
- */
-#define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
-#define ARRAY_BY_HOTENDS1(v1) ARRAY_BY_HOTENDS(v1, v1, v1, v1, v1, v1)
-
-/**
- * Driver Timings
- * NOTE: Driver timing order is longest-to-shortest duration.
- *       Preserve this ordering when adding new drivers.
- */
-
-#ifndef MINIMUM_STEPPER_POST_DIR_DELAY
-  #if HAS_DRIVER(TB6560)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 15000
-  #elif HAS_DRIVER(TB6600)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 1500
-  #elif HAS_DRIVER(DRV8825)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 650
-  #elif HAS_DRIVER(LV8729)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 500
-  #elif HAS_DRIVER(A5984)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 400
-  #elif HAS_DRIVER(A4988)
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 200
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 20
-  #else
-    #define MINIMUM_STEPPER_POST_DIR_DELAY 0   // Expect at least 10µS since one Stepper ISR must transpire
-  #endif
-#endif
-
-#ifndef MINIMUM_STEPPER_PRE_DIR_DELAY
-  #define MINIMUM_STEPPER_PRE_DIR_DELAY MINIMUM_STEPPER_POST_DIR_DELAY
-#endif
-
-#ifndef MINIMUM_STEPPER_PULSE
-  #if HAS_DRIVER(TB6560)
-    #define MINIMUM_STEPPER_PULSE 30
-  #elif HAS_DRIVER(TB6600)
-    #define MINIMUM_STEPPER_PULSE 3
-  #elif HAS_DRIVER(DRV8825)
-    #define MINIMUM_STEPPER_PULSE 2
-  #elif HAS_DRIVER(A4988) || HAS_DRIVER(A5984)
-    #define MINIMUM_STEPPER_PULSE 1
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
-    #define MINIMUM_STEPPER_PULSE 0
-  #elif HAS_DRIVER(LV8729)
-    #define MINIMUM_STEPPER_PULSE 0
-  #else
-    #define MINIMUM_STEPPER_PULSE 2
-  #endif
-#endif
-
-#ifndef MAXIMUM_STEPPER_RATE
-  #if HAS_DRIVER(TB6560)
-    #define MAXIMUM_STEPPER_RATE 15000
-  #elif HAS_DRIVER(TB6600)
-    #define MAXIMUM_STEPPER_RATE 150000
-  #elif HAS_DRIVER(DRV8825)
-    #define MAXIMUM_STEPPER_RATE 250000
-  #elif HAS_DRIVER(A4988)
-    #define MAXIMUM_STEPPER_RATE 500000
-  #elif HAS_DRIVER(LV8729)
-    #define MAXIMUM_STEPPER_RATE 1000000
-  #elif HAS_TRINAMIC || HAS_TRINAMIC_STANDALONE
-    #define MAXIMUM_STEPPER_RATE 5000000
-  #else
-    #define MAXIMUM_STEPPER_RATE 250000
-  #endif
-#endif
-
 /**
  * X_DUAL_ENDSTOPS endstop reassignment
  */
@@ -1386,21 +1326,41 @@
 #define HAS_SOLENOID_7    (PIN_EXISTS(SOL7))
 
 // Trinamic Stepper Drivers
-#if HAS_TRINAMIC
-  #define STEALTHCHOP_ENABLED ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
-  #define USE_SENSORLESS EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+#if HAS_TRINAMIC_CONFIG
+  #if ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
+    #define STEALTHCHOP_ENABLED 1
+  #endif
+  #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+    #define USE_SENSORLESS 1
+  #endif
   // Disable Z axis sensorless homing if a probe is used to home the Z axis
   #if HOMING_Z_WITH_PROBE
     #undef Z_STALL_SENSITIVITY
   #endif
-  #define X_SENSORLESS  (AXIS_HAS_STALLGUARD(X)  && defined(X_STALL_SENSITIVITY))
-  #define X2_SENSORLESS (AXIS_HAS_STALLGUARD(X2) && defined(X2_STALL_SENSITIVITY))
-  #define Y_SENSORLESS  (AXIS_HAS_STALLGUARD(Y)  && defined(Y_STALL_SENSITIVITY))
-  #define Y2_SENSORLESS (AXIS_HAS_STALLGUARD(Y2) && defined(Y2_STALL_SENSITIVITY))
-  #define Z_SENSORLESS  (AXIS_HAS_STALLGUARD(Z)  && defined(Z_STALL_SENSITIVITY))
-  #define Z2_SENSORLESS (AXIS_HAS_STALLGUARD(Z2) && defined(Z2_STALL_SENSITIVITY))
-  #define Z3_SENSORLESS (AXIS_HAS_STALLGUARD(Z3) && defined(Z3_STALL_SENSITIVITY))
-  #define Z4_SENSORLESS (AXIS_HAS_STALLGUARD(Z4) && defined(Z4_STALL_SENSITIVITY))
+  #if defined(X_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(X)
+    #define X_SENSORLESS 1
+  #endif
+  #if defined(X2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(X2)
+    #define X2_SENSORLESS 1
+  #endif
+  #if defined(Y_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(Y)
+    #define Y_SENSORLESS 1
+  #endif
+  #if defined(Y2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y2)
+    #define Y2_SENSORLESS 1
+  #endif
+  #if defined(Z_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(Z)
+    #define Z_SENSORLESS 1
+  #endif
+  #if defined(Z2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z2)
+    #define Z2_SENSORLESS 1
+  #endif
+  #if defined(Z3_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z3)
+    #define Z3_SENSORLESS 1
+  #endif
+  #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
+    #define Z4_SENSORLESS 1
+  #endif
   #if ENABLED(SPI_ENDSTOPS)
     #define X_SPI_SENSORLESS X_SENSORLESS
     #define Y_SPI_SENSORLESS Y_SENSORLESS
@@ -1484,23 +1444,48 @@
 #define HAS_HEATER_BED  (PIN_EXISTS(HEATER_BED))
 
 // Shorthand for common combinations
-#define HAS_HEATED_BED (HAS_TEMP_BED && HAS_HEATER_BED)
-#define BED_OR_CHAMBER (HAS_HEATED_BED || HAS_TEMP_CHAMBER)
-#define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE)
-#define HAS_HEATED_CHAMBER (HAS_TEMP_CHAMBER && PIN_EXISTS(HEATER_CHAMBER))
+#if HAS_TEMP_BED && HAS_HEATER_BED
+  #define HAS_HEATED_BED 1
+#endif
+#if HAS_HEATED_BED || HAS_TEMP_CHAMBER
+  #define BED_OR_CHAMBER 1
+#endif
+#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE
+  #define HAS_TEMP_SENSOR 1
+#endif
+#if HAS_TEMP_CHAMBER && PIN_EXISTS(HEATER_CHAMBER)
+  #define HAS_HEATED_CHAMBER 1
+#endif
 
 // PID heating
 #if !HAS_HEATED_BED
   #undef PIDTEMPBED
 #endif
-#define HAS_PID_HEATING EITHER(PIDTEMP, PIDTEMPBED)
-#define HAS_PID_FOR_BOTH BOTH(PIDTEMP, PIDTEMPBED)
+#if EITHER(PIDTEMP, PIDTEMPBED)
+  #define HAS_PID_HEATING 1
+#endif
+#if BOTH(PIDTEMP, PIDTEMPBED)
+  #define HAS_PID_FOR_BOTH 1
+#endif
 
 // Thermal protection
-#define HAS_THERMALLY_PROTECTED_BED (HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED))
-#define WATCH_HOTENDS (ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0)
-#define WATCH_BED (HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0)
-#define WATCH_CHAMBER (HAS_HEATED_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER) && WATCH_CHAMBER_TEMP_PERIOD > 0)
+#if HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED)
+  #define HAS_THERMALLY_PROTECTED_BED 1
+#endif
+#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
+  #define WATCH_HOTENDS 1
+#endif
+#if HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0
+  #define WATCH_BED 1
+#endif
+#if HAS_HEATED_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER) && WATCH_CHAMBER_TEMP_PERIOD > 0
+  #define WATCH_CHAMBER 1
+#endif
+#if  (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) \
+  && (ENABLED(THERMAL_PROTECTION_BED)     || !HAS_HEATED_BED) \
+  && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER)
+  #define THERMALLY_SAFE 1
+#endif
 
 // Auto fans
 #define HAS_AUTO_FAN_0 (HOTENDS > 0 && PIN_EXISTS(E0_AUTO_FAN))
@@ -1522,6 +1507,7 @@
 #if !HAS_TEMP_SENSOR
   #undef AUTO_REPORT_TEMPERATURES
 #endif
+#define HAS_AUTO_REPORTING EITHER(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS)
 
 #if !HAS_AUTO_CHAMBER_FAN || AUTO_CHAMBER_IS_E
   #undef AUTO_POWER_CHAMBER_FAN
@@ -1550,22 +1536,48 @@
 #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
 
 // User Interface
-#define HAS_HOME        (PIN_EXISTS(HOME))
-#define HAS_KILL        (PIN_EXISTS(KILL))
-#define HAS_SUICIDE     (PIN_EXISTS(SUICIDE))
-#define HAS_PHOTOGRAPH  (PIN_EXISTS(PHOTOGRAPH))
-#define HAS_BUZZER      (PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER))
-#define USE_BEEPER      (HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER))
-#define HAS_CASE_LIGHT  (PIN_EXISTS(CASE_LIGHT) && ENABLED(CASE_LIGHT_ENABLE))
+#if PIN_EXISTS(HOME)
+  #define HAS_HOME 1
+#endif
+#if PIN_EXISTS(KILL)
+  #define HAS_KILL 1
+#endif
+#if PIN_EXISTS(SUICIDE)
+  #define HAS_SUICIDE 1
+#endif
+#if PIN_EXISTS(PHOTOGRAPH)
+  #define HAS_PHOTOGRAPH 1
+#endif
+#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+  #define HAS_BUZZER 1
+#endif
+#if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+  #define USE_BEEPER 1
+#endif
+#if PIN_EXISTS(CASE_LIGHT) && ENABLED(CASE_LIGHT_ENABLE)
+  #define HAS_CASE_LIGHT 1
+#endif
 
 // Digital control
-#define HAS_STEPPER_RESET     (PIN_EXISTS(STEPPER_RESET))
-#define HAS_DIGIPOTSS         (PIN_EXISTS(DIGIPOTSS))
-#define HAS_MOTOR_CURRENT_PWM ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
+#if PIN_EXISTS(STEPPER_RESET)
+  #define HAS_STEPPER_RESET 1
+#endif
+#if PIN_EXISTS(DIGIPOTSS)
+  #define HAS_DIGIPOTSS 1
+#endif
+#if  ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
+  #define HAS_MOTOR_CURRENT_PWM 1
+#endif
 
-#define HAS_SOME_Z_MICROSTEPS (HAS_Z_MICROSTEPS || HAS_Z2_MICROSTEPS || HAS_Z3_MICROSTEPS || HAS_Z4_MICROSTEPS)
-#define HAS_SOME_E_MICROSTEPS (HAS_E0_MICROSTEPS || HAS_E1_MICROSTEPS || HAS_E2_MICROSTEPS || HAS_E3_MICROSTEPS || HAS_E4_MICROSTEPS || HAS_E5_MICROSTEPS || HAS_E6_MICROSTEPS || HAS_E7_MICROSTEPS)
-#define HAS_MICROSTEPS (HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS || HAS_Y_MICROSTEPS || HAS_Y2_MICROSTEPS || HAS_SOME_Z_MICROSTEPS || HAS_SOME_E_MICROSTEPS)
+#if HAS_Z_MICROSTEPS || HAS_Z2_MICROSTEPS || HAS_Z3_MICROSTEPS || HAS_Z4_MICROSTEPS
+  #define HAS_SOME_Z_MICROSTEPS 1
+#endif
+#if HAS_E0_MICROSTEPS || HAS_E1_MICROSTEPS || HAS_E2_MICROSTEPS || HAS_E3_MICROSTEPS || HAS_E4_MICROSTEPS || HAS_E5_MICROSTEPS || HAS_E6_MICROSTEPS || HAS_E7_MICROSTEPS
+  #define HAS_SOME_E_MICROSTEPS 1
+#endif
+#if HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS || HAS_Y_MICROSTEPS || HAS_Y2_MICROSTEPS || HAS_SOME_Z_MICROSTEPS || HAS_SOME_E_MICROSTEPS
+  #define HAS_MICROSTEPS 1
+#endif
 
 #if HAS_MICROSTEPS
 
@@ -1618,20 +1630,6 @@
 
 #endif // HAS_MICROSTEPS
 
-#if !HAS_TEMP_SENSOR
-  #undef AUTO_REPORT_TEMPERATURES
-#endif
-
-#define HAS_AUTO_REPORTING EITHER(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS)
-
-/**
- * This setting is also used by M109 when trying to calculate
- * a ballpark safe margin to prevent wait-forever situation.
- */
-#ifndef EXTRUDE_MINTEMP
-  #define EXTRUDE_MINTEMP 170
-#endif
-
 /**
  * Heater signal inversion defaults
  */
@@ -1870,26 +1868,6 @@
   #endif
 #endif // SKEW_CORRECTION
 
-/**
- * Set granular options based on the specific type of leveling
- */
-#define UBL_SEGMENTED   BOTH(AUTO_BED_LEVELING_UBL, DELTA)
-#define ABL_PLANAR      EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
-#define ABL_GRID        EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
-#define HAS_ABL_NOT_UBL (ABL_PLANAR || ABL_GRID)
-#define HAS_ABL_OR_UBL  (HAS_ABL_NOT_UBL || ENABLED(AUTO_BED_LEVELING_UBL))
-#define HAS_LEVELING    (HAS_ABL_OR_UBL || ENABLED(MESH_BED_LEVELING))
-#define HAS_AUTOLEVEL   (HAS_ABL_OR_UBL && DISABLED(PROBE_MANUALLY))
-#define HAS_MESH        ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
-#define PLANNER_LEVELING      (HAS_LEVELING && DISABLED(AUTO_BED_LEVELING_UBL))
-#define HAS_PROBING_PROCEDURE (HAS_ABL_OR_UBL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
-#define HAS_POSITION_MODIFIERS (ENABLED(FWRETRACT) || HAS_LEVELING || ENABLED(SKEW_CORRECTION))
-#define NEEDS_THREE_PROBE_POINTS EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
-
-#if ENABLED(AUTO_BED_LEVELING_UBL)
-  #undef LCD_BED_LEVELING
-#endif
-
 /**
  * Heater, Fan, and Probe interactions
  */
@@ -2014,8 +1992,8 @@
   #undef MESH_MAX_Y
 #endif
 
-#if (defined(PROBE_PT_1_X) && defined(PROBE_PT_2_X) && defined(PROBE_PT_3_X) && defined(PROBE_PT_1_Y) && defined(PROBE_PT_2_Y) && defined(PROBE_PT_3_Y))
-  #define HAS_FIXED_3POINT
+#if defined(PROBE_PT_1_X) && defined(PROBE_PT_2_X) && defined(PROBE_PT_3_X) && defined(PROBE_PT_1_Y) && defined(PROBE_PT_2_Y) && defined(PROBE_PT_3_Y)
+  #define HAS_FIXED_3POINT 1
 #endif
 
 /**
@@ -2053,10 +2031,10 @@
  * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
  */
 #ifndef Z_HOMING_HEIGHT
-  #ifndef Z_CLEARANCE_BETWEEN_PROBES
-    #define Z_HOMING_HEIGHT 0
-  #else
+  #ifdef Z_CLEARANCE_BETWEEN_PROBES
     #define Z_HOMING_HEIGHT Z_CLEARANCE_BETWEEN_PROBES
+  #else
+    #define Z_HOMING_HEIGHT 0
   #endif
 #endif
 
@@ -2084,15 +2062,16 @@
 #endif
 
 // Updated G92 behavior shifts the workspace
-#define HAS_POSITION_SHIFT DISABLED(NO_WORKSPACE_OFFSETS)
-// The home offset also shifts the coordinate space
-#define HAS_HOME_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && IS_CARTESIAN)
-// The SCARA home offset applies only on G28
-#define HAS_SCARA_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && IS_SCARA)
-// Cumulative offset to workspace to save some calculation
-#define HAS_WORKSPACE_OFFSET (HAS_POSITION_SHIFT && HAS_HOME_OFFSET)
-// M206 sets the home offset for Cartesian machines
-#define HAS_M206_COMMAND (HAS_HOME_OFFSET && !IS_SCARA)
+#if DISABLED(NO_WORKSPACE_OFFSETS)
+  #define HAS_POSITION_SHIFT 1
+  #if IS_CARTESIAN
+    #define HAS_HOME_OFFSET 1       // The home offset also shifts the coordinate space
+    #define HAS_WORKSPACE_OFFSET 1  // Cumulative offset to workspace to save some calculation
+    #define HAS_M206_COMMAND 1      // M206 sets the home offset for Cartesian machines
+  #elif IS_SCARA
+    #define HAS_SCARA_OFFSET 1      // The SCARA home offset applies only on G28
+  #endif
+#endif
 
 // LCD timeout to status screen default is 15s
 #ifndef LCD_TIMEOUT_TO_STATUS
@@ -2115,34 +2094,7 @@
 #endif
 
 // Number of VFAT entries used. Each entry has 13 UTF-16 characters
-#if ENABLED(SCROLL_LONG_FILENAMES)
-  #define MAX_VFAT_ENTRIES (5)
-#else
-  #define MAX_VFAT_ENTRIES (2)
-#endif
-
-// Set defaults for unspecified LED user colors
-#if ENABLED(LED_CONTROL_MENU)
-  #ifndef LED_USER_PRESET_RED
-    #define LED_USER_PRESET_RED       255
-  #endif
-  #ifndef LED_USER_PRESET_GREEN
-    #define LED_USER_PRESET_GREEN     255
-  #endif
-  #ifndef LED_USER_PRESET_BLUE
-    #define LED_USER_PRESET_BLUE      255
-  #endif
-  #ifndef LED_USER_PRESET_WHITE
-    #define LED_USER_PRESET_WHITE     0
-  #endif
-  #ifndef LED_USER_PRESET_BRIGHTNESS
-    #ifdef NEOPIXEL_BRIGHTNESS
-      #define LED_USER_PRESET_BRIGHTNESS NEOPIXEL_BRIGHTNESS
-    #else
-      #define LED_USER_PRESET_BRIGHTNESS 255
-    #endif
-  #endif
-#endif
+#define MAX_VFAT_ENTRIES TERN(SCROLL_LONG_FILENAMES, 5, 2)
 
 // Nozzle park for Delta
 #if BOTH(NOZZLE_PARK_FEATURE, DELTA)
@@ -2154,9 +2106,8 @@
 // on boards where SD card and LCD display share the same SPI bus
 // because of a bug in the shared SPI implementation. (See #8122)
 #if defined(TARGET_LPC1768) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && (SCK_PIN == LCD_PINS_D4)
-  #define SDCARD_SORT_ALPHA         // Keeps one directory level in RAM. Changing
-                                    // directory levels still glitches the screen,
-                                    // but the following LCD update cleans it up.
+  #define SDCARD_SORT_ALPHA         // Keep one directory level in RAM. Changing directory levels
+                                    // may still glitch the screen, but LCD updates clean it up.
   #undef SDSORT_LIMIT
   #undef SDSORT_USES_RAM
   #undef SDSORT_USES_STACK
@@ -2180,31 +2131,24 @@
 #endif
 
 // Defined here to catch the above defines
-#if ENABLED(SDCARD_SORT_ALPHA)
-  #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
+#if ENABLED(SDCARD_SORT_ALPHA) && (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
+  #define HAS_FOLDER_SORTING 1
 #endif
 
-// If platform requires early initialization of watchdog to properly boot
-#define EARLY_WATCHDOG (ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM))
-
 #if HAS_SPI_LCD
   // Get LCD character width/height, which may be overridden by pins, configs, etc.
   #ifndef LCD_WIDTH
     #if HAS_GRAPHICAL_LCD
       #define LCD_WIDTH 21
-    #elif ENABLED(ULTIPANEL)
-      #define LCD_WIDTH 20
     #else
-      #define LCD_WIDTH 16
+      #define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
     #endif
   #endif
   #ifndef LCD_HEIGHT
     #if HAS_GRAPHICAL_LCD
       #define LCD_HEIGHT 5
-    #elif ENABLED(ULTIPANEL)
-      #define LCD_HEIGHT 4
     #else
-      #define LCD_HEIGHT 2
+      #define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)
     #endif
   #endif
 #endif
@@ -2227,10 +2171,3 @@
 #if !NUM_SERIAL
   #undef BAUD_RATE_GCODE
 #endif
-
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
-  #undef Z_STEPPER_ALIGN_AMP
-#endif
-#ifndef Z_STEPPER_ALIGN_AMP
-  #define Z_STEPPER_ALIGN_AMP 1.0
-#endif
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index d32506702e2f..c1655015e05e 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -35,11 +35,12 @@
 #include "Conditionals_post.h"
 #include HAL_PATH(../HAL, inc/Conditionals_post.h)
 
+#include "../core/types.h"  // Ahead of sanity-checks
+
 #include "SanityCheck.h"
 #include HAL_PATH(../HAL, inc/SanityCheck.h)
 
 // Include all core headers
-#include "../core/types.h"
 #include "../core/language.h"
 #include "../core/utility.h"
 #include "../core/serial.h"
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
index 1385f9e19fa1..d84f75120026 100644
--- a/Marlin/src/inc/MarlinConfigPre.h
+++ b/Marlin/src/inc/MarlinConfigPre.h
@@ -37,12 +37,8 @@
 #include "../../Configuration.h"
 
 #ifdef CUSTOM_VERSION_FILE
-  #if defined(__has_include)
-    #if __has_include(XSTR(../../CUSTOM_VERSION_FILE))
-      #include XSTR(../../CUSTOM_VERSION_FILE)
-    #endif
-  #else
-    #include XSTR(../../CUSTOM_VERSION_FILE)
+  #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
+    #include STRINGIFY(../../CUSTOM_VERSION_FILE)
   #endif
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f340e758abef..2fd61d4be10e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -34,6 +34,37 @@
   #error "Marlin requires C++11 support (gcc >= 4.7, Arduino IDE >= 1.6.8). Please upgrade your toolchain."
 #endif
 
+// Make sure macros aren't borked
+#define TEST1
+#define TEST2 1
+#define TEST3 0
+#define TEST4 true
+#if ENABLED(TEST0)
+  #error "ENABLED is borked!"
+#endif
+#if DISABLED(TEST1)
+  #error "DISABLED is borked!"
+#endif
+#if !ENABLED(TEST2)
+  #error "ENABLED is borked!"
+#endif
+#if ENABLED(TEST3)
+  #error "ENABLED is borked!"
+#endif
+#if DISABLED(TEST4)
+  #error "DISABLED is borked!"
+#endif
+#if !ANY(TEST1, TEST2, TEST3, TEST4) || ANY(TEST0, TEST3)
+  #error "ANY is borked!"
+#endif
+#if DISABLED(TEST0, TEST1, TEST2, TEST4)
+  #error "DISABLED is borked!"
+#endif
+#undef TEST1
+#undef TEST2
+#undef TEST3
+#undef TEST4
+
 /**
  * We try our best to include sanity checks for all changed configuration
  * directives because users have a tendency to use outdated config files with
@@ -68,7 +99,9 @@
 #elif defined(X_HOME_RETRACT_MM)
   #error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM."
 #elif defined(SDCARDDETECTINVERTED)
-  #error "SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration."
+  #error "SDCARDDETECTINVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
+#elif defined(SD_DETECT_INVERTED)
+  #error "SD_DETECT_INVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
 #elif defined(BTENABLED)
   #error "BTENABLED is now BLUETOOTH. Please update your configuration."
 #elif defined(CUSTOM_MENDEL_NAME)
@@ -237,6 +270,10 @@
   #error "Replace SLED_PIN with SOL1_PIN (applies to both Z_PROBE_SLED and SOLENOID_PROBE)."
 #elif defined(CONTROLLERFAN_PIN)
   #error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SPEED)
+  #error "CONTROLLERFAN_SPEED is now CONTROLLERFAN_SPEED_ACTIVE. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SECS)
+  #error "CONTROLLERFAN_SECS is now CONTROLLERFAN_IDLE_TIME. Please update your Configuration_adv.h."
 #elif defined(MIN_RETRACT)
   #error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h."
 #elif defined(ADVANCE)
@@ -450,6 +487,8 @@
   #error "Z_TRIPLE_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
 #elif defined(Z_QUAD_ENDSTOPS)
   #error "Z_QUAD_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
+#elif defined(DUGS_UI_MOVE_DIS_OPTION)
+  #error "DUGS_UI_MOVE_DIS_OPTION is spelled DGUS_UI_MOVE_DIS_OPTION. Please update Configuration_adv.h."
 #endif
 
 /**
@@ -1237,7 +1276,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
    * Require some kind of probe for bed leveling and probe testing
    */
   #if HAS_ABL_NOT_UBL && !PROBE_SELECTED
-    #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
+    #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
   #endif
 
   #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
@@ -1948,7 +1987,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Auto Fan check for PWM pins
  */
-#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255
+#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(NO_COMPILE_TIME_PWM)
   #define AF_ERR_SUFF "_AUTO_FAN_PIN is not a PWM pin. Set EXTRUDER_AUTO_FAN_SPEED to 255."
   #if HAS_AUTO_FAN_0
     static_assert(PWM_PIN(E0_AUTO_FAN_PIN), "E0" AF_ERR_SUFF);
@@ -1958,9 +1997,24 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     static_assert(PWM_PIN(E2_AUTO_FAN_PIN), "E2" AF_ERR_SUFF);
   #elif HAS_AUTO_FAN_3
     static_assert(PWM_PIN(E3_AUTO_FAN_PIN), "E3" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_4
+    static_assert(PWM_PIN(E4_AUTO_FAN_PIN), "E4" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_5
+    static_assert(PWM_PIN(E5_AUTO_FAN_PIN), "E5" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_6
+    static_assert(PWM_PIN(E6_AUTO_FAN_PIN), "E6" AF_ERR_SUFF);
+  #elif HAS_AUTO_FAN_7
+    static_assert(PWM_PIN(E7_AUTO_FAN_PIN), "E7" AF_ERR_SUFF);
   #endif
 #endif
 
+/**
+ * Make sure only one EEPROM type is enabled
+ */
+#if ENABLED(EEPROM_SETTINGS) && 1 < ENABLED(SDCARD_EEPROM_EMULATION) + ENABLED(FLASH_EEPROM_EMULATION) + ENABLED(SRAM_EEPROM_EMULATION)
+  #error "Please select only one of SDCARD, FLASH, or SRAM_EEPROM_EMULATION."
+#endif
+
 /**
  * Make sure only one display is enabled
  */
@@ -2057,6 +2111,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "An SPI driven TMC driver on Z2 requires Z2_CS_PIN."
 #elif INVALID_TMC_SPI(Z3)
   #error "An SPI driven TMC driver on Z3 requires Z3_CS_PIN."
+#elif INVALID_TMC_SPI(Z4)
+  #error "An SPI driven TMC driver on Z4 requires Z4_CS_PIN."
 #elif INVALID_TMC_SPI(E0)
   #error "An SPI driven TMC driver on E0 requires E0_CS_PIN."
 #elif INVALID_TMC_SPI(E1)
@@ -2094,6 +2150,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TMC2208 or TMC2209 on Z2 requires Z2_HARDWARE_SERIAL or Z2_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(Z3)
   #error "TMC2208 or TMC2209 on Z3 requires Z3_HARDWARE_SERIAL or Z3_SERIAL_(RX|TX)_PIN."
+#elif INVALID_TMC_UART(Z4)
+  #error "TMC2208 or TMC2209 on Z4 requires Z4_HARDWARE_SERIAL or Z4_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(E0)
   #error "TMC2208 or TMC2209 on E0 requires E0_HARDWARE_SERIAL or E0_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(E1)
@@ -2131,6 +2189,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   INVALID_TMC_ADDRESS(Z2);
 #elif AXIS_DRIVER_TYPE_Z3(TMC2209)
   INVALID_TMC_ADDRESS(Z3);
+#elif AXIS_DRIVER_TYPE_Z4(TMC2209)
+  INVALID_TMC_ADDRESS(Z4);
 #elif AXIS_DRIVER_TYPE_E0(TMC2209)
   INVALID_TMC_ADDRESS(E0);
 #elif AXIS_DRIVER_TYPE_E1(TMC2209)
@@ -2150,6 +2210,47 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 #undef INVALID_TMC_ADDRESS
 
+#define _TMC_MICROSTEP_IS_VALID(MS) (MS == 0 || MS == 2 || MS == 4 || MS == 8 || MS == 16 || MS == 32 || MS == 64 || MS == 128 || MS == 256)
+#define TMC_MICROSTEP_IS_VALID(M) (!AXIS_IS_TMC(M) || _TMC_MICROSTEP_IS_VALID(M##_MICROSTEPS))
+#define INVALID_TMC_MS(ST) static_assert(0, "Invalid " STRINGIFY(ST) "_MICROSTEPS. Valid values are 0, 2, 4, 8, 16, 32, 64, 128, and 256.")
+
+#if !TMC_MICROSTEP_IS_VALID(X)
+  INVALID_TMC_MS(X);
+#elif !TMC_MICROSTEP_IS_VALID(Y)
+  INVALID_TMC_MS(Y)
+#elif !TMC_MICROSTEP_IS_VALID(Z)
+  INVALID_TMC_MS(Z)
+#elif !TMC_MICROSTEP_IS_VALID(X2)
+  INVALID_TMC_MS(X2);
+#elif !TMC_MICROSTEP_IS_VALID(Y2)
+  INVALID_TMC_MS(Y2)
+#elif !TMC_MICROSTEP_IS_VALID(Z2)
+  INVALID_TMC_MS(Z2)
+#elif !TMC_MICROSTEP_IS_VALID(Z3)
+  INVALID_TMC_MS(Z3)
+#elif !TMC_MICROSTEP_IS_VALID(Z4)
+  INVALID_TMC_MS(Z4)
+#elif !TMC_MICROSTEP_IS_VALID(E0)
+  INVALID_TMC_MS(E0)
+#elif !TMC_MICROSTEP_IS_VALID(E1)
+  INVALID_TMC_MS(E1)
+#elif !TMC_MICROSTEP_IS_VALID(E2)
+  INVALID_TMC_MS(E2)
+#elif !TMC_MICROSTEP_IS_VALID(E3)
+  INVALID_TMC_MS(E3)
+#elif !TMC_MICROSTEP_IS_VALID(E4)
+  INVALID_TMC_MS(E4)
+#elif !TMC_MICROSTEP_IS_VALID(E5)
+  INVALID_TMC_MS(E5)
+#elif !TMC_MICROSTEP_IS_VALID(E6)
+  INVALID_TMC_MS(E6)
+#elif !TMC_MICROSTEP_IS_VALID(E7)
+  INVALID_TMC_MS(E7)
+#endif
+#undef INVALID_TMC_MS
+#undef TMC_MICROSTEP_IS_VALID
+#undef _TMC_MICROSTEP_IS_VALID
+
 #if ENABLED(DELTA) && (ENABLED(STEALTHCHOP_XY) != ENABLED(STEALTHCHOP_Z))
   #error "STEALTHCHOP_XY and STEALTHCHOP_Z must be the same on DELTA."
 #endif
@@ -2256,17 +2357,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "STEALTHCHOP requires TMC2130, TMC2160, TMC2208, TMC2209, or TMC5160 stepper drivers."
 #endif
 
+/**
+ * TMC SPI Chaining
+ */
 #define IN_CHAIN(A) ((A##_CHAIN_POS > 0) && !HAS_L64XX)
-// TMC SPI Chaining
-#if IN_CHAIN(X) || IN_CHAIN(Y) || IN_CHAIN(Z) || IN_CHAIN(X2) || IN_CHAIN(Y2) || IN_CHAIN(Z2) || IN_CHAIN(Z3) || IN_CHAIN(E0) || IN_CHAIN(E1) || IN_CHAIN(E2) || IN_CHAIN(E3) || IN_CHAIN(E4) || IN_CHAIN(E5)
-  #if  (IN_CHAIN(X)  && !PIN_EXISTS(X_CS) ) || (IN_CHAIN(Y)  && !PIN_EXISTS(Y_CS) ) \
-    || (IN_CHAIN(Z)  && !PIN_EXISTS(Z_CS) ) || (IN_CHAIN(X2) && !PIN_EXISTS(X2_CS)) \
-    || (IN_CHAIN(Y2) && !PIN_EXISTS(Y2_CS)) || (IN_CHAIN(Z2) && !PIN_EXISTS(Z2_CS)) \
-    || (IN_CHAIN(Z3) && !PIN_EXISTS(Z3_CS)) || (IN_CHAIN(E0) && !PIN_EXISTS(E0_CS)) \
-    || (IN_CHAIN(E1) && !PIN_EXISTS(E1_CS)) || (IN_CHAIN(E2) && !PIN_EXISTS(E2_CS)) \
-    || (IN_CHAIN(E3) && !PIN_EXISTS(E3_CS)) || (IN_CHAIN(E4) && !PIN_EXISTS(E4_CS)) \
-    || (IN_CHAIN(E5) && !PIN_EXISTS(E5_CS)) || (IN_CHAIN(E6) && !PIN_EXISTS(E6_CS)) \
-    || (IN_CHAIN(E7) && !PIN_EXISTS(E7_CS))
+#if  IN_CHAIN(X ) || IN_CHAIN(Y ) || IN_CHAIN(Z ) || IN_CHAIN(X2) || IN_CHAIN(Y2) || IN_CHAIN(Z2) || IN_CHAIN(Z3) || IN_CHAIN(Z4) \
+  || IN_CHAIN(E0) || IN_CHAIN(E1) || IN_CHAIN(E2) || IN_CHAIN(E3) || IN_CHAIN(E4) || IN_CHAIN(E5) || IN_CHAIN(E6) || IN_CHAIN(E7)
+  #define BAD_CHAIN(A) (IN_CHAIN(A) && !PIN_EXISTS(A##_CS))
+  #if  BAD_CHAIN(X ) || BAD_CHAIN(Y ) || BAD_CHAIN(Z ) || BAD_CHAIN(X2) || BAD_CHAIN(Y2) || BAD_CHAIN(Z2) || BAD_CHAIN(Z3) || BAD_CHAIN(Z4) \
+    || BAD_CHAIN(E0) || BAD_CHAIN(E1) || BAD_CHAIN(E2) || BAD_CHAIN(E3) || BAD_CHAIN(E4) || BAD_CHAIN(E5) || BAD_CHAIN(E6) || BAD_CHAIN(E7)
     #error "All chained TMC drivers need a CS pin."
   #else
     #if IN_CHAIN(X)
@@ -2300,18 +2399,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #elif IN_CHAIN(E7)
       #define CS_COMPARE E7_CS_PIN
     #endif
-    #if  (IN_CHAIN(X)  && X_CS_PIN  != CS_COMPARE) || (IN_CHAIN(Y)  && Y_CS_PIN  != CS_COMPARE) \
-      || (IN_CHAIN(Z)  && Z_CS_PIN  != CS_COMPARE) || (IN_CHAIN(X2) && X2_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(Y2) && Y2_CS_PIN != CS_COMPARE) || (IN_CHAIN(Z2) && Z2_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(Z3) && Z3_CS_PIN != CS_COMPARE) || (IN_CHAIN(E0) && E0_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E1) && E1_CS_PIN != CS_COMPARE) || (IN_CHAIN(E2) && E2_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E3) && E3_CS_PIN != CS_COMPARE) || (IN_CHAIN(E4) && E4_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E5) && E5_CS_PIN != CS_COMPARE) || (IN_CHAIN(E6) && E6_CS_PIN != CS_COMPARE) \
-      || (IN_CHAIN(E7) && E7_CS_PIN != CS_COMPARE)
+    #define BAD_CS_PIN(A) (IN_CHAIN(A) && A##_CS_PIN != CS_COMPARE)
+    #if  BAD_CS_PIN(X ) || BAD_CS_PIN(Y ) || BAD_CS_PIN(Z ) || BAD_CS_PIN(X2) || BAD_CS_PIN(Y2) || BAD_CS_PIN(Z2) || BAD_CS_PIN(Z3) || BAD_CS_PIN(Z4) \
+      || BAD_CS_PIN(E0) || BAD_CS_PIN(E1) || BAD_CS_PIN(E2) || BAD_CS_PIN(E3) || BAD_CS_PIN(E4) || BAD_CS_PIN(E5) || BAD_CS_PIN(E6) || BAD_CS_PIN(E7)
       #error "All chained TMC drivers must use the same CS pin."
     #endif
+    #undef BAD_CS_PIN
+    #undef CS_COMPARE
   #endif
-  #undef CS_COMPARE
+  #undef BAD_CHAIN
 #endif
 #undef IN_CHAIN
 
@@ -2432,8 +2528,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
     #error "Z_STEPPER_AUTO_ALIGN requires NUM_Z_STEPPER_DRIVERS greater than 1."
   #elif !HAS_BED_PROBE
     #error "Z_STEPPER_AUTO_ALIGN requires a Z-bed probe."
-  #elif ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) && NUM_Z_STEPPER_DRIVERS != 3
-    #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS requires NUM_Z_STEPPER_DRIVERS to be 3."
+  #elif ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) && NUM_Z_STEPPER_DRIVERS < 3
+    #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS requires NUM_Z_STEPPER_DRIVERS to be 3 or 4."
   #endif
 #endif
 
@@ -2557,14 +2653,14 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #endif
 
 #if ENABLED(BACKLASH_COMPENSATION)
-  #if IS_CORE
-    #error "BACKLASH_COMPENSATION is incompatible with CORE kinematics."
-  #endif
   #ifndef BACKLASH_DISTANCE_MM
     #error "BACKLASH_COMPENSATION requires BACKLASH_DISTANCE_MM"
-  #endif
-  #ifndef BACKLASH_CORRECTION
+  #elif !defined(BACKLASH_CORRECTION)
     #error "BACKLASH_COMPENSATION requires BACKLASH_CORRECTION"
+  #elif IS_CORE
+    constexpr float backlash_arr[] = BACKLASH_DISTANCE_MM;
+    static_assert(!backlash_arr[CORE_AXIS_1] && !backlash_arr[CORE_AXIS_2],
+                  "BACKLASH_COMPENSATION can only apply to " STRINGIFY(NORMAL_AXIS) " with your CORE system.");
   #endif
 #endif
 
@@ -2732,3 +2828,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if HAS_TMC_SPI && ALL(MONITOR_DRIVER_STATUS, SDSUPPORT, USES_SHARED_SPI)
   #error "MONITOR_DRIVER_STATUS and SDSUPPORT cannot be used together on boards with shared SPI."
 #endif
+
+// G60/G61 Position Save
+#if SAVED_POSITIONS > 256
+  #error "SAVED_POSITIONS must be an integer from 0 to 256."
+#endif
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b159317103ed..9ec5d3496633 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -25,11 +25,15 @@
  * Release version. Leave the Marlin version or apply a custom scheme.
  */
 #ifndef SHORT_BUILD_VERSION
+<<<<<<< HEAD
 <<<<<<< HEAD
   #define SHORT_BUILD_VERSION "2.0.2"
 =======
   #define SHORT_BUILD_VERSION "2.0.4.4"
 >>>>>>> pr/19
+=======
+  #define SHORT_BUILD_VERSION "2.0.5.3"
+>>>>>>> pr/23
 #endif
 
 /**
@@ -46,11 +50,15 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
+<<<<<<< HEAD
 <<<<<<< HEAD
   #define STRING_DISTRIBUTION_DATE "2020-01-27"
 =======
   #define STRING_DISTRIBUTION_DATE "2020-02-27"
 >>>>>>> pr/19
+=======
+  #define STRING_DISTRIBUTION_DATE "2020-03-31"
+>>>>>>> pr/23
 #endif
 
 /**
@@ -60,7 +68,7 @@
  * to alert users to major changes.
  */
 
-#define MARLIN_HEX_VERSION 020004
+#define MARLIN_HEX_VERSION 020005
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index 7cee7db4b4df..ee025f6585d6 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -102,7 +102,7 @@
 
 static void createChar_P(const char c, const byte * const ptr) {
   byte temp[8];
-  for (uint8_t i = 0; i < 8; i++)
+  LOOP_L_N(i, 8)
     temp[i] = pgm_read_byte(&ptr[i]);
   lcd.createChar(c, temp);
 }
@@ -414,7 +414,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
     else {
       PGM_P p = text;
       int dly = time / _MAX(slen, 1);
-      for (uint8_t i = 0; i <= slen; i++) {
+      LOOP_LE_N(i, slen) {
 
         // Print the text at the correct place
         lcd_put_u8str_max_P(col, line, p, len);
@@ -530,7 +530,7 @@ FORCE_INLINE void _draw_heater_status(const heater_ind_t heater, const char pref
 
   if (prefix >= 0) lcd_put_wchar(prefix);
 
-  lcd_put_u8str(i16tostr3(t1 + 0.5));
+  lcd_put_u8str(i16tostr3rj(t1 + 0.5));
   lcd_put_wchar('/');
 
   #if !HEATER_IDLE_HANDLER
@@ -582,7 +582,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
       #endif
     ));
     if (progress)
-      lcd_put_u8str(ui8tostr3(progress));
+      lcd_put_u8str(ui8tostr3rj(progress));
     else
       lcd_put_u8str_P(PSTR("---"));
     lcd_put_wchar('%');
@@ -631,7 +631,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str_P(PSTR("Dia "));
       lcd_put_u8str(ftostr12ns(filwidth.measured_mm));
       lcd_put_u8str_P(PSTR(" V"));
-      lcd_put_u8str(i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
+      lcd_put_u8str(i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
       lcd_put_wchar('%');
       return;
     }
@@ -829,7 +829,7 @@ void MarlinUI::draw_status_screen() {
                 && !printingIsActive()
               #endif
             ) {
-              xy_pos_t lpos = current_position; toLogical(lpos);
+              const xy_pos_t lpos = current_position.asLogical();
               _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink);
               lcd_put_wchar(' ');
               _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink);
@@ -863,7 +863,7 @@ void MarlinUI::draw_status_screen() {
     #if LCD_HEIGHT > 3
 
       lcd_put_wchar(0, 2, LCD_STR_FEEDRATE[0]);
-      lcd_put_u8str(i16tostr3(feedrate_percentage));
+      lcd_put_u8str(i16tostr3rj(feedrate_percentage));
       lcd_put_wchar('%');
 
       char buffer[14];
@@ -902,7 +902,7 @@ void MarlinUI::draw_status_screen() {
               #endif
             }
           lcd_put_wchar(c);
-          lcd_put_u8str(i16tostr3(per));
+          lcd_put_u8str(i16tostr3rj(per));
           lcd_put_wchar('%');
         #endif
       #endif
@@ -941,7 +941,7 @@ void MarlinUI::draw_status_screen() {
     #endif
 
     lcd_put_wchar(LCD_WIDTH - 9, 1, LCD_STR_FEEDRATE[0]);
-    lcd_put_u8str(i16tostr3(feedrate_percentage));
+    lcd_put_u8str(i16tostr3rj(feedrate_percentage));
     lcd_put_wchar('%');
 
     // ========== Line 3 ==========
@@ -1212,10 +1212,10 @@ void MarlinUI::draw_status_screen() {
         #define _LCD_W_POS 12
         #define _PLOT_X 1
         #define _MAP_X 3
-        #define _LABEL(C,X,Y) lcd_put_u8str(X, Y, C)
-        #define _XLABEL(X,Y) _LABEL("X:",X,Y)
-        #define _YLABEL(X,Y) _LABEL("Y:",X,Y)
-        #define _ZLABEL(X,Y) _LABEL("Z:",X,Y)
+        #define _LABEL(C,X,Y) lcd_put_u8str_P(X, Y, C)
+        #define _XLABEL(X,Y) _LABEL(X_LBL,X,Y)
+        #define _YLABEL(X,Y) _LABEL(Y_LBL,X,Y)
+        #define _ZLABEL(X,Y) _LABEL(Z_LBL,X,Y)
       #else
         #define _LCD_W_POS 8
         #define _PLOT_X 0
@@ -1415,9 +1415,9 @@ void MarlinUI::draw_status_screen() {
        * Print plot position
        */
       lcd_put_wchar(_LCD_W_POS, 0, '(');
-      lcd_put_u8str(ui8tostr3(x_plot));
+      lcd_put_u8str(ui8tostr3rj(x_plot));
       lcd_put_wchar(',');
-      lcd_put_u8str(ui8tostr3(y_plot));
+      lcd_put_u8str(ui8tostr3rj(y_plot));
       lcd_put_wchar(')');
 
       #if LCD_HEIGHT <= 3   // 16x2 or 20x2 display
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index 3656b02e0860..3384f5798aca 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -854,7 +854,9 @@
     };
 
   #endif
-#else // HAS_HEATED_CHAMBER
+#endif
+
+#ifndef STATUS_CHAMBER_WIDTH
   #define STATUS_CHAMBER_WIDTH 0
 #endif
 
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 1ea1424d306b..be414ab30372 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -107,7 +107,7 @@
 #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
 
 FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, const uint8_t ty) {
-  const char *str = i16tostr3(temp);
+  const char *str = i16tostr3rj(temp);
   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]);
   lcd_put_wchar(LCD_STR_DEGREE[0]);
@@ -406,7 +406,7 @@ void MarlinUI::draw_status_screen() {
 
     #if ENABLED(FILAMENT_LCD_DISPLAY)
       strcpy(wstring, ftostr12ns(filwidth.measured_mm));
-      strcpy(mstring, i16tostr3(planner.volumetric_percent(parser.volumetric_enabled)));
+      strcpy(mstring, i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
     #endif
 
     // Progress / elapsed / estimation updates and string formatting to avoid float math on each LCD draw
@@ -438,7 +438,7 @@ void MarlinUI::draw_status_screen() {
               #if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
                 permyriadtostr4(progress)
               #else
-                ui8tostr3(progress / (PROGRESS_SCALE))
+                ui8tostr3rj(progress / (PROGRESS_SCALE))
               #endif
             ));
           }
@@ -448,10 +448,10 @@ void MarlinUI::draw_status_screen() {
         #endif
       }
 
+      constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
       if (ev != lastElapsed) {
         lastElapsed = ev;
-        const bool has_days = (elapsed.value >= 60*60*24L);
-        const uint8_t len = elapsed.toDigital(elapsed_string, has_days);
+        const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L);
         elapsed_x_pos = _SD_INFO_X(len);
 
         #if ENABLED(SHOW_REMAINING_TIME)
@@ -468,8 +468,7 @@ void MarlinUI::draw_status_screen() {
             }
             else {
               duration_t estimation = timeval;
-              const bool has_days = (estimation.value >= 60*60*24L);
-              const uint8_t len = estimation.toDigital(estimation_string, has_days);
+              const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L);
               estimation_x_pos = _SD_INFO_X(len
                 #if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
                   + 1
@@ -564,14 +563,14 @@ void MarlinUI::draw_status_screen() {
   if (PAGE_UNDER(6 + 1 + 12 + 1 + 6 + 1)) {
     // Extruders
     #if DO_DRAW_HOTENDS
-      for (uint8_t e = 0; e < MAX_HOTEND_DRAW; ++e)
+      LOOP_L_N(e, MAX_HOTEND_DRAW)
         _draw_hotend_status((heater_ind_t)e, blink);
     #endif
 
     // Laser / Spindle
     #if DO_DRAW_CUTTER
       if (cutter.power && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) {
-        lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3(cutter.powerPercent(cutter.power)));
+        lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, i16tostr3rj(cutter.powerPercent(cutter.power)));
         lcd_put_wchar('%');
       }
     #endif
@@ -598,7 +597,7 @@ void MarlinUI::draw_status_screen() {
               c = '*';
             }
           #endif
-          lcd_put_u8str(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y, i16tostr3(thermalManager.fanPercent(spd)));
+          lcd_put_u8str(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y, i16tostr3rj(thermalManager.fanPercent(spd)));
           lcd_put_wchar(c);
         }
       }
@@ -652,11 +651,11 @@ void MarlinUI::draw_status_screen() {
           }
         }
         else if (progress_state == 2 && estimation_string[0]) {
-          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "R:");
+          lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, PSTR("R:"));
           lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string);
         }
         else if (elapsed_string[0]) {
-          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, "E:");
+          lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, E_LBL);
           lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
         }
 
@@ -768,7 +767,7 @@ void MarlinUI::draw_status_screen() {
     lcd_put_wchar(3, EXTRAS_2_BASELINE, LCD_STR_FEEDRATE[0]);
 
     set_font(FONT_STATUSMENU);
-    lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3(feedrate_percentage));
+    lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(feedrate_percentage));
     lcd_put_wchar('%');
 
     //
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index f5931917ae08..e623776b31bc 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -209,7 +209,7 @@ void ST7920_Lite_Status_Screen::clear_ddram() {
 
 /* This fills the entire graphics buffer with zeros */
 void ST7920_Lite_Status_Screen::clear_gdram() {
-  for (uint8_t y = 0; y < BUFFER_HEIGHT; y++) {
+  LOOP_L_N(y, BUFFER_HEIGHT) {
     set_gdram_address(0, y);
     begin_data();
     for (uint8_t i = (BUFFER_WIDTH) / 16; i--;) write_word(0);
@@ -407,7 +407,7 @@ void ST7920_Lite_Status_Screen::draw_degree_symbol(uint8_t x, uint8_t y, const b
     const uint8_t x_word  = x >> 1,
                   y_top   = degree_symbol_y_top,
                   y_bot   = y_top + COUNT(degree_symbol);
-    for (uint8_t i = y_top; i < y_bot; i++) {
+    LOOP_S_L_N(i, y_top, y_bot) {
       uint8_t byte = pgm_read_byte(p_bytes++);
       set_gdram_address(x_word, i + y * 16);
       begin_data();
@@ -467,10 +467,10 @@ void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
   const uint8_t char_pcnt  = 100 / width; // How many percent does each 16-bit word represent?
 
   // Draw the progress bar as a bitmap in CGRAM
-  for (uint8_t y = top; y <= bottom; y++) {
+  LOOP_S_LE_N(y, top, bottom) {
     set_gdram_address(left, y);
     begin_data();
-    for (uint8_t x = 0; x < width; x++) {
+    LOOP_L_N(x, width) {
       uint16_t gfx_word = 0x0000;
       if ((x + 1) * char_pcnt <= value)
         gfx_word = 0xFFFF;                                              // Draw completely filled bytes
diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
index b6449bd4ae90..599ee2a9efaf 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
@@ -87,11 +87,11 @@ void clear_graphics_DRAM(u8g_t *u8g, u8g_dev_t *dev) {
   u8g_SetAddress(u8g, dev, 0);         // cmd mode
   u8g_WriteByte(u8g, dev, 0x08);       //display off, cursor+blink off
   u8g_WriteByte(u8g, dev, 0x3E);       //extended mode + GDRAM active
-  for (uint8_t y = 0; y < (LCD_PIXEL_HEIGHT) / 2; y++) { //clear GDRAM
+  LOOP_L_N(y, (LCD_PIXEL_HEIGHT) / 2) { //clear GDRAM
     u8g_WriteByte(u8g, dev, 0x80 | y); //set y
     u8g_WriteByte(u8g, dev, 0x80);     //set x = 0
     u8g_SetAddress(u8g, dev, 1);                  /* data mode */
-    for (uint8_t i = 0; i < 2 * (LCD_PIXEL_WIDTH) / 8; i++) //2x width clears both segments
+    LOOP_L_N(i, 2 * (LCD_PIXEL_WIDTH) / 8) //2x width clears both segments
       u8g_WriteByte(u8g, dev, 0);
     u8g_SetAddress(u8g, dev, 0);           /* cmd mode */
   }
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
index fcfebcbe1288..206f61c675be 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
@@ -670,7 +670,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
     case U8G_DEV_MSG_PAGE_NEXT:
       if (++page > (HEIGHT / PAGE_HEIGHT)) return 1;
 
-      for (uint8_t y = 0; y < PAGE_HEIGHT; y++) {
+      LOOP_L_N(y, PAGE_HEIGHT) {
         uint32_t k = 0;
         #ifdef LCD_USE_DMA_FSMC
           buffer = (y & 1) ? bufferB : bufferA;
diff --git a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
index e6fc310df161..94956e74108f 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
@@ -118,7 +118,7 @@ static const uint8_t u8g_dev_uc1701_mini12864_HAL_init_seq[] PROGMEM = {
 static const uint8_t u8g_dev_uc1701_mini12864_HAL_data_start[] PROGMEM = {
   U8G_ESC_ADR(0),             // instruction mode
   U8G_ESC_CS(1),              // enable chip
-  #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+  #if ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY, FYSETC_MINI_12864)
     UC1701_START_LINE(0),     // set display start line to 0
     UC1701_ADC_REVERSE(0),    // ADC set to reverse
     UC1701_OUT_MODE(1),       // common output mode
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index 8dd24e2737f1..fc7656f1cd7e 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -219,9 +219,6 @@ bool MarlinUI::detected() { return true; }
 
   // Show the Marlin bootscreen, with the u8g loop and delays
   void MarlinUI::show_marlin_bootscreen() {
-    #ifndef BOOTSCREEN_TIMEOUT
-      #define BOOTSCREEN_TIMEOUT 2500
-    #endif
     constexpr uint8_t pages = two_part ? 2 : 1;
     for (uint8_t q = pages; q--;) {
       draw_marlin_bootscreen(q == 0);
@@ -327,11 +324,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), row_y2, 'E');
       lcd_put_wchar((char)('1' + extruder));
       lcd_put_wchar(' ');
-      lcd_put_u8str(i16tostr3(thermalManager.degHotend(extruder)));
+      lcd_put_u8str(i16tostr3rj(thermalManager.degHotend(extruder)));
       lcd_put_wchar('/');
 
       if (get_blink() || !thermalManager.hotend_idle[extruder].timed_out)
-        lcd_put_u8str(i16tostr3(thermalManager.degTargetHotend(extruder)));
+        lcd_put_u8str(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
     }
 
   #endif // ADVANCED_PAUSE_FEATURE
@@ -548,9 +545,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       if (PAGE_UNDER(7)) {
         const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
                        lpos = pos.asLogical();
-        lcd_put_u8str(5, 7, "X:");
+        lcd_put_u8str_P(5, 7, X_LBL);
         lcd_put_u8str(ftostr52(lpos.x));
-        lcd_put_u8str(74, 7, "Y:");
+        lcd_put_u8str_P(74, 7, Y_LBL);
         lcd_put_u8str(ftostr52(lpos.y));
       }
 
@@ -563,7 +560,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
         lcd_put_wchar(')');
 
         // Show the location value
-        lcd_put_u8str(74, LCD_PIXEL_HEIGHT, "Z:");
+        lcd_put_u8str_P(74, LCD_PIXEL_HEIGHT, Z_LBL);
         if (!isnan(ubl.z_values[x_plot][y_plot]))
           lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
         else
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
deleted file mode 100644
index 016996e26579..000000000000
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*****************
- * main_menu.cpp *
- *****************/
-
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2019 - 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: <http://www.gnu.org/licenses/>.                              *
- ****************************************************************************/
-
-#include "../config.h"
-
-#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
-
-#include "screens.h"
-
-using namespace FTDI;
-using namespace Theme;
-
-void MainMenu::onRedraw(draw_mode_t what) {
-  if (what & BACKGROUND) {
-    CommandProcessor cmd;
-    cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
-       .cmd(CLEAR(true,true,true));
-  }
-
-  if (what & FOREGROUND) {
-    CommandProcessor cmd;
-    cmd.colors(normal_btn)
-       .font(Theme::font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-      #define GRID_ROWS 8
-      #define GRID_COLS 2
-        .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME))
-        .enabled(
-          #if ENABLED(NOZZLE_CLEAN_FEATURE)
-            1
-          #endif
-        )
-        .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE))
-        .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS))
-        .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS))
-        .tag(6).button( BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_TEMPERATURE))
-        .enabled(
-          #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS)
-            1
-          #endif
-        )
-        .tag(7).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_FILAMENTCHANGE))
-        .tag(8).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
-        .enabled(
-          #ifdef PRINTCOUNTER
-            1
-          #endif
-        )
-        .tag(9).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_STATS_MENU))
-        .tag(10).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
-        .colors(action_btn)
-        .tag(1).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
-      #undef GRID_COLS
-      #undef GRID_ROWS
-    #else
-      #define GRID_ROWS 5
-      #define GRID_COLS 2
-        .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME))
-        #if ENABLED(TOUCH_UI_COCOA_PRESS)
-          .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_PREHEAT_1))
-        #else
-          .enabled(
-            #if ENABLED(NOZZLE_CLEAN_FEATURE)
-              1
-            #endif
-          )
-          .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE))
-        #endif
-        .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS))
-        .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS))
-        .tag(6).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TEMPERATURE))
-        #if ENABLED(TOUCH_UI_COCOA_PRESS)
-          .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
-        #else
-          .enabled(
-            #if DISABLED(TOUCH_UI_LULZBOT_BIO)
-              1
-            #endif
-          )
-          .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENTCHANGE))
-        #endif
-        .tag(8).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
-        .enabled(
-          #ifdef PRINTCOUNTER
-            1
-          #endif
-        )
-        .tag(9).button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_STATS_MENU))
-        .tag(10).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_MENU))
-        .colors(action_btn)
-        .tag(1).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
-      #undef GRID_COLS
-      #undef GRID_ROWS
-    #endif
-  }
-}
-
-bool MainMenu::onTouchEnd(uint8_t tag) {
-  using namespace ExtUI;
-
-  switch (tag) {
-    case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
-    case 2:  SpinnerDialogBox::enqueueAndWait_P(F("G28"));            break;
-    #if ENABLED(TOUCH_UI_COCOA_PRESS)
-    case 3:  GOTO_SCREEN(PreheatTimerScreen);                         break;
-    #elif ENABLED(NOZZLE_CLEAN_FEATURE)
-    case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
-    #endif
-    case 4:  GOTO_SCREEN(MoveAxisScreen);                             break;
-    case 5:  injectCommands_P(PSTR("M84"));                           break;
-    case 6:  GOTO_SCREEN(TemperatureScreen);                          break;
-    #if ENABLED(TOUCH_UI_COCOA_PRESS)
-    case 7:  GOTO_SCREEN(CaseLightScreen);                            break;
-    #else
-    case 7:  GOTO_SCREEN(ChangeFilamentScreen);                       break;
-    #endif
-    case 8:  GOTO_SCREEN(AdvancedSettingsMenu);                       break;
-#if ENABLED(PRINTCOUNTER)
-    case 9:  GOTO_SCREEN(StatisticsScreen);                           break;
-#endif
-    case 10: GOTO_SCREEN(AboutScreen);                                break;
-    default:
-      return false;
-  }
-  return true;
-}
-
-#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h
deleted file mode 100644
index 933e91db80fd..000000000000
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/colors.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/************
- * colors.h *
- ************/
-
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2019 - 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: <http://www.gnu.org/licenses/>.                              *
- ****************************************************************************/
-
-#pragma once
-
-namespace Theme {
-  #ifdef TOUCH_UI_LULZBOT_BIO
-    // The Lulzbot Bio uses the color PANTONE 2175C on the case silkscreen.
-    // This translates to HSL(208°, 100%, 39%) as an accent color on the GUI.
-
-    constexpr int   accent_hue          = 208;
-    constexpr float accent_sat          = 0.5;
-
-    constexpr uint32_t logo_bg_rgb      = 0xffffff;
-    constexpr uint32_t logo_fill_rgb    = 0xffffff;
-    constexpr uint32_t logo_stroke_rgb  = hsl_to_rgb(accent_hue, 1.0, 0.39);
-  #else
-    // The Lulzbot logo uses the color PANTONE 382c.
-    // This translates to HSL(68°, 68%, 52%) as an accent color on the GUI.
-
-    constexpr int   accent_hue          = 68;
-    constexpr float accent_sat          = 0.68;
-
-    constexpr uint32_t logo_bg_rgb      = hsl_to_rgb(accent_hue, 0.77, 0.64);
-    constexpr uint32_t logo_fill_rgb    = hsl_to_rgb(accent_hue, 0.68, 0.52); // Lulzbot Green
-    constexpr uint32_t logo_stroke_rgb  = 0x000000;
-  #endif
-
-  // Shades of accent color
-
-  #ifdef TOUCH_UI_COCOA_PRESS
-    constexpr uint32_t accent_color_1   = hsl_to_rgb(12.8,0.597,0.263); // Darkest
-    constexpr uint32_t accent_color_2   = hsl_to_rgb(12.8,0.597,0.263);
-    constexpr uint32_t accent_color_3   = hsl_to_rgb( 9.6,0.664,0.443);
-    constexpr uint32_t accent_color_4   = hsl_to_rgb(16.3,0.873,0.537);
-    constexpr uint32_t accent_color_5   = hsl_to_rgb(23.0,0.889,0.539);
-    constexpr uint32_t accent_color_6   = hsl_to_rgb(23.0,0.889,0.539); // Lightest
-  #else
-    constexpr uint32_t accent_color_1   = hsl_to_rgb(accent_hue, accent_sat, 0.26); // Darkest
-    constexpr uint32_t accent_color_2   = hsl_to_rgb(accent_hue, accent_sat, 0.39);
-    constexpr uint32_t accent_color_3   = hsl_to_rgb(accent_hue, accent_sat, 0.52);
-    constexpr uint32_t accent_color_4   = hsl_to_rgb(accent_hue, accent_sat, 0.65);
-    constexpr uint32_t accent_color_5   = hsl_to_rgb(accent_hue, accent_sat, 0.78);
-    constexpr uint32_t accent_color_6   = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
-  #endif
-
-  // Shades of gray
-
-  constexpr float gray_sat = 0.14;
-
-  constexpr uint32_t gray_color_1       = hsl_to_rgb(accent_hue, gray_sat, 0.26); // Darkest
-  constexpr uint32_t gray_color_2       = hsl_to_rgb(accent_hue, gray_sat, 0.39);
-  constexpr uint32_t gray_color_3       = hsl_to_rgb(accent_hue, gray_sat, 0.52);
-  constexpr uint32_t gray_color_4       = hsl_to_rgb(accent_hue, gray_sat, 0.65);
-  constexpr uint32_t gray_color_5       = hsl_to_rgb(accent_hue, gray_sat, 0.78);
-  constexpr uint32_t gray_color_6       = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest
-
-  #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS)
-    // Lulzbot TAZ Pro
-    constexpr uint32_t theme_darkest    = gray_color_1;
-    constexpr uint32_t theme_dark       = gray_color_2;
-
-    constexpr uint32_t bg_color         = theme_darkest;
-    constexpr uint32_t bg_text_disabled = theme_dark;
-    constexpr uint32_t bg_text_enabled  = 0xFFFFFF;
-    constexpr uint32_t bg_normal        = theme_darkest;
-
-    constexpr uint32_t fg_normal        = theme_dark;
-    constexpr uint32_t fg_action        = accent_color_2;
-    constexpr uint32_t fg_disabled      = theme_darkest;
-  #else
-    // Lulzbot Bio
-    constexpr uint32_t theme_darkest    = accent_color_1;
-    constexpr uint32_t theme_dark       = accent_color_4;
-
-    constexpr uint32_t bg_color         = 0xFFFFFF;
-    constexpr uint32_t bg_text_disabled = gray_color_1;
-    constexpr uint32_t bg_text_enabled  = accent_color_1;
-    constexpr uint32_t bg_normal        = accent_color_4;
-
-    constexpr uint32_t fg_normal        = accent_color_1;
-    constexpr uint32_t fg_action        = accent_color_4;
-    constexpr uint32_t fg_disabled      = gray_color_6;
-
-    constexpr uint32_t shadow_rgb       = gray_color_6;
-    constexpr uint32_t stroke_rgb       = accent_color_1;
-    constexpr uint32_t fill_rgb         = accent_color_3;
-    constexpr uint32_t syringe_rgb      = accent_color_5;
-  #endif
-
-  constexpr uint32_t x_axis             = 0xFF0000;
-  constexpr uint32_t y_axis             = 0x00BB00;
-  constexpr uint32_t z_axis             = 0x0000BF;
-  constexpr uint32_t e_axis             = gray_color_2;
-  constexpr uint32_t feedrate           = gray_color_2;
-  constexpr uint32_t other              = gray_color_2;
-
-  // Status screen
-  constexpr uint32_t progress           = gray_color_2;
-  constexpr uint32_t status_msg         = gray_color_2;
-  constexpr uint32_t fan_speed          = 0x377198;
-  constexpr uint32_t temp               = 0x892c78;
-  constexpr uint32_t axis_label         = gray_color_2;
-
-  constexpr uint32_t disabled_icon      = gray_color_1;
-
-  // Calibration Registers Screen
-  constexpr uint32_t transformA         = 0x3010D0;
-  constexpr uint32_t transformB         = 0x4010D0;
-  constexpr uint32_t transformC         = 0x5010D0;
-  constexpr uint32_t transformD         = 0x6010D0;
-  constexpr uint32_t transformE         = 0x7010D0;
-  constexpr uint32_t transformF         = 0x8010D0;
-  constexpr uint32_t transformVal       = 0x104010;
-
-  constexpr btn_colors disabled_btn     = {.bg = bg_color,      .grad = fg_disabled, .fg = fg_disabled,  .rgb = fg_disabled };
-  constexpr btn_colors normal_btn       = {.bg = fg_action,     .grad = 0xFFFFFF,    .fg = fg_normal,    .rgb = 0xFFFFFF };
-  constexpr btn_colors action_btn       = {.bg = bg_color,      .grad = 0xFFFFFF,    .fg = fg_action,    .rgb = 0xFFFFFF };
-  constexpr btn_colors red_btn          = {.bg = 0xFF5555,      .grad = 0xFFFFFF,    .fg = 0xFF0000,     .rgb = 0xFFFFFF };
-  constexpr btn_colors ui_slider        = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = accent_color_3 };
-  constexpr btn_colors ui_toggle        = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = 0xFFFFFF };
-
-  // Temperature color scale
-
-  const rgb_t cool_rgb (  0,   0,   0);
-  const rgb_t low_rgb  (128,   0,   0);
-  const rgb_t med_rgb  (255, 128,   0);
-  const rgb_t high_rgb (255, 255, 128);
-};
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
index e62a77ebeea3..6ac84c2bb0af 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
@@ -30,10 +30,6 @@
   #error "More than 2 hotends not implemented on the Display UI design."
 #endif
 
-#include "DGUSDisplay.h"
-#include "DGUSVPVariable.h"
-#include "DGUSDisplayDefinition.h"
-
 #include "../../ui_api.h"
 
 #include "../../../../MarlinCore.h"
@@ -45,9 +41,13 @@
 #include "../../../../libs/duration_t.h"
 #include "../../../../module/printcounter.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/power_loss_recovery.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
+#include "DGUSDisplay.h"
+#include "DGUSVPVariable.h"
+#include "DGUSDisplayDef.h"
+
 // Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable
 constexpr uint8_t DGUS_HEADER1 = 0x5A;
 constexpr uint8_t DGUS_HEADER2 = 0xA5;
@@ -179,6 +179,15 @@ void DGUSScreenVariableHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable
   }
 }
 
+// Send the current print progress to the display.
+void DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var) {
+  //DEBUG_ECHOPAIR(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
+  uint16_t tmp = ExtUI::getProgress_percent();
+  //DEBUG_ECHOLNPAIR(" data ", tmp);
+  uint16_t data_to_send = swap16(tmp);
+  dgusdisplay.WriteVariable(var.VP, data_to_send);
+}
+
 // Send the current print time to the display.
 // It is using a hex display for that: It expects BSD coded data in the format xxyyzz
 void DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) {
@@ -465,7 +474,7 @@ void DGUSScreenVariableHandler::ScreenConfirmedOK(DGUS_VP_Variable &var, void *v
 const uint16_t* DGUSLCD_FindScreenVPMapList(uint8_t screen) {
   const uint16_t *ret;
   const struct VPMapping *map = VPMap;
-  while (ret = (uint16_t*) pgm_read_word(&(map->VPList))) {
+  while (ret = (uint16_t*) pgm_read_ptr(&(map->VPList))) {
     if (pgm_read_byte(&(map->screen)) == screen) return ret;
     map++;
   }
@@ -594,7 +603,7 @@ void DGUSScreenVariableHandler::HandleManualExtrude(DGUS_VP_Variable &var, void
   skipVP = var.VP;
 }
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   void DGUSScreenVariableHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandleManualMoveOption");
     *(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr);
@@ -605,7 +614,7 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va
   DEBUG_ECHOLNPGM("HandleManualMove");
 
   int16_t movevalue = swap16(*(uint16_t*)val_ptr);
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     const uint16_t choice = *(uint16_t*)var.memadr;
     movevalue = movevalue > 0 ? choice : -choice;
   #endif
@@ -846,8 +855,8 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable
 void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
 
-  uint16_t value = swap16(*(uint16_t*)val_ptr)/100;
-  ExtUI::setZOffset_mm(value);
+  const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f;
+  ExtUI::setZOffset_mm(offset);
   ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
   return;
 }
@@ -858,7 +867,7 @@ void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var,
 
     int16_t flag = swap16(*(uint16_t*)val_ptr);
     int16_t steps = flag ? -20 : 20;
-    ExtUI::smartAdjustAxis_steps(steps,ExtUI::axis_t::Z,true);
+    ExtUI::smartAdjustAxis_steps(steps, ExtUI::axis_t::Z, true);
     ScreenHandler.ForceCompleteUpdate();
     return;
   }
@@ -1307,11 +1316,8 @@ void DGUSDisplay::ProcessRx() {
           //DEBUG_ECHOPAIR(" vp=", vp, " dlen=", dlen);
           DGUS_VP_Variable ramcopy;
           if (populate_VPVar(vp, &ramcopy)) {
-            if (!(dlen == ramcopy.size || (dlen == 2 && ramcopy.size == 1)))
-              DEBUG_ECHOLNPGM("SIZE MISMATCH");
-            else if (ramcopy.set_by_display_handler) {
+            if (ramcopy.set_by_display_handler)
               ramcopy.set_by_display_handler(ramcopy, &tmp[3]);
-            }
             else
               DEBUG_ECHOLNPGM(" VPVar found, no handler.");
           }
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
index 165aab7ed674..00e626adc990 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
@@ -26,6 +26,9 @@
 #include "../../../../inc/MarlinConfigPre.h"
 
 #include "../../../../MarlinCore.h"
+#if HAS_BED_PROBE
+  #include "../../../../module/probe.h"
+#endif
 #include "DGUSVPVariable.h"
 
 enum DGUSLCD_Screens : uint8_t;
@@ -116,7 +119,7 @@ class DGUSScreenVariableHandler {
   static void HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr);
   // Hook for "Change Flowrate"
   static void HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     // Hook for manual move option
     static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
   #endif
@@ -140,8 +143,10 @@ class DGUSScreenVariableHandler {
     // Hook for PID autotune
     static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
   #endif
-  // Hook for "Change probe offset z"
-  static void HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr);
+  #if HAS_BED_PROBE
+    // Hook for "Change probe offset z"
+    static void HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
   #if ENABLED(BABYSTEPPING)
     // Hook for live z adjust action
     static void HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr);
@@ -210,6 +215,7 @@ class DGUSScreenVariableHandler {
   static void DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var);
   static void DGUSLCD_SendTemperaturePID(DGUS_VP_Variable &var);
   static void DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var);
+  static void DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var);
   static void DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var);
   #if ENABLED(PRINTCOUNTER)
     static void DGUSLCD_SendPrintAccTimeToDisplay(DGUS_VP_Variable &var);
@@ -231,7 +237,7 @@ class DGUSScreenVariableHandler {
     if (!var.memadr) return;
     union { unsigned char tmp[sizeof(T)]; T t; } x;
     unsigned char *ptr = (unsigned char*)val_ptr;
-    for (uint8_t i = 0; i < sizeof(T); i++) x.tmp[i] = ptr[sizeof(T) - i - 1];
+    LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
     *(T*)var.memadr = x.t;
   }
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
similarity index 92%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
index eebf18e37742..7af1ffefa7ba 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinition.h
+++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
@@ -42,9 +42,9 @@ extern const struct VPMapping VPMap[];
 extern const struct DGUS_VP_Variable ListOfVP[];
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
-  #include "DGUSDisplayDefinitionOrigin.h"
+  #include "origin/DGUSDisplayDef.h"
 #elif ENABLED(DGUS_LCD_UI_FYSETC)
-  #include "DGUSDisplayDefinitionFYSETC.h"
+  #include "fysetc/DGUSDisplayDef.h"
 #elif ENABLED(DGUS_LCD_UI_HIPRECY)
-  #include "DGUSDisplayDefinitionHIPRECY.h"
+  #include "hiprecy/DGUSDisplayDef.h"
 #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h b/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSVPVariable.h
rename to Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
rename to Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
index 6e26e6343479..49d89948ba49 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
@@ -22,21 +22,21 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_FYSETC)
 
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
 
-#include "../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../ui_api.h"
+#include "../../../../ultralcd.h"
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
 #endif
 
@@ -213,6 +213,7 @@ const uint16_t VPList_SDPrintTune[] PROGMEM = {
     VP_T_Bed_Is, VP_T_Bed_Set,
   #endif
   VP_Feedrate_Percentage,
+  VP_SD_Print_ProbeOffsetZ,
   0x0000
 };
 
@@ -279,6 +280,13 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = {
   0x0000
 };
 
+const uint16_t VPList_Z_Offset[] PROGMEM = {
+  #if HOTENDS >= 1
+    VP_SD_Print_ProbeOffsetZ,
+  #endif
+  0x0000
+};
+
 const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_BOOT, VPList_Boot },
   { DGUSLCD_SCREEN_MAIN, VPList_Main },
@@ -297,6 +305,7 @@ const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_WAITING, VPList_PIDTuningWaiting },
   { DGUSLCD_SCREEN_FLC_PREHEAT, VPList_FLCPreheat },
   { DGUSLCD_SCREEN_FLC_PRINTING, VPList_FLCPrinting },
+  { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
   { DGUSLCD_SCREEN_STEPPERMM, VPList_StepPerMM },
   { DGUSLCD_SCREEN_PID_E, VPList_PIDE0 },
   { DGUSLCD_SCREEN_PID_BED, VPList_PIDBED },
@@ -322,10 +331,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
 
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
   #endif
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
@@ -418,9 +427,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-    VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
-  #endif
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay),
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
rename to Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
index 6eb2369fa1a4..309a23b9b53a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.h
+++ b/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
@@ -43,7 +43,8 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_STEPPERMM           = 212,
   DGUSLCD_SCREEN_PID_E               = 214,
   DGUSLCD_SCREEN_PID_BED             = 218,
-  DGUSLCD_SCREEN_INFOS               =  30,
+  DGUSLCD_SCREEN_Z_OFFSET            = 222,
+  DGUSLCD_SCREEN_INFOS               =  36,
   DGUSLCD_SCREEN_CONFIRM             = 240,
   DGUSLCD_SCREEN_KILL                = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
   DGUSLCD_SCREEN_WAITING             = 251,
@@ -121,8 +122,8 @@ constexpr uint16_t VP_POWER_LOSS_RECOVERY = 0x2180;
 // Fan Control Buttons , switch between "off" and "on"
 constexpr uint16_t VP_FAN0_CONTROL = 0x2200;
 constexpr uint16_t VP_FAN1_CONTROL = 0x2202;
-//constexpr uint16_t VP_FAN2_CONTROL = 0x2204;
-//constexpr uint16_t VP_FAN3_CONTROL = 0x2206;
+constexpr uint16_t VP_FAN2_CONTROL = 0x2204;
+constexpr uint16_t VP_FAN3_CONTROL = 0x2206;
 
 // Heater Control Buttons , triged between "cool down" and "heat PLA" state
 constexpr uint16_t VP_E0_CONTROL = 0x2210;
@@ -240,8 +241,8 @@ constexpr uint16_t VP_SD_Print_Filename = 0x32C0;
 // Fan status
 constexpr uint16_t VP_FAN0_STATUS = 0x3300;
 constexpr uint16_t VP_FAN1_STATUS = 0x3302;
-//constexpr uint16_t VP_FAN2_STATUS = 0x3304;
-//constexpr uint16_t VP_FAN3_STATUS = 0x3306;
+constexpr uint16_t VP_FAN2_STATUS = 0x3304;
+constexpr uint16_t VP_FAN3_STATUS = 0x3306;
 
 // Heater status
 constexpr uint16_t VP_E0_STATUS = 0x3310;
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
similarity index 95%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
rename to Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
index 6ec6cddae469..5fbb307ee809 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -22,21 +22,21 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_HIPRECY)
 
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
 
-#include "../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../ui_api.h"
+#include "../../../../ultralcd.h"
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
 #endif
 
@@ -283,6 +283,13 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = {
   0x0000
 };
 
+const uint16_t VPList_Z_Offset[] PROGMEM = {
+  #if HOTENDS >= 1
+    VP_SD_Print_ProbeOffsetZ,
+  #endif
+  0x0000
+};
+
 const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_BOOT, VPList_Boot },
   { DGUSLCD_SCREEN_MAIN, VPList_Main },
@@ -291,6 +298,7 @@ const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
   { DGUSLCD_SCREEN_PREHEAT, VPList_Preheat },
   { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
+  { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
   { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
   { DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating },
   { DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload },
@@ -327,10 +335,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
 
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
   #endif
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
@@ -361,7 +369,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #if HOTENDS >= 1
     VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E0, nullptr, DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
     VPHELPER(VP_MOVE_E0, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr),
     VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &DGUSScreenVariableHandler::HandleHeaterControl, nullptr),
@@ -418,9 +426,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-    VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
-  #endif
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
rename to Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
index dbf7b8f631cd..1bfdf542549f 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.h
+++ b/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
@@ -35,6 +35,7 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_FILAMENT_LOADING     =  76,
   DGUSLCD_SCREEN_FILAMENT_UNLOADING   =  82,
   DGUSLCD_SCREEN_MANUALEXTRUDE        =  84,
+  DGUSLCD_SCREEN_Z_OFFSET             =  88,
   DGUSLCD_SCREEN_SDFILELIST           =   3,
   DGUSLCD_SCREEN_SDPRINTMANIPULATION  =   7,
   DGUSLCD_SCREEN_SDPRINTTUNE          =   9,
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
rename to Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
index 51f292421a0d..37b7335e67ce 100644
--- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
@@ -22,20 +22,20 @@
 
 /* DGUS implementation written by coldtobi in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
 
-#include "DGUSDisplayDefinition.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/motion.h"
+#include "../../../../../module/planner.h"
 
-#include "../../../ultralcd.h"
+#include "../../../../ultralcd.h"
 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;
 #endif
 
@@ -162,10 +162,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
 
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
   #endif
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
@@ -250,9 +250,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-    VPHELPER(VP_PrintProgress_Percentage, &ui.progress_override, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay ),
-  #endif
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintProgressToDisplay ),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendPrintTimeToDisplay ),
diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.h
rename to Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/config.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/config.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
similarity index 94%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
index 7f666be45b56..6621ea3cbf19 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
@@ -38,6 +38,11 @@ namespace FTDI {
     SET_OUTPUT(CLCD_SPI_CS);
     WRITE(CLCD_SPI_CS, 1);
 
+    #ifdef CLCD_SPI_EXTRA_CS
+      SET_OUTPUT(CLCD_SPI_EXTRA_CS);
+      WRITE(CLCD_SPI_EXTRA_CS, 1);
+    #endif
+
     #ifdef SPI_FLASH_SS
       SET_OUTPUT(SPI_FLASH_SS);
       WRITE(SPI_FLASH_SS, 1);
@@ -111,12 +116,18 @@ namespace FTDI {
       ::SPI.beginTransaction(spi_settings);
     #endif
     WRITE(CLCD_SPI_CS, 0);
+    #ifdef CLCD_SPI_EXTRA_CS
+      WRITE(CLCD_SPI_EXTRA_CS, 0);
+    #endif
     delayMicroseconds(1);
   }
 
   // CLCD SPI - Chip Deselect
   void SPI::spi_ftdi_deselect() {
     WRITE(CLCD_SPI_CS, 1);
+    #ifdef CLCD_SPI_EXTRA_CS
+      WRITE(CLCD_SPI_EXTRA_CS, 1);
+    #endif
     #ifndef CLCD_USE_SOFT_SPI
       ::SPI.endTransaction();
     #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
similarity index 90%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index ef2b23a3a2b0..3023a1c6bc9a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -176,11 +176,12 @@
     #undef MAKE_ARDUINO_PINS
   } // namespace fast_io
 
-  #define SET_INPUT(pin)               fast_io::pin::set_input()
-  #define SET_INPUT_PULLUP(pin)        fast_io::pin::set_input(); fast_io::pin::set_high()
-  #define SET_OUTPUT(pin)              fast_io::pin::set_output()
-  #define READ(pin)                    fast_io::pin::read()
-  #define WRITE(pin, value)            fast_io::pin::write(value)
+  #define SET_INPUT(pin)              fast_io::pin::set_input()
+  #define SET_INPUT_PULLUP(pin)       do{ fast_io::pin::set_input(); fast_io::pin::set_high(); }while(0)
+  #define SET_INPUT_PULLDOWN          SET_INPUT
+  #define SET_OUTPUT(pin)             fast_io::pin::set_output()
+  #define READ(pin)                   fast_io::pin::read()
+  #define WRITE(pin, value)           fast_io::pin::write(value)
 
   #ifndef pgm_read_word_far
   #define pgm_read_word_far pgm_read_word
@@ -195,11 +196,11 @@
   #endif
 
   #define SERIAL_ECHO_START()
-  #define SERIAL_ECHOLNPGM(str)        Serial.println(F(str))
-  #define SERIAL_ECHOPGM(str)          Serial.print(F(str))
-  #define SERIAL_ECHO_MSG(str)         Serial.println(str)
-  #define SERIAL_ECHOLNPAIR(str, val) {Serial.print(F(str)); Serial.println(val);}
-  #define SERIAL_ECHOPAIR(str, val)   {Serial.print(F(str)); Serial.print(val);}
+  #define SERIAL_ECHOLNPGM(str)       Serial.println(F(str))
+  #define SERIAL_ECHOPGM(str)         Serial.print(F(str))
+  #define SERIAL_ECHO_MSG(str)        Serial.println(str)
+  #define SERIAL_ECHOLNPAIR(str, val) do{ Serial.print(F(str)); Serial.println(val); }while(0)
+  #define SERIAL_ECHOPAIR(str, val)   do{ Serial.print(F(str)); Serial.print(val); }while(0)
 
   #define safe_delay delay
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
index f0f693bfd887..b338758ed157 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
@@ -191,7 +191,7 @@ namespace FTDI {
 
             #if ENABLED(TOUCH_UI_DEBUG)
               SERIAL_ECHO_START();
-              SERIAL_ECHOLNPAIR("Touch end: ", tag);
+              SERIAL_ECHOLNPAIR("Touch end: ", pressed_tag);
             #endif
 
             const uint8_t saved_pressed_tag = pressed_tag;
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
index 688b68ae0c51..e2ce15dc8f18 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
@@ -339,11 +339,11 @@
     alt_fm.stride = 19;
     alt_fm.width  = 38;
     alt_fm.height = 49;
-    for (uint8_t i = 0; i < 127; i++)
+    LOOP_L_N(i, 127)
       alt_fm.char_widths[i] = 0;
 
     // For special characters, copy the character widths from the char tables
-    for (uint8_t i = 0; i < NUM_ELEMENTS(char_recipe); i++) {
+    LOOP_L_N(i, NUM_ELEMENTS(char_recipe)) {
       uint8_t std_char, alt_char, alt_data;
       get_char_data(i, std_char, alt_char, alt_data);
       if (std_char == 0)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
similarity index 91%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
index e59e1d9468cc..ebd60aed31d5 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
@@ -70,13 +70,15 @@ namespace Language_en {
   PROGMEM Language_Str MSG_PRINT_FINISHED           = u8"Print finished";
   PROGMEM Language_Str MSG_PRINT_ERROR              = u8"Print error";
   PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_1      = u8"Color Touch Panel";
-  PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2      = u8"Portions " COPYRIGHT_SIGN " 2019 Aleph Objects, Inc.\n"
-                                                        "Portions " COPYRIGHT_SIGN " 2019 Cocoa Press";
-  PROGMEM Language_Str MSG_FIRMWARE_FOR_TOOLHEAD    = u8"Firmware for toolhead:\n%s\n\n";
+  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 "
+                                                        "Public License, go to the following location: http://www.gnu.org/licenses.";
   PROGMEM Language_Str MSG_RUNOUT_1                 = u8"Runout 1";
   PROGMEM Language_Str MSG_RUNOUT_2                 = u8"Runout 2";
   PROGMEM Language_Str MSG_DISPLAY_MENU             = u8"Display";
-  PROGMEM Language_Str MSG_INTERFACE_SETTINGS       = u8"Interface Settings";
+  PROGMEM Language_Str MSG_INTERFACE                = u8"Interface";
   PROGMEM Language_Str MSG_MEASURE_AUTOMATICALLY    = u8"Measure automatically";
   PROGMEM Language_Str MSG_H_OFFSET                 = u8"H Offset";
   PROGMEM Language_Str MSG_V_OFFSET                 = u8"V Offset";
@@ -129,7 +131,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_SOUND_VOLUME             = u8"Sound volume";
   PROGMEM Language_Str MSG_SCREEN_LOCK              = u8"Screen lock";
   PROGMEM Language_Str MSG_BOOT_SCREEN              = u8"Boot screen";
-  PROGMEM Language_Str MSG_INTERFACE_SOUNDS         = u8"Interface Sounds";
+  PROGMEM Language_Str MSG_SOUNDS                   = u8"Sounds";
   PROGMEM Language_Str MSG_CLICK_SOUNDS             = u8"Click sounds";
   PROGMEM Language_Str MSG_EEPROM_RESTORED          = u8"Settings restored from backup";
   PROGMEM Language_Str MSG_EEPROM_RESET             = u8"Settings restored to default";
@@ -144,12 +146,12 @@ namespace Language_en {
 
   PROGMEM Language_Str MSG_TOUCH_CALIBRATION_START  = u8"Release to begin screen calibration";
   PROGMEM Language_Str MSG_TOUCH_CALIBRATION_PROMPT = u8"Touch the dots to calibrate";
+  PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS         = u8"Level X Axis";
 
   #ifdef TOUCH_UI_LULZBOT_BIO
     PROGMEM Language_Str MSG_MOVE_TO_HOME           = u8"Move to Home";
     PROGMEM Language_Str MSG_RAISE_PLUNGER          = u8"Raise Plunger";
     PROGMEM Language_Str MSG_RELEASE_XY_AXIS        = u8"Release X and Y Axis";
-    PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS       = u8"Auto-level X Axis";
     PROGMEM Language_Str MSG_BED_TEMPERATURE        = u8"Bed Temperature";
     PROGMEM Language_Str MSG_HOME_XYZ_WARNING       = u8"About to move to home position. Ensure the top and the bed of the printer are clear.\n\nContinue?";
     PROGMEM Language_Str MSG_HOME_E_WARNING         = u8"About to re-home plunger and auto-level. Remove syringe prior to proceeding.\n\nContinue?";
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
index 96845d40658e..bed32cc6064d 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/marlin_events.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
@@ -131,8 +131,14 @@ namespace ExtUI {
     }
   #endif
 
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    void onPowerLossResume() {
+      // Called on resume from power-loss
+    }
+  #endif
+
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst) {
+    void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
       SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
       switch (rst) {
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
similarity index 93%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
index 548c6c7439d4..b5b0f22e11dc 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
@@ -129,12 +129,13 @@
  *      9         GND     GND     GND     -->  GND
  *     10         5V      5V      5V      -->  KILL [3]
  *
- * [1] This configuration is not compatible with the
- *     EinsyRetro 1.1a because there is a level shifter
- *     on MISO enabled by SD/USB chip select.
+ * [1] This configuration allows daisy-chaining of the
+ *     display and SD/USB on EXP2, except for [2]
  *
- * [2] This configuration allows daisy-chaining of the
- *     display and SD/USB on EXP2.
+ * [2] The Ultimachine Einsy boards have a level shifter
+ *     on MISO enabled by SD_CSEL chip select, hence it
+ *     is not possible to run both the display and the
+ *     SD/USB on EXP2.
  *
  * [3] Archim Rambo provides 5V on this pin. On any other
  *     board, divert this wire from the ribbon cable and
@@ -148,4 +149,8 @@
 
   #define CLCD_SPI_CS                    BTN_EN1
   #define CLCD_MOD_RESET                 BTN_EN2
+  
+  #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT)
+    #define CLCD_SPI_EXTRA_CS            SDSS
+  #endif
 #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
similarity index 56%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
index afd4402fc109..70acc09071e9 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
@@ -27,7 +27,7 @@
 #include "screens.h"
 
 #define GRID_COLS 4
-#define GRID_ROWS 9
+#define GRID_ROWS 7
 
 using namespace FTDI;
 using namespace Theme;
@@ -45,50 +45,62 @@ void AboutScreen::onRedraw(draw_mode_t) {
      .cmd(COLOR_RGB(bg_text_enabled))
      .tag(0);
 
-  draw_text_box(cmd, BTN_POS(1,2), BTN_SIZE(4,1),
-    #ifdef CUSTOM_MACHINE_NAME
-      F(CUSTOM_MACHINE_NAME)
-    #else
-      GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_1)
-    #endif
-    , OPT_CENTER, font_xlarge
-  );
+  #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)
 
-  #ifdef TOOLHEAD_NAME
-    char about_str[
-      strlen_P(GET_TEXT(FIRMWARE_FOR_TOOLHEAD)) +
-      strlen_P(TOOLHEAD_NAME) +
-      strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) + 1
-    ];
+  #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
+  #define INSET_POS(pos) _INSET_POS(pos)
 
-    sprintf_P(about_str, GET_TEXT(MSG_FIRMWARE_FOR_TOOLHEAD), TOOLHEAD_NAME);
-    strcat_P (about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2));
+  char about_str[
+    strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) +
+    strlen_P(TOOLHEAD_NAME) + 1
+  ];
+  #ifdef TOOLHEAD_NAME
+    // If MSG_ABOUT_TOUCH_PANEL_2 has %s, substitute in the toolhead name.
+    // But this is optional, so squelch the compiler warning here.
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wformat-extra-args"
+    sprintf_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2), TOOLHEAD_NAME);
+    #pragma GCC diagnostic pop
+  #else
+    strcpy_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2));
   #endif
 
-  cmd.tag(2);
-  draw_text_box(cmd, BTN_POS(1,3), BTN_SIZE(4,3),
-    #ifdef TOOLHEAD_NAME
-      about_str
+  draw_text_box(cmd, HEADING_POS,
+    #ifdef CUSTOM_MACHINE_NAME
+      F(CUSTOM_MACHINE_NAME)
     #else
-      GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_2)
+      GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_1)
     #endif
-    , OPT_CENTER, font_medium
+    , OPT_CENTER, font_xlarge
   );
-
-  cmd.tag(0);
-  draw_text_box(cmd, BTN_POS(1,6), BTN_SIZE(4,2), progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium);
-
-  cmd.font(font_medium).colors(action_btn).tag(1).button(BTN_POS(2,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_OKAY));
+  draw_text_box(cmd, FW_VERS_POS, progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium);
+  draw_text_box(cmd, FW_INFO_POS, about_str, OPT_CENTER, font_medium);
+  draw_text_box(cmd, INSET_POS(LICENSE_POS), GET_TEXT_F(MSG_LICENSE), OPT_CENTER, font_tiny);
+
+  cmd.font(font_medium)
+     .colors(normal_btn)
+     .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU))
+     .colors(action_btn)
+     .tag(1).button(BACK_POS,  GET_TEXT_F(MSG_BACK));
 }
 
 bool AboutScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case 1: GOTO_PREVIOUS();            return true;
-#if ENABLED(TOUCH_UI_DEVELOPER_MENU)
-    case 2: GOTO_SCREEN(DeveloperMenu); return true;
-#endif
-    default:                            return false;
+    case 1: GOTO_PREVIOUS(); break;
+    #if ENABLED(PRINTCOUNTER)
+      case 2: GOTO_SCREEN(StatisticsScreen); break;
+    #endif
+    #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
+      case 3: GOTO_SCREEN(DeveloperMenu); break;
+    #endif
+    default: return false;
   }
+  return true;
 }
 
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
similarity index 52%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
index 103dcc036481..57137c5d4aa5 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -37,127 +37,116 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
        .cmd(CLEAR(true,true,true));
   }
 
+    #ifdef TOUCH_UI_PORTRAIT
+      #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+        #define GRID_ROWS 9
+      #else
+        #define GRID_ROWS 8
+      #endif
+      #define GRID_COLS 2
+      #define RESTORE_DEFAULTS_POS    BTN_POS(1,1), BTN_SIZE(2,1)
+      #define DISPLAY_POS             BTN_POS(1,2), BTN_SIZE(1,1)
+      #define INTERFACE_POS           BTN_POS(2,2), BTN_SIZE(1,1)
+      #define ZPROBE_ZOFFSET_POS      BTN_POS(1,3), BTN_SIZE(1,1)
+      #define STEPS_PER_MM_POS        BTN_POS(2,3), BTN_SIZE(1,1)
+      #define FILAMENT_POS            BTN_POS(1,4), BTN_SIZE(1,1)
+      #define VELOCITY_POS            BTN_POS(2,4), BTN_SIZE(1,1)
+      #define TMC_CURRENT_POS         BTN_POS(1,5), BTN_SIZE(1,1)
+      #define ACCELERATION_POS        BTN_POS(2,5), BTN_SIZE(1,1)
+      #define ENDSTOPS_POS            BTN_POS(1,6), BTN_SIZE(1,1)
+      #define JERK_POS                BTN_POS(2,6), BTN_SIZE(1,1)
+      #define OFFSETS_POS             BTN_POS(1,7), BTN_SIZE(1,1)
+      #define BACKLASH_POS            BTN_POS(2,7), BTN_SIZE(1,1)
+      #define CASE_LIGHT_POS          BTN_POS(1,8), BTN_SIZE(1,1)
+      #define TMC_HOMING_THRS_POS     BTN_POS(2,8), BTN_SIZE(1,1)
+      #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+        #define BACK_POS              BTN_POS(1,9), BTN_SIZE(2,1)
+      #else
+        #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
+      #endif
+    #else
+      #define GRID_ROWS 6
+      #define GRID_COLS 3
+      #define ZPROBE_ZOFFSET_POS      BTN_POS(1,1), BTN_SIZE(1,1)
+      #define CASE_LIGHT_POS          BTN_POS(1,4), BTN_SIZE(1,1)
+      #define STEPS_PER_MM_POS        BTN_POS(2,1), BTN_SIZE(1,1)
+      #define TMC_CURRENT_POS         BTN_POS(3,1), BTN_SIZE(1,1)
+      #define TMC_HOMING_THRS_POS     BTN_POS(3,2), BTN_SIZE(1,1)
+      #define BACKLASH_POS            BTN_POS(3,3), BTN_SIZE(1,1)
+      #define FILAMENT_POS            BTN_POS(1,3), BTN_SIZE(1,1)
+      #define ENDSTOPS_POS            BTN_POS(3,4), BTN_SIZE(1,1)
+      #define DISPLAY_POS             BTN_POS(3,5), BTN_SIZE(1,1)
+      #define INTERFACE_POS           BTN_POS(1,5), BTN_SIZE(2,1)
+      #define RESTORE_DEFAULTS_POS    BTN_POS(1,6), BTN_SIZE(2,1)
+      #define VELOCITY_POS            BTN_POS(2,2), BTN_SIZE(1,1)
+      #define ACCELERATION_POS        BTN_POS(2,3), BTN_SIZE(1,1)
+      #define JERK_POS                BTN_POS(2,4), BTN_SIZE(1,1)
+      #define OFFSETS_POS             BTN_POS(1,2), BTN_SIZE(1,1)
+      #define BACK_POS                BTN_POS(3,6), BTN_SIZE(1,1)
+    #endif
+
   if (what & FOREGROUND) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
        .font(Theme::font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-      #define GRID_ROWS 10
-      #define GRID_COLS 2
       .enabled(
         #if HAS_BED_PROBE
           1
         #endif
       )
-      .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
+      .tag(2) .button( ZPROBE_ZOFFSET_POS,     GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
       .enabled(
         #if HAS_CASE_LIGHT
           1
         #endif
       )
-      .tag(16).button( BTN_POS(1,6),  BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
-      .tag(3) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
+      .tag(16).button( CASE_LIGHT_POS,         GET_TEXT_F(MSG_CASE_LIGHT))
+      .tag(3) .button( STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
-      .tag(13).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
+      .tag(13).button( TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
       .enabled(
-        #if HAS_TRINAMIC
+        #if ENABLED(SENSORLESS_HOMING)
           1
         #endif
       )
-      .tag(14).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
+      .tag(14).button( TMC_HOMING_THRS_POS,    GET_TEXT_F(MSG_TMC_HOMING_THRS))
       .enabled(
         #if HOTENDS > 1
           1
         #endif
       )
-      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
+      .tag(4) .button( OFFSETS_POS,            GET_TEXT_F(MSG_OFFSETS_MENU))
       .enabled(
         #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
           1
         #endif
       )
-      .tag(11).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT))
-      .tag(12).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
-      .tag(15).button( BTN_POS(2,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
-      .tag(9) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
-      .tag(10).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
-      .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
-      .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
-      #if DISABLED(CLASSIC_JERK)
-      .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
-      #else
-      .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
-      #endif
-      .enabled(
-        #if ENABLED(BACKLASH_GCODE)
-          1
+      .tag(11).button( FILAMENT_POS,           GET_TEXT_F(MSG_FILAMENT))
+      .tag(12).button( ENDSTOPS_POS,           GET_TEXT_F(MSG_LCD_ENDSTOPS))
+      .tag(15).button( DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
+      .tag(9) .button( INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
+      .tag(10).button( RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
+      .tag(5) .button( VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
+      .tag(6) .button( ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
+      .tag(7) .button( JERK_POS,               GET_TEXT_F(
+        #if DISABLED(CLASSIC_JERK)
+          MSG_JUNCTION_DEVIATION
+        #else
+          JERK_POS
         #endif
-      )
-      .tag(8).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
-      .colors(action_btn)
-      .tag(1) .button( BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
-      #undef GRID_COLS
-      #undef GRID_ROWS
-    #else
-      #define GRID_ROWS 6
-      #define GRID_COLS 3
-      .enabled(
-        #if HAS_BED_PROBE
-          1
-        #endif
-      )
-      .tag(2) .button( BTN_POS(1,1),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
-      .enabled(
-        #if HAS_CASE_LIGHT
-          1
-        #endif
-      )
-      .tag(16).button( BTN_POS(1,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT))
-      .enabled(1)
-      .tag(3) .button( BTN_POS(2,1),  BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
-      .enabled(
-        #if HAS_TRINAMIC
-          1
-        #endif
-      )
-      .tag(13).button( BTN_POS(3,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
-      .enabled(
-        #if HAS_TRINAMIC
-          1
-        #endif
-      )
-      .tag(14).button( BTN_POS(3,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
+       ))
       .enabled(
         #if ENABLED(BACKLASH_GCODE)
           1
         #endif
       )
-      .tag(8).button( BTN_POS(3,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
-      .enabled(
-        #if HOTENDS > 1
-          1
-        #endif
-      )
-      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
-      .tag(12).button( BTN_POS(3,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
-      .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
-      .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
-      #if DISABLED(CLASSIC_JERK)
-      .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
-      #else
-      .tag(7) .button( BTN_POS(2,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
-      #endif
-      .tag(11).button( BTN_POS(1,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT))
-      .tag(15).button( BTN_POS(3,5),  BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
-      .tag(9) .button( BTN_POS(1,5),  BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
-      .tag(10).button( BTN_POS(1,6),  BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
+      .tag(8).button( BACKLASH_POS,            GET_TEXT_F(MSG_BACKLASH))
       .colors(action_btn)
-      .tag(1) .button( BTN_POS(3,6),  BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
-    #endif
+      .tag(1).button( BACK_POS,                GET_TEXT_F(MSG_BACK));
   }
 }
 
@@ -189,8 +178,10 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
     case 11: GOTO_SCREEN(FilamentMenu); break;
     #endif
     case 12: GOTO_SCREEN(EndstopStatesScreen); break;
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
     case 13: GOTO_SCREEN(StepperCurrentScreen); break;
+    #endif
+    #if ENABLED(SENSORLESS_HOMING)
     case 14: GOTO_SCREEN(StepperBumpSensitivityScreen); break;
     #endif
     case 15: GOTO_SCREEN(DisplayTuningScreen); break;
@@ -201,5 +192,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
   }
   return true;
 }
-
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
index 97e399a4030b..3e3f1d48a205 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
@@ -345,10 +345,14 @@ void BaseNumericAdjustmentScreen::widgets_t::home_buttons(uint8_t tag) {
   }
 
   cmd.font(LAYOUT_FONT);
- _button(cmd, tag+0, BTN_POS(5,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X));
- _button(cmd, tag+1, BTN_POS(7,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y));
- _button(cmd, tag+2, BTN_POS(9,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z));
- _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ _button(cmd, tag+0, BTN_POS(5,_line),    BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X));
+ _button(cmd, tag+1, BTN_POS(7,_line),    BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y));
+ #if DISABLED(Z_SAFE_HOMING)
+   _button(cmd, tag+2, BTN_POS(9,_line),  BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z));
+   _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ #else
+   _button(cmd, tag+3, BTN_POS(9,_line),  BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL));
+ #endif
 
   _line++;
 }
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
similarity index 95%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
index 77cadabcd778..7e88b7883af8 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
@@ -46,7 +46,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
     return false;
   }
 
-  #ifdef LCD_TIMEOUT_TO_STATUS
+  #if LCD_TIMEOUT_TO_STATUS
     if (EventLoop::get_pressed_tag() != 0) {
       reset_menu_timeout();
     }
@@ -66,7 +66,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
 }
 
 void BaseScreen::onIdle() {
-  #ifdef LCD_TIMEOUT_TO_STATUS
+  #if LCD_TIMEOUT_TO_STATUS
     if ((millis() - last_interaction) > LCD_TIMEOUT_TO_STATUS) {
       reset_menu_timeout();
       #if ENABLED(TOUCH_UI_DEBUG)
@@ -78,12 +78,12 @@ void BaseScreen::onIdle() {
 }
 
 void BaseScreen::reset_menu_timeout() {
-  #ifdef LCD_TIMEOUT_TO_STATUS
+  #if LCD_TIMEOUT_TO_STATUS
     last_interaction = millis();
   #endif
 }
 
-#ifdef LCD_TIMEOUT_TO_STATUS
+#if LCD_TIMEOUT_TO_STATUS
   uint32_t BaseScreen::last_interaction;
 #endif
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
index 0c53dca61b4e..ed8bcee55736 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
@@ -45,13 +45,13 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
 
       .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
       .tag(3) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
       .enabled(
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
           1
         #endif
       )
@@ -85,7 +85,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
         #endif
       )
       .tag(12) .button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
-      .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+      .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
       .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
       .colors(action_btn)
       .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
@@ -100,7 +100,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
     case 2: GOTO_SCREEN(DisplayTuningScreen);              break;
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
     case 3: GOTO_SCREEN(StepperCurrentScreen);             break;
     case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);     break;
     #endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
similarity index 88%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
index a3254bae9ae4..79a6112e4fc9 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
@@ -36,11 +36,13 @@ void BioConfirmHomeE::onRedraw(draw_mode_t) {
 bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
-      SpinnerDialogBox::enqueueAndWait_P(F(
-        "G28 E\n"
-        AXIS_LEVELING_COMMANDS "\n"
-        PARK_AND_RELEASE_COMMANDS
-      ));
+      #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
+        SpinnerDialogBox::enqueueAndWait_P(F(
+          "G28 E\n"
+          AXIS_LEVELING_COMMANDS "\n"
+          PARK_AND_RELEASE_COMMANDS
+        ));
+      #endif
       current_screen.forget();
       break;
     case 2:
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
similarity index 92%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
index 883a446b3ea9..3ae2d680ce63 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
@@ -36,10 +36,12 @@ void BioConfirmHomeXYZ::onRedraw(draw_mode_t) {
 bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
-      SpinnerDialogBox::enqueueAndWait_P(F(
-       "G28\n"
-       PARK_AND_RELEASE_COMMANDS
-      ));
+      #ifdef PARK_AND_RELEASE_COMMANDS
+        SpinnerDialogBox::enqueueAndWait_P(F(
+         "G28\n"
+         PARK_AND_RELEASE_COMMANDS
+        ));
+      #endif
       current_screen.forget();
       break;
     case 2:
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
index 40ed8479ee64..1f6aa45c1746 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
@@ -51,7 +51,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .tag(4).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
        .tag(5).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
        .tag(6).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE))
-       .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+       .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
        .tag(8).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
        .tag(9).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
        .colors(action_btn)
@@ -72,7 +72,9 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
     case 2: GOTO_SCREEN(BioConfirmHomeXYZ);                                              break;
     case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? F("G0 E0 F120") : F("G112"));   break;
     case 4: StatusScreen::unlockMotors();                                                break;
+    #ifdef AXIS_LEVELING_COMMANDS
     case 5: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS));               break;
+    #endif
     case 6: GOTO_SCREEN(TemperatureScreen);                                              break;
     case 7: GOTO_SCREEN(InterfaceSettingsScreen);                                        break;
     case 8: GOTO_SCREEN(AdvancedSettingsMenu);                                           break;
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
similarity index 93%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
index 996c12cf23fd..5e022b58e73d 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
@@ -80,12 +80,14 @@ void BootScreen::onIdle() {
       SpinnerDialogBox::hide();
     }
 
-    if (UIData::animations_enabled()) {
-      // If there is a startup video in the flash SPI, play
-      // that, otherwise show a static splash screen.
-      if (!MediaPlayerScreen::playBootMedia())
-        showSplashScreen();
-    }
+    #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
+      if (UIData::animations_enabled()) {
+        // If there is a startup video in the flash SPI, play
+        // that, otherwise show a static splash screen.
+        if (!MediaPlayerScreen::playBootMedia())
+          showSplashScreen();
+      }
+    #endif
 
     StatusScreen::loadBitmaps();
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
index 2d1e0d66272f..2b5963fdf6f1 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
@@ -111,6 +111,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
        .cmd(CLEAR(true,true,true))
+       .cmd(COLOR_RGB(bg_text_enabled))
        .tag(0)
     #ifdef TOUCH_UI_PORTRAIT
        .font(font_large)
@@ -119,7 +120,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
     #endif
        .text(BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_EXTRUDER_SELECTION))
     #ifdef TOUCH_UI_PORTRAIT
-       .text(BTN_POS(1,7), BTN_SIZE(1,1), F(""))
+       .text(BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
     #else
        .text(BTN_POS(3,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE))
        .font(font_small)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
index 61875c52f1f3..4e165aa4484a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
@@ -69,7 +69,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .cmd(COLOR_RGB(bg_text_enabled))
        .tag(0)
        .font(font_medium)
-       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS))
+       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE))
     #undef EDGE_R
     #define EDGE_R 30
        .font(font_small)
@@ -77,7 +77,9 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .text(BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_LCD_BRIGHTNESS), OPT_RIGHTX | OPT_CENTERY)
        .text(BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUND_VOLUME),   OPT_RIGHTX | OPT_CENTERY)
        .text(BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_SCREEN_LOCK),    OPT_RIGHTX | OPT_CENTERY);
+    #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
     cmd.text(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BOOT_SCREEN),    OPT_RIGHTX | OPT_CENTERY);
+    #endif
     #undef EDGE_R
   }
 
@@ -95,16 +97,18 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .tag(3).slider(BTN_POS(3,3), BTN_SIZE(2,1), screen_data.InterfaceSettingsScreen.volume,     0xFF)
        .colors(ui_toggle)
        .tag(4).toggle2(BTN_POS(3,4), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), LockScreen::is_enabled())
+    #if DISABLED(TOUCH_UI_NO_BOOTSCREEN)
        .tag(5).toggle2(BTN_POS(3,5), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), UIData::animations_enabled())
+    #endif
     #undef EDGE_R
     #define EDGE_R 0
     #ifdef TOUCH_UI_PORTRAIT
        .colors(normal_btn)
-       .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+       .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
        .colors(action_btn)
        .tag(1).button (BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
     #else
-       .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+       .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUNDS))
        .colors(action_btn)
        .tag(1).button (BTN_POS(3,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
     #endif
@@ -252,7 +256,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
 }
 
 #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
-  #include "../../../../../HAL/shared/persistent_store_api.h"
+  #include "../../../../../HAL/shared/eeprom_api.h"
 
   bool restoreEEPROM() {
     uint8_t data[ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE];
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
index 57f520e8abd1..48fae863a706 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
@@ -71,7 +71,7 @@ void InterfaceSoundsScreen::onRedraw(draw_mode_t what) {
     #define GRID_ROWS 9
 
        .font(font_medium)
-       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS))
+       .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
     #undef EDGE_R
     #define EDGE_R 30
        .font(font_small)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
new file mode 100644
index 000000000000..5d165edef0fa
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
@@ -0,0 +1,165 @@
+/*****************
+ * main_menu.cpp *
+ *****************/
+
+/****************************************************************************
+ *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2019 - 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: <http://www.gnu.org/licenses/>.                              *
+ ****************************************************************************/
+
+#include "../config.h"
+
+#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
+
+#include "screens.h"
+
+using namespace FTDI;
+using namespace Theme;
+
+void MainMenu::onRedraw(draw_mode_t what) {
+  if (what & BACKGROUND) {
+    CommandProcessor cmd;
+    cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
+       .cmd(CLEAR(true,true,true));
+  }
+
+  #ifdef TOUCH_UI_PORTRAIT
+    #define GRID_ROWS 8
+    #define GRID_COLS 2
+    #define ABOUT_PRINTER_POS     BTN_POS(1,1), BTN_SIZE(2,1)
+    #define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
+    #define FILAMENTCHANGE_POS    BTN_POS(1,3), BTN_SIZE(2,1)
+    #define TEMPERATURE_POS       BTN_POS(1,4), BTN_SIZE(2,1)
+    #define MOVE_AXIS_POS         BTN_POS(1,5), BTN_SIZE(1,1)
+    #define DISABLE_STEPPERS_POS  BTN_POS(2,5), BTN_SIZE(1,1)
+    #define AUTO_HOME_POS         BTN_POS(1,6), BTN_SIZE(1,1)
+    #define CLEAN_NOZZLE_POS      BTN_POS(2,6), BTN_SIZE(1,1)
+    #define LEVEL_BED_POS         BTN_POS(1,7), BTN_SIZE(1,1)
+    #define LEVEL_AXIS_POS        BTN_POS(2,7), BTN_SIZE(1,1)
+    #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
+  #else
+    #define GRID_ROWS 6
+    #define GRID_COLS 2
+    #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(1,1)
+    #define ABOUT_PRINTER_POS     BTN_POS(2,1), BTN_SIZE(1,1)
+    #define AUTO_HOME_POS         BTN_POS(1,2), BTN_SIZE(1,1)
+    #define CLEAN_NOZZLE_POS      BTN_POS(2,2), BTN_SIZE(1,1)
+    #define MOVE_AXIS_POS         BTN_POS(1,3), BTN_SIZE(1,1)
+    #define DISABLE_STEPPERS_POS  BTN_POS(2,3), BTN_SIZE(1,1)
+    #define TEMPERATURE_POS       BTN_POS(1,4), BTN_SIZE(1,1)
+    #define FILAMENTCHANGE_POS    BTN_POS(2,4), BTN_SIZE(1,1)
+    #define LEVEL_BED_POS         BTN_POS(1,5), BTN_SIZE(1,1)
+    #define LEVEL_AXIS_POS        BTN_POS(2,5), BTN_SIZE(1,1)
+    #define BACK_POS              BTN_POS(1,6), BTN_SIZE(2,1)
+  #endif
+
+  if (what & FOREGROUND) {
+    CommandProcessor cmd;
+    cmd.colors(normal_btn)
+       .font(Theme::font_medium)
+       .tag(2).button( AUTO_HOME_POS, GET_TEXT_F(MSG_AUTO_HOME))
+       .enabled(
+           #if ANY(NOZZLE_CLEAN_FEATURE, TOUCH_UI_COCOA_PRESS)
+             1
+           #endif
+         )
+       .tag(3).button( CLEAN_NOZZLE_POS, GET_TEXT_F(
+         #if ENABLED(TOUCH_UI_COCOA_PRESS)
+            MSG_PREHEAT_1
+         #else
+            MSG_CLEAN_NOZZLE
+         #endif
+       ))
+       .tag(4).button( MOVE_AXIS_POS,        GET_TEXT_F(MSG_MOVE_AXIS))
+       .tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS))
+       .tag(6).button( TEMPERATURE_POS,      GET_TEXT_F(MSG_TEMPERATURE))
+       .enabled(
+           #if DISABLED(TOUCH_UI_LULZBOT_BIO)
+             1
+           #endif
+         )
+       .tag(7).button( FILAMENTCHANGE_POS, GET_TEXT_F(
+         #if ENABLED(TOUCH_UI_COCOA_PRESS)
+             MSG_CASE_LIGHT
+         #else
+             MSG_FILAMENTCHANGE
+         #endif
+        ))
+       .tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
+       .enabled(
+         #ifdef PRINTCOUNTER
+           1
+         #endif
+        )
+       .enabled(
+         #ifdef AXIS_LEVELING_COMMANDS
+           1
+         #endif
+        )
+       .tag(9).button( LEVEL_AXIS_POS, GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
+       .enabled(
+         #ifdef HAS_LEVELING
+           1
+         #endif
+        )
+       .tag(10).button( LEVEL_BED_POS, GET_TEXT_F(MSG_LEVEL_BED))
+       .tag(11).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
+       .colors(action_btn)
+       .tag(1).button( BACK_POS, GET_TEXT_F(MSG_BACK));
+  }
+}
+
+bool MainMenu::onTouchEnd(uint8_t tag) {
+  using namespace ExtUI;
+
+  switch (tag) {
+    case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
+    case 2:  SpinnerDialogBox::enqueueAndWait_P(F("G28"));            break;
+    #if ENABLED(TOUCH_UI_COCOA_PRESS)
+    case 3:  GOTO_SCREEN(PreheatMenu);                                break;
+    #elif ENABLED(NOZZLE_CLEAN_FEATURE)
+    case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
+    #endif
+    case 4:  GOTO_SCREEN(MoveAxisScreen);                             break;
+    case 5:  injectCommands_P(PSTR("M84"));                           break;
+    case 6:  GOTO_SCREEN(TemperatureScreen);                          break;
+    #if ENABLED(TOUCH_UI_COCOA_PRESS) && HAS_CASE_LIGHT
+    case 7:  GOTO_SCREEN(CaseLightScreen);                            break;
+    #else
+    case 7:  GOTO_SCREEN(ChangeFilamentScreen);                       break;
+    #endif
+    case 8:  GOTO_SCREEN(AdvancedSettingsMenu);                       break;
+    #ifdef AXIS_LEVELING_COMMANDS
+    case 9: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS)); break;
+    #endif
+    #ifdef HAS_LEVELING
+    case 10:  SpinnerDialogBox::enqueueAndWait_P(F(
+      #ifdef BED_LEVELING_COMMANDS
+        BED_LEVELING_COMMANDS
+      #else
+        "G29"
+      #endif
+    ));            break;
+    #endif
+    case 11: GOTO_SCREEN(AboutScreen);                                break;
+    default:
+      return false;
+  }
+  return true;
+}
+
+#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
index 8513c79f8457..4bf8ed190e0a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
@@ -36,7 +36,7 @@ void MoveAxisScreen::onEntry() {
   // ourselves. The relative distances are reset to zero whenever this
   // screen is entered.
 
-  for (uint8_t i = 0; i < ExtUI::extruderCount; i++) {
+  LOOP_L_N(i, ExtUI::extruderCount) {
     screen_data.MoveAxisScreen.e_rel[i] = 0;
   }
   BaseNumericAdjustmentScreen::onEntry();
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp
new file mode 100644
index 000000000000..f0b5dd887b8f
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp
@@ -0,0 +1,83 @@
+/********************
+ * preheat_menu.cpp *
+ ********************/
+
+/****************************************************************************
+ *   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: <http://www.gnu.org/licenses/>.                              *
+ ****************************************************************************/
+
+#include "../config.h"
+
+#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_COCOA_PRESS)
+
+#include "screens.h"
+
+using namespace FTDI;
+using namespace ExtUI;
+using namespace Theme;
+
+void PreheatMenu::onRedraw(draw_mode_t what) {
+  if (what & BACKGROUND) {
+    CommandProcessor cmd;
+    cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color))
+       .cmd(CLEAR(true,true,true))
+       .tag(0);
+  }
+
+  #define GRID_ROWS 3
+  #define GRID_COLS 2
+    
+  if (what & FOREGROUND) {
+    CommandProcessor cmd;
+    cmd.cmd(COLOR_RGB(bg_text_enabled))
+       .font(Theme::font_medium)
+       .text  ( BTN_POS(1,1),  BTN_SIZE(2,1), GET_TEXT_F(MSG_PREHEAT_1))
+       .colors(normal_btn)
+       .tag(2).button( BTN_POS(1,2),  BTN_SIZE(1,1), F("Dark Chocolate"))
+       .tag(3).button( BTN_POS(2,2),  BTN_SIZE(1,1), F("Milk Chocolate"))
+       .tag(4).button( BTN_POS(1,3),  BTN_SIZE(1,1), F("White Chocolate"))
+       .colors(action_btn)
+       .tag(1) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK));
+  }
+}
+
+bool PreheatMenu::onTouchEnd(uint8_t tag) {
+  switch (tag) {
+    case 1: GOTO_PREVIOUS();                   break;
+    case 2:
+      #ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT
+        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT));
+      #endif
+      GOTO_SCREEN(PreheatTimerScreen);
+      break;
+    case 3:
+      #ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT
+        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT));
+      #endif
+      GOTO_SCREEN(PreheatTimerScreen);
+      break;
+    case 4:
+      #ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT
+        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT));
+      #endif
+      GOTO_SCREEN(PreheatTimerScreen);
+      break;
+    default: return false;
+  }
+  return true;
+}
+
+#endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
index 0a24c3008204..7d68ae2d671a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp
@@ -77,9 +77,6 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) {
 
 void PreheatTimerScreen::onEntry() {
   screen_data.PreheatTimerScreen.start_ms = millis();
-  #ifdef COCOA_PRESS_PREHEAT_SCRIPT
-    injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_SCRIPT));
-  #endif
 }
 
 void PreheatTimerScreen::onRedraw(draw_mode_t what) {
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screen_data.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
index bc9280005400..ce7546204021 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
@@ -58,7 +58,7 @@ SCREEN_TABLE {
 #endif
   DECL_SCREEN(MoveAxisScreen),
   DECL_SCREEN(StepsScreen),
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   DECL_SCREEN(StepperCurrentScreen),
   DECL_SCREEN(StepperBumpSensitivityScreen),
 #endif
@@ -105,6 +105,7 @@ SCREEN_TABLE {
   DECL_SCREEN(BioConfirmHomeE),
 #endif
 #if ENABLED(TOUCH_UI_COCOA_PRESS)
+  DECL_SCREEN(PreheatMenu),
   DECL_SCREEN(PreheatTimerScreen),
 #endif
 #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
index 176c8145e34e..346d122a0f25 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
@@ -76,6 +76,7 @@ enum {
   PRINTING_SCREEN_CACHE,
 #endif
 #if ENABLED(TOUCH_UI_COCOA_PRESS)
+  PREHEAT_MENU_CACHE,
   PREHEAT_TIMER_SCREEN_CACHE,
 #endif
   CHANGE_FILAMENT_SCREEN_CACHE,
@@ -99,7 +100,7 @@ enum {
 
 class BaseScreen : public UIScreen {
   protected:
-    #ifdef LCD_TIMEOUT_TO_STATUS
+    #if LCD_TIMEOUT_TO_STATUS
       static uint32_t last_interaction;
     #endif
 
@@ -314,6 +315,12 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE,
 #endif
 
 #if ENABLED(TOUCH_UI_COCOA_PRESS)
+  class PreheatMenu : public BaseScreen, public CachedScreen<PREHEAT_MENU_CACHE> {
+    public:
+      static void onRedraw(draw_mode_t);
+      static bool onTouchEnd(uint8_t tag);
+  };
+
   class PreheatTimerScreen : public BaseScreen, public CachedScreen<PREHEAT_TIMER_SCREEN_CACHE> {
     private:
       static uint16_t secondsRemaining();
@@ -455,7 +462,7 @@ class StepsScreen : public BaseNumericAdjustmentScreen, public CachedScreen<STEP
     static bool onTouchHeld(uint8_t tag);
 };
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   class StepperCurrentScreen : public BaseNumericAdjustmentScreen, public CachedScreen<STEPPER_CURRENT_SCREEN_CACHE> {
     public:
       static void onRedraw(draw_mode_t);
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
similarity index 57%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
index e71f200a359c..98d0bba75941 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
@@ -33,9 +33,9 @@ using namespace FTDI;
 using namespace Theme;
 
 #ifdef TOUCH_UI_PORTRAIT
-  #define GRID_ROWS 8
+    #define GRID_ROWS 8
 #else
-  #define GRID_ROWS 8
+    #define GRID_ROWS 8
 #endif
 
 void StatusScreen::draw_axis_position(draw_mode_t what) {
@@ -43,41 +43,41 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
 
   #define GRID_COLS 3
 
+  #ifdef TOUCH_UI_PORTRAIT
+    #define X_LBL_POS  BTN_POS(1,5), BTN_SIZE(1,1)
+    #define Y_LBL_POS  BTN_POS(1,6), BTN_SIZE(1,1)
+    #define Z_LBL_POS  BTN_POS(1,7), BTN_SIZE(1,1)
+    #define X_VAL_POS  BTN_POS(2,5), BTN_SIZE(2,1)
+    #define Y_VAL_POS  BTN_POS(2,6), BTN_SIZE(2,1)
+    #define Z_VAL_POS  BTN_POS(2,7), BTN_SIZE(2,1)
+  #else
+    #define X_LBL_POS  BTN_POS(1,5), BTN_SIZE(1,1)
+    #define Y_LBL_POS  BTN_POS(2,5), BTN_SIZE(1,1)
+    #define Z_LBL_POS  BTN_POS(3,5), BTN_SIZE(1,1)
+    #define X_VAL_POS  BTN_POS(1,6), BTN_SIZE(1,1)
+    #define Y_VAL_POS  BTN_POS(2,6), BTN_SIZE(1,1)
+    #define Z_VAL_POS  BTN_POS(3,6), BTN_SIZE(1,1)
+  #endif
+
+  #define _UNION_POS(x1,y1,w1,h1,x2,y2,w2,h2) x1,y1,max(x1+w1,x2+w2)-x1,max(y1+h1,y2+h2)-y1
+  #define UNION_POS(p1, p2) _UNION_POS(p1, p2)
+
   if (what & BACKGROUND) {
     cmd.tag(6)
-    #ifdef TOUCH_UI_PORTRAIT
-      .fgcolor(Theme::axis_label)
-        .font(Theme::font_large)
-                         .button( BTN_POS(1,5), BTN_SIZE(2,1), F(""), OPT_FLAT)
-                         .button( BTN_POS(1,6), BTN_SIZE(2,1), F(""), OPT_FLAT)
-                         .button( BTN_POS(1,7), BTN_SIZE(2,1), F(""), OPT_FLAT)
-
-        .font(Theme::font_small)
-                         .text  ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X))
-                         .text  ( BTN_POS(1,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y))
-                         .text  ( BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z))
-
-        .font(Theme::font_medium)
-        .fgcolor(Theme::x_axis) .button( BTN_POS(2,5), BTN_SIZE(2,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(2,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::z_axis) .button( BTN_POS(2,7), BTN_SIZE(2,1), F(""), OPT_FLAT);
-    #else
-      .fgcolor(Theme::axis_label)
-        .font(Theme::font_large)
-                         .button( BTN_POS(1,5), BTN_SIZE(1,2), F(""),  OPT_FLAT)
-                         .button( BTN_POS(2,5), BTN_SIZE(1,2), F(""),  OPT_FLAT)
-                         .button( BTN_POS(3,5), BTN_SIZE(1,2), F(""),  OPT_FLAT)
-
-        .font(Theme::font_small)
-                         .text  ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X))
-                         .text  ( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y))
-                         .text  ( BTN_POS(3,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z))
-                         .font(Theme::font_medium)
-
-        .fgcolor(Theme::x_axis) .button( BTN_POS(1,6), BTN_SIZE(1,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(1,1), F(""), OPT_FLAT)
-        .fgcolor(Theme::z_axis) .button( BTN_POS(3,6), BTN_SIZE(1,1), F(""), OPT_FLAT);
-    #endif
+       .fgcolor(Theme::axis_label)
+       .font(Theme::font_large)
+                               .button( UNION_POS(X_LBL_POS, X_VAL_POS), F(""), OPT_FLAT)
+                               .button( UNION_POS(Y_LBL_POS, Y_VAL_POS), F(""), OPT_FLAT)
+                               .button( UNION_POS(Z_LBL_POS, Z_VAL_POS), F(""), OPT_FLAT)
+       .font(Theme::font_medium)
+       .fgcolor(Theme::x_axis) .button( X_VAL_POS, F(""), OPT_FLAT)
+       .fgcolor(Theme::y_axis) .button( Y_VAL_POS, F(""), OPT_FLAT)
+       .fgcolor(Theme::z_axis) .button( Z_VAL_POS, F(""), OPT_FLAT)
+       .font(Theme::font_small)
+                               .text  ( X_LBL_POS, GET_TEXT_F(MSG_AXIS_X))
+                               .text  ( Y_LBL_POS, GET_TEXT_F(MSG_AXIS_Y))
+                               .text  ( Z_LBL_POS, GET_TEXT_F(MSG_AXIS_Z))
+       .colors(normal_btn);
   }
 
   if (what & FOREGROUND) {
@@ -101,16 +101,11 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
     else
       strcpy_P(z_str, PSTR("?"));
 
-    cmd.tag(6).font(Theme::font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-         .text  ( BTN_POS(2,5), BTN_SIZE(2,1), x_str)
-         .text  ( BTN_POS(2,6), BTN_SIZE(2,1), y_str)
-         .text  ( BTN_POS(2,7), BTN_SIZE(2,1), z_str);
-    #else
-         .text  ( BTN_POS(1,6), BTN_SIZE(1,1), x_str)
-         .text  ( BTN_POS(2,6), BTN_SIZE(1,1), y_str)
-         .text  ( BTN_POS(3,6), BTN_SIZE(1,1), z_str);
-    #endif
+    cmd.tag(6)
+       .font(Theme::font_medium)
+       .text  ( X_VAL_POS, x_str)
+       .text  ( Y_VAL_POS, y_str)
+       .text  ( Z_VAL_POS, z_str);
   }
 
   #undef GRID_COLS
@@ -125,49 +120,49 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
 void StatusScreen::draw_temperature(draw_mode_t what) {
   using namespace Theme;
 
+  #define TEMP_RECT_1 BTN_POS(1,1), BTN_SIZE(4,2)
+  #define TEMP_RECT_2 BTN_POS(1,1), BTN_SIZE(8,1)
+  #define NOZ_1_POS   BTN_POS(1,1), BTN_SIZE(4,1)
+  #define NOZ_2_POS   BTN_POS(5,1), BTN_SIZE(4,1)
+  #define BED_POS     BTN_POS(1,2), BTN_SIZE(4,1)
+  #define FAN_POS     BTN_POS(5,2), BTN_SIZE(4,1)
+
+  #define _ICON_POS(x,y,w,h) x, y, w/4, h
+  #define _TEXT_POS(x,y,w,h) x + w/4, y, w - w/4, h
+  #define ICON_POS(pos) _ICON_POS(pos)
+  #define TEXT_POS(pos) _TEXT_POS(pos)
+
   CommandProcessor cmd;
 
   if (what & BACKGROUND) {
     cmd.font(Theme::font_small)
-    #ifdef TOUCH_UI_PORTRAIT
-       .tag(5)
-       .fgcolor(temp)      .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT)
-                                  .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT)
-       .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT)
-       .tag(0)
-       .fgcolor(progress)  .button( BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                  .button( BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #else
        .tag(5)
-       .fgcolor(temp)      .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT)
-                                  .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT)
-       .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT)
-       .tag(0)
-       .fgcolor(progress)  .button( BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                  .button( BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #endif
+       .fgcolor(temp)     .button( TEMP_RECT_1, F(""), OPT_FLAT)
+                          .button( TEMP_RECT_2, F(""), OPT_FLAT)
+       .fgcolor(fan_speed).button( FAN_POS,     F(""), OPT_FLAT)
+       .tag(0);
 
     // Draw Extruder Bitmap on Extruder Temperature Button
 
     cmd.tag(5)
-       .cmd(BITMAP_SOURCE(Extruder_Icon_Info))
-       .cmd(BITMAP_LAYOUT(Extruder_Icon_Info))
-       .cmd(BITMAP_SIZE  (Extruder_Icon_Info))
-       .icon (BTN_POS(1,1), BTN_SIZE(1,1),  Extruder_Icon_Info, icon_scale)
-       .icon (BTN_POS(5,1), BTN_SIZE(1,1),  Extruder_Icon_Info, icon_scale);
+       .cmd (BITMAP_SOURCE(Extruder_Icon_Info))
+       .cmd (BITMAP_LAYOUT(Extruder_Icon_Info))
+       .cmd (BITMAP_SIZE  (Extruder_Icon_Info))
+       .icon(ICON_POS(NOZ_1_POS), Extruder_Icon_Info, icon_scale)
+       .icon(ICON_POS(NOZ_2_POS), Extruder_Icon_Info, icon_scale);
 
     // Draw Bed Heat Bitmap on Bed Heat Button
-    cmd.cmd(BITMAP_SOURCE(Bed_Heat_Icon_Info))
-       .cmd(BITMAP_LAYOUT(Bed_Heat_Icon_Info))
-       .cmd(BITMAP_SIZE  (Bed_Heat_Icon_Info))
-       .icon (BTN_POS(1,2), BTN_SIZE(1,1), Bed_Heat_Icon_Info, icon_scale);
+    cmd.cmd (BITMAP_SOURCE(Bed_Heat_Icon_Info))
+       .cmd (BITMAP_LAYOUT(Bed_Heat_Icon_Info))
+       .cmd (BITMAP_SIZE  (Bed_Heat_Icon_Info))
+       .icon(ICON_POS(BED_POS), Bed_Heat_Icon_Info, icon_scale);
 
     // Draw Fan Percent Bitmap on Bed Heat Button
 
-    cmd.cmd(BITMAP_SOURCE(Fan_Icon_Info))
-       .cmd(BITMAP_LAYOUT(Fan_Icon_Info))
-       .cmd(BITMAP_SIZE  (Fan_Icon_Info))
-       .icon  (BTN_POS(5,2), BTN_SIZE(1,1), Fan_Icon_Info, icon_scale);
+    cmd.cmd (BITMAP_SOURCE(Fan_Icon_Info))
+       .cmd (BITMAP_LAYOUT(Fan_Icon_Info))
+       .cmd (BITMAP_SIZE  (Fan_Icon_Info))
+       .icon(ICON_POS(FAN_POS), Fan_Icon_Info, icon_scale);
 
     #ifdef TOUCH_UI_USE_UTF8
       load_utf8_bitmaps(cmd); // Restore font bitmap handles
@@ -212,10 +207,10 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
 
     cmd.tag(5)
        .font(font_medium)
-       .text(BTN_POS(2,1), BTN_SIZE(3,1), e0_str)
-       .text(BTN_POS(6,1), BTN_SIZE(3,1), e1_str)
-       .text(BTN_POS(2,2), BTN_SIZE(3,1), bed_str)
-       .text(BTN_POS(6,2), BTN_SIZE(3,1), fan_str);
+       .text(TEXT_POS(NOZ_1_POS), e0_str)
+       .text(TEXT_POS(NOZ_2_POS), e1_str)
+       .text(TEXT_POS(BED_POS), bed_str)
+       .text(TEXT_POS(FAN_POS), fan_str);
   }
 }
 
@@ -225,15 +220,18 @@ void StatusScreen::draw_progress(draw_mode_t what) {
 
   CommandProcessor cmd;
 
+  #if ENABLED(TOUCH_UI_PORTRAIT)
+    #define TIME_POS     BTN_POS(1,3), BTN_SIZE(4,1)
+    #define PROGRESS_POS BTN_POS(5,3), BTN_SIZE(4,1)
+  #else
+    #define TIME_POS     BTN_POS(9,1), BTN_SIZE(4,1)
+    #define PROGRESS_POS BTN_POS(9,2), BTN_SIZE(4,1)
+  #endif
+
   if (what & BACKGROUND) {
     cmd.tag(0).font(font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-       .fgcolor(progress) .button(BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                 .button(BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #else
-       .fgcolor(progress) .button(BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT)
-                                 .button(BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT);
-    #endif
+       .fgcolor(progress).button(TIME_POS,     F(""), OPT_FLAT)
+                         .button(PROGRESS_POS, F(""), OPT_FLAT);
   }
 
   if (what & FOREGROUND) {
@@ -248,13 +246,8 @@ void StatusScreen::draw_progress(draw_mode_t what) {
     sprintf_P(progress_str, PSTR("%-3d %%"),      getProgress_percent() );
 
     cmd.font(font_medium)
-    #ifdef TOUCH_UI_PORTRAIT
-       .tag(0).text(BTN_POS(1,3), BTN_SIZE(4,1), time_str)
-              .text(BTN_POS(5,3), BTN_SIZE(4,1), progress_str);
-    #else
-       .tag(0).text(BTN_POS(9,1), BTN_SIZE(4,1), time_str)
-              .text(BTN_POS(9,2), BTN_SIZE(4,1), progress_str);
-    #endif
+       .tag(0).text(TIME_POS, time_str)
+              .text(PROGRESS_POS, progress_str);
   }
 }
 
@@ -266,6 +259,14 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
   if (what & FOREGROUND) {
     using namespace ExtUI;
 
+  #if ENABLED(TOUCH_UI_PORTRAIT)
+    #define MEDIA_BTN_POS  BTN_POS(1,8), BTN_SIZE(2,1)
+    #define MENU_BTN_POS   BTN_POS(3,8), BTN_SIZE(2,1)
+  #else
+    #define MEDIA_BTN_POS  BTN_POS(1,7), BTN_SIZE(2,2)
+    #define MENU_BTN_POS   BTN_POS(3,7), BTN_SIZE(2,2)
+  #endif
+
     const bool has_media = isMediaInserted() && !isPrintingFromMedia();
 
     CommandProcessor cmd;
@@ -273,42 +274,29 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
        .font(Theme::font_medium)
        .enabled(has_media)
        .colors(has_media ? action_btn : normal_btn)
-       .tag(3).button(
-          #ifdef TOUCH_UI_PORTRAIT
-            BTN_POS(1,8), BTN_SIZE(2,1),
-          #else
-            BTN_POS(1,7), BTN_SIZE(2,2),
-          #endif
-          isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA)
-        ).colors(!has_media ? action_btn : normal_btn)
-      #ifdef TOUCH_UI_PORTRAIT
-       .tag(4).button( BTN_POS(3,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_MENU));
-      #else
-       .tag(4).button( BTN_POS(3,7), BTN_SIZE(2,2), GET_TEXT_F(MSG_BUTTON_MENU));
-    #endif
+       .tag(3).button(MEDIA_BTN_POS, isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA))
+       .colors(!has_media ? action_btn : normal_btn)
+       .tag(4).button( MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU));
   }
   #undef  GRID_COLS
 }
 
 void StatusScreen::draw_status_message(draw_mode_t what, const char* message) {
   #define GRID_COLS 1
+
+  #if ENABLED(TOUCH_UI_PORTRAIT)
+    #define STATUS_POS  BTN_POS(1,4), BTN_SIZE(1,1)
+  #else
+    #define STATUS_POS  BTN_POS(1,3), BTN_SIZE(1,2)
+  #endif
+
   if (what & BACKGROUND) {
     CommandProcessor cmd;
     cmd.fgcolor(Theme::status_msg)
        .tag(0)
-    #ifdef TOUCH_UI_PORTRAIT
-       .button( BTN_POS(1,4), BTN_SIZE(1,1), F(""), OPT_FLAT);
-    #else
-       .button( BTN_POS(1,3), BTN_SIZE(1,2), F(""), OPT_FLAT);
-    #endif
+       .button( STATUS_POS, F(""), OPT_FLAT);
 
-    draw_text_box(cmd,
-    #ifdef TOUCH_UI_PORTRAIT
-      BTN_POS(1,4), BTN_SIZE(1,1),
-    #else
-      BTN_POS(1,3), BTN_SIZE(1,2),
-    #endif
-      message, OPT_CENTER, font_large);
+    draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large);
   }
   #undef  GRID_COLS
 }
@@ -326,10 +314,10 @@ void StatusScreen::setStatusMessage(const char* message) {
      .cmd(CLEAR(true,true,true));
 
   draw_temperature(BACKGROUND);
-  draw_progress(BACKGROUND);
-  draw_axis_position(BACKGROUND);
   draw_status_message(BACKGROUND, message);
   draw_interaction_buttons(BACKGROUND);
+  draw_progress(BACKGROUND);
+  draw_axis_position(BACKGROUND);
 
   storeBackground();
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
similarity index 96%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
index 9aa28aff39d8..2e05ad5c5728 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
+#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
 
 #include "screens.h"
 
@@ -74,4 +74,4 @@ bool StepperBumpSensitivityScreen::onTouchHeld(uint8_t tag) {
   return true;
 }
 
-#endif // TOUCH_UI_FTDI_EVE && HAS_TRINAMIC
+#endif // TOUCH_UI_FTDI_EVE && HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
index acc94684e096..5abcea7a6748 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC
+#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/string_format.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
new file mode 100644
index 000000000000..e2770d8116d3
--- /dev/null
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
@@ -0,0 +1,177 @@
+/************
+ * colors.h *
+ ************/
+
+/****************************************************************************
+ *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2019 - 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: <http://www.gnu.org/licenses/>.                              *
+ ****************************************************************************/
+
+#pragma once
+
+namespace Theme {
+  #if ENABLED(TOUCH_UI_COCOA_THEME)
+    constexpr int      accent_hue           = 23;
+
+    // Browns and Oranges
+    constexpr uint32_t accent_color_1       = hsl_to_rgb(12.8,0.597,0.263); // Darkest
+    constexpr uint32_t accent_color_2       = hsl_to_rgb(12.8,0.597,0.263);
+    constexpr uint32_t accent_color_3       = hsl_to_rgb( 9.6,0.664,0.443);
+    constexpr uint32_t accent_color_4       = hsl_to_rgb(16.3,0.873,0.537);
+    constexpr uint32_t accent_color_5       = hsl_to_rgb(23.0,0.889,0.539);
+    constexpr uint32_t accent_color_6       = hsl_to_rgb(23.0,0.889,0.539); // Lightest
+  #else
+    // Use linear accent colors
+
+    #if ANY(TOUCH_UI_ROYAL_THEME, TOUCH_UI_FROZEN_THEME)
+        // Dark blue accent colors
+        constexpr int      accent_hue       = 216;
+        constexpr float    accent_sat       = 0.7;
+    #else
+        // Green accent colors
+        constexpr int      accent_hue       = 68;
+        constexpr float    accent_sat       = 0.68;
+    #endif
+
+    // Shades of accent color
+    constexpr uint32_t accent_color_0       = hsl_to_rgb(accent_hue, accent_sat, 0.15); // Darkest
+    constexpr uint32_t accent_color_1       = hsl_to_rgb(accent_hue, accent_sat, 0.26);
+    constexpr uint32_t accent_color_2       = hsl_to_rgb(accent_hue, accent_sat, 0.39);
+    constexpr uint32_t accent_color_3       = hsl_to_rgb(accent_hue, accent_sat, 0.52);
+    constexpr uint32_t accent_color_4       = hsl_to_rgb(accent_hue, accent_sat, 0.65);
+    constexpr uint32_t accent_color_5       = hsl_to_rgb(accent_hue, accent_sat, 0.78);
+    constexpr uint32_t accent_color_6       = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest
+  #endif
+
+  // Shades of gray
+
+  constexpr float    gray_sat               = 0.14;
+  constexpr uint32_t gray_color_0           = hsl_to_rgb(accent_hue, gray_sat, 0.15); // Darkest
+  constexpr uint32_t gray_color_1           = hsl_to_rgb(accent_hue, gray_sat, 0.26);
+  constexpr uint32_t gray_color_2           = hsl_to_rgb(accent_hue, gray_sat, 0.39);
+  constexpr uint32_t gray_color_3           = hsl_to_rgb(accent_hue, gray_sat, 0.52);
+  constexpr uint32_t gray_color_4           = hsl_to_rgb(accent_hue, gray_sat, 0.65);
+  constexpr uint32_t gray_color_5           = hsl_to_rgb(accent_hue, gray_sat, 0.78);
+  constexpr uint32_t gray_color_6           = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest
+
+  #if ENABLED(TOUCH_UI_ROYAL_THEME)
+    constexpr uint32_t theme_darkest        = accent_color_1;
+    constexpr uint32_t theme_dark           = accent_color_4;
+
+    constexpr uint32_t bg_color             = gray_color_0;
+    constexpr uint32_t axis_label           = gray_color_1;
+
+    constexpr uint32_t bg_text_enabled      = accent_color_6;
+    constexpr uint32_t bg_text_disabled     = gray_color_0;
+    constexpr uint32_t bg_normal            = accent_color_4;
+    constexpr uint32_t fg_disabled          = gray_color_0;
+    constexpr uint32_t fg_normal            = accent_color_0;
+    constexpr uint32_t fg_action            = accent_color_1;
+
+    constexpr uint32_t logo_bg_rgb          = accent_color_1;
+    constexpr uint32_t logo_fill_rgb        = accent_color_0;
+    constexpr uint32_t logo_stroke_rgb      = accent_color_4;
+  #elif ANY(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME)
+    constexpr uint32_t theme_darkest        = accent_color_1;
+    constexpr uint32_t theme_dark           = accent_color_4;
+
+    constexpr uint32_t bg_color             = 0xFFFFFF;
+    constexpr uint32_t axis_label           = gray_color_5;
+
+    constexpr uint32_t bg_text_enabled      = accent_color_1;
+    constexpr uint32_t bg_text_disabled     = gray_color_1;
+    constexpr uint32_t bg_normal            = accent_color_4;
+    constexpr uint32_t fg_disabled          = gray_color_6;
+    constexpr uint32_t fg_normal            = accent_color_1;
+    constexpr uint32_t fg_action            = accent_color_4;
+
+    constexpr uint32_t logo_bg_rgb          = accent_color_5;
+    constexpr uint32_t logo_fill_rgb        = accent_color_6;
+    constexpr uint32_t logo_stroke_rgb      = accent_color_2;
+  #else
+    constexpr uint32_t theme_darkest        = gray_color_1;
+    constexpr uint32_t theme_dark           = gray_color_2;
+
+    constexpr uint32_t bg_color             = gray_color_1;
+    constexpr uint32_t axis_label           = gray_color_2;
+
+    constexpr uint32_t bg_text_enabled      = 0xFFFFFF;
+    constexpr uint32_t bg_text_disabled     = gray_color_2;
+    constexpr uint32_t bg_normal            = gray_color_1;
+    constexpr uint32_t fg_disabled          = gray_color_1;
+    constexpr uint32_t fg_normal            = gray_color_2;
+    constexpr uint32_t fg_action            = accent_color_2;
+
+    constexpr uint32_t logo_bg_rgb          = accent_color_4;
+    constexpr uint32_t logo_fill_rgb        = accent_color_3;
+    constexpr uint32_t logo_stroke_rgb      = 0x000000;
+  #endif
+
+  constexpr uint32_t shadow_rgb             = gray_color_6;
+  constexpr uint32_t stroke_rgb             = accent_color_1;
+  constexpr uint32_t fill_rgb               = accent_color_3;
+  constexpr uint32_t syringe_rgb            = accent_color_5;
+
+  #if ENABLED(TOUCH_UI_ROYAL_THEME)
+    constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.26);
+    constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.13);
+    constexpr uint32_t z_axis               = hsl_to_rgb(240, 1.00, 0.10); 
+  #else
+    constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.5);
+    constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.37);
+    constexpr uint32_t z_axis               = hsl_to_rgb(240, 1.00, 0.37);
+  #endif
+  constexpr uint32_t e_axis                 = axis_label;
+  constexpr uint32_t feedrate               = axis_label;
+  constexpr uint32_t other                  = axis_label;
+
+  // Status screen
+  constexpr uint32_t progress               = axis_label;
+  constexpr uint32_t status_msg             = axis_label;
+  #if ENABLED(TOUCH_UI_ROYAL_THEME)
+    constexpr uint32_t fan_speed            = hsl_to_rgb(240, 0.5, 0.13);
+    constexpr uint32_t temp                 = hsl_to_rgb(343, 1.0, 0.23);
+  #else
+    constexpr uint32_t fan_speed            = hsl_to_rgb(204, 0.47, 0.41);
+    constexpr uint32_t temp                 = hsl_to_rgb(311, 0.51, 0.35);
+  #endif
+
+  constexpr uint32_t disabled_icon          = gray_color_1;
+
+  // Calibration Registers Screen
+  constexpr uint32_t transformA             = 0x3010D0;
+  constexpr uint32_t transformB             = 0x4010D0;
+  constexpr uint32_t transformC             = 0x5010D0;
+  constexpr uint32_t transformD             = 0x6010D0;
+  constexpr uint32_t transformE             = 0x7010D0;
+  constexpr uint32_t transformF             = 0x8010D0;
+  constexpr uint32_t transformVal           = 0x104010;
+
+  constexpr btn_colors disabled_btn         = {.bg = bg_color,      .grad = fg_disabled, .fg = fg_disabled,  .rgb = fg_disabled };
+  constexpr btn_colors normal_btn           = {.bg = fg_action,     .grad = 0xFFFFFF,    .fg = fg_normal,    .rgb = 0xFFFFFF };
+  constexpr btn_colors action_btn           = {.bg = bg_color,      .grad = 0xFFFFFF,    .fg = fg_action,    .rgb = 0xFFFFFF };
+  constexpr btn_colors red_btn              = {.bg = 0xFF5555,      .grad = 0xFFFFFF,    .fg = 0xFF0000,     .rgb = 0xFFFFFF };
+  constexpr btn_colors ui_slider            = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = accent_color_3 };
+  constexpr btn_colors ui_toggle            = {.bg = theme_darkest, .grad = 0xFFFFFF,    .fg = theme_dark,   .rgb = 0xFFFFFF };
+
+  // Temperature color scale
+
+  const rgb_t cool_rgb (  0,   0,   0);
+  const rgb_t low_rgb  (128,   0,   0);
+  const rgb_t med_rgb  (255, 128,   0);
+  const rgb_t high_rgb (255, 255, 128);
+};
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/fonts.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/fonts.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
index 5e01f0471c6b..a65cbea52ad8 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
@@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0xADF3, 0x546C, 0x419D, 0x546F, 0x3D05,
 
 #define LOGO_BACKGROUND logo_bg_rgb
 #define LOGO_PAINT_PATHS \
-  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \
-  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill)
+  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill) \
+  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
similarity index 97%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
index a5af7a14cd9c..a9c1d4049e91 100644
--- a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
@@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0x3C19, 0x70C5, 0x371A, 0x7159, 0x3302,
 
 #define LOGO_BACKGROUND logo_bg_rgb
 #define LOGO_PAINT_PATHS \
-  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \
-  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill)
+  LOGO_PAINT_PATH(logo_fill_rgb,   logo_fill) \
+  LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke)
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/sounds.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
diff --git a/Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/theme.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
similarity index 100%
rename from Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/theme/theme.h
rename to Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/ui_api.cpp
rename to Marlin/src/lcd/extui/ui_api.cpp
index 7ef7614b8df8..79e12f36d19c 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -65,7 +65,7 @@
 #endif
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
@@ -75,7 +75,7 @@
   #define IFSD(A,B) (B)
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "../../feature/tmc_util.h"
   #include "../../module/stepper/indirection.h"
 #endif
@@ -445,7 +445,7 @@ namespace ExtUI {
     void setSoftEndstopState(const bool value) { soft_endstops_enabled = value; }
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     float getAxisCurrent_mA(const axis_t axis) {
       switch (axis) {
         #if AXIS_IS_TMC(X)
diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
similarity index 99%
rename from Marlin/src/lcd/extensible_ui/ui_api.h
rename to Marlin/src/lcd/extui/ui_api.h
index 10df2bc72d99..01e0d1b7a384 100644
--- a/Marlin/src/lcd/extensible_ui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -97,7 +97,7 @@ namespace ExtUI {
     void setSoftEndstopState(const bool);
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     float getAxisCurrent_mA(const axis_t);
     float getAxisCurrent_mA(const extruder_t);
     void  setAxisCurrent_mA(const float, const axis_t);
@@ -341,10 +341,10 @@ namespace ExtUI {
   void onConfigurationStoreWritten(bool success);
   void onConfigurationStoreRead(bool success);
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void OnPowerLossResume();
+    void onPowerLossResume();
   #endif
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst);
+    void onPidTuning(const result_t rst);
   #endif
 };
 
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui_dgus_lcd.cpp
index 5c6f11d7cb48..855d09033e85 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui_dgus_lcd.cpp
@@ -30,9 +30,9 @@
 
 #if HAS_DGUS_LCD
 
-#include "extensible_ui/ui_api.h"
-#include "extensible_ui/lib/dgus/DGUSDisplay.h"
-#include "extensible_ui/lib/dgus/DGUSDisplayDefinition.h"
+#include "extui/ui_api.h"
+#include "extui/lib/dgus/DGUSDisplay.h"
+#include "extui/lib/dgus/DGUSDisplayDef.h"
 
 extern const char NUL_STR[];
 
@@ -123,7 +123,7 @@ namespace ExtUI {
   }
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void OnPowerLossResume() {
+    void onPowerLossResume() {
       // Called on resume from power-loss
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POWER_LOSS);
     }
@@ -131,9 +131,9 @@ namespace ExtUI {
 
 
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst) {
+    void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
-      SERIAL_ECHOLNPAIR("OnPidTuning:",rst);
+      SERIAL_ECHOLNPAIR("onPidTuning:",rst);
       switch(rst) {
         case PID_BAD_EXTRUDER_NUM:
           ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_BAD_EXTRUDER_NUM));
diff --git a/Marlin/src/lcd/extui_example.cpp b/Marlin/src/lcd/extui_example.cpp
index 5e65af73815e..5c9a193ded3b 100644
--- a/Marlin/src/lcd/extui_example.cpp
+++ b/Marlin/src/lcd/extui_example.cpp
@@ -23,7 +23,7 @@
 
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
 
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
 
 // To implement a new UI, complete the functions below and
 // read or update Marlin's state using the methods in the
@@ -94,13 +94,13 @@ namespace ExtUI {
   }
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void OnPowerLossResume() {
+    void onPowerLossResume() {
       // Called on resume from power-loss
     }
   #endif
 
   #if HAS_PID_HEATING
-    void OnPidTuning(const result_t rst) {
+    void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
     }
   #endif
diff --git a/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin/src/lcd/extui_malyan_lcd.cpp
index 0d2567a20489..ddb8b846cb07 100644
--- a/Marlin/src/lcd/extui_malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui_malyan_lcd.cpp
@@ -47,7 +47,7 @@
 
 #define DEBUG_MALYAN_LCD
 
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
 
 #include "ultralcd.h"
 #include "../sd/cardreader.h"
@@ -81,7 +81,7 @@ void write_to_lcd_P(PGM_P const message) {
   char encoded_message[MAX_CURLY_COMMAND];
   uint8_t message_length = _MIN(strlen_P(message), sizeof(encoded_message));
 
-  for (uint8_t i = 0; i < message_length; i++)
+  LOOP_L_N(i, message_length)
     encoded_message[i] = pgm_read_byte(&message[i]) | 0x80;
 
   LCD_SERIAL.Print::write(encoded_message, message_length);
@@ -91,7 +91,7 @@ void write_to_lcd(const char * const message) {
   char encoded_message[MAX_CURLY_COMMAND];
   const uint8_t message_length = _MIN(strlen(message), sizeof(encoded_message));
 
-  for (uint8_t i = 0; i < message_length; i++)
+  LOOP_L_N(i, message_length)
     encoded_message[i] = message[i] | 0x80;
 
   LCD_SERIAL.Print::write(encoded_message, message_length);
@@ -483,6 +483,7 @@ namespace ExtUI {
   void onLoadSettings(const char*) {}
   void onConfigurationStoreWritten(bool) {}
   void onConfigurationStoreRead(bool) {}
+  void onPidTuning(const result_t) {}
 }
 
 #endif // MALYAN_LCD
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index ed2f779dd84a..cd201ded34ac 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -236,6 +236,11 @@ namespace Language_de {
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Lüfter ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Geschw. Extralüfter");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Geschw. Extralüfter ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Lüfter Kontroller");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Lüfter Leerlauf");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Motorlast Modus");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Lüfter Motorlast");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Ausschalt Delay");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flussrate");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flussrate ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Einstellungen");
@@ -349,17 +354,17 @@ namespace Language_de {
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z-Sonde außerhalb");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Korrekturfaktor");
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Selbsttest");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("BLTouch zurücks.");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("BLTouch ausfahren");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("BLTouch SW-Modus");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("BLTouch 5V-Modus");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("BLTouch OD-Modus");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("BLTouch Mode Store");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("BLTouch auf 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("BLTouch auf OD");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("BLTouch einfahren");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("BLTouch Modus: ");
+  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Selbsttest");
+  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Zurücksetzen");
+  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Ausfahren");
+  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Modus");
+  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Modus");
+  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Modus");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Mode-Store");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Setze auf 5V");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Setze auf OD");
+  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Einfahren");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Modus: ");
   PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("ACHTUNG: Falsche Einstellung - kann zu Beschädigung führen! Fortfahren?");
   PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
   PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("TouchMI initial.");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index b5f508973df6..a52d9652ac64 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -247,6 +247,11 @@ namespace Language_en {
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Stored Fan ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra Fan Speed");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra Fan Speed ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Controller Fan");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Idle Speed");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Auto Mode");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Active Speed");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Idle Period");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flow");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flow ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Control");
@@ -347,6 +352,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Print Paused");
   PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Printing...");
   PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Print Aborted");
+  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Print Done");
   PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("No Move.");
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("KILLED. ");
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("STOPPED. ");
@@ -596,6 +602,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
+  
+  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Level X Axis");
+  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibrate");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index ffa12f39fe6d..e691d26ab4c1 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -93,7 +93,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Allumer alim.");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Eteindre alim.");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrusion");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Rétraction");
+  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Rétractation");
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Déplacer un axe");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Régler Niv. lit");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveau du lit");
@@ -317,7 +317,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Moteurs bloqués");
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("KILLED");
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("STOPPÉ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Rétraction mm");
+  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Rétractation mm");
   PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Ech. rétr. mm");
   PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Vit. rétract°");
   PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Saut Z mm");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index ae4dd813ea5f..8d8112d523f1 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -245,6 +245,11 @@ namespace Language_it {
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Ventola mem. ~");   // Max 15 characters
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra vel.vent.");  // Max 15 characters
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra v.vent. ~");  // Max 15 characters
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Controller vent.");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Vel. inattivo");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Modo autom.");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Vel. attivo");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Tempo inattivo");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flusso");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flusso ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Controllo");
@@ -312,6 +317,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Carica impostazioni");
   PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Ripristina imp.");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inizializza EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Err: CRC EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Err: Indice EEPROM");
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Err: Versione EEPROM");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Aggiorna media");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetta stampante");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Aggiorna");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 82c91c65029c..a7c971e8c7e9 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -222,6 +222,11 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Кулер ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Кулер доп.");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Кулер доп. ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Обдув платы");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Обороты простоя");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Автовключение");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Рабочие обороты");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Простой после");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Поток");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Поток ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Настройки");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 57d2911af93d..096fef254cf2 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -42,9 +42,18 @@ namespace Language_tr {
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Turkish");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" hazır.");
+  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
+  PROGMEM Language_Str MSG_YES                             = _UxGT("EVET");
+  PROGMEM Language_Str MSG_NO                              = _UxGT("HAYIR");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Geri");
+  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Durduruluyor...");
   PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("SD K. Yerleştirildi.");
   PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("SD Kart Çıkarıldı.");
+  PROGMEM Language_Str MSG_MEDIA_RELEASED                  = _UxGT("SD Kart Serbest");
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("SD Kart Bekleniyor");
+  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Kart Okuma Hatası");
+  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB Çıkarıldı");
+  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB Başlat. Hatası");
   PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Enstops"); // Max length 8 characters
   PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Yazılımsal Endstops");
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("Ana");
@@ -64,8 +73,8 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Sonraki Nokta");
   PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Hizalama Tamam!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Kaçınma Yüksekliği");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Offset Ayarla");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offset Tamam");
+  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ofset Ayarla");
+  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofset Tamam");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Sıfır Belirle");
   PROGMEM Language_Str MSG_PREHEAT_1                       = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
   PROGMEM Language_Str MSG_PREHEAT_1_H                     = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
@@ -82,7 +91,16 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY               = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla");
   PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS              = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar");
   PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Özel Ön Isınma");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Soğut");
+  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Soğut/(Durdur)");
+  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Lazer Kontrolü");
+  PROGMEM Language_Str MSG_LASER_OFF                       = _UxGT("Lazeri Kapat");
+  PROGMEM Language_Str MSG_LASER_ON                        = _UxGT("Lazeri Aç");
+  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Lazer Gücü");
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Spindle Kontrolü");
+  PROGMEM Language_Str MSG_SPINDLE_OFF                     = _UxGT("Spindle Kapat");
+  PROGMEM Language_Str MSG_SPINDLE_ON                      = _UxGT("Spindle Aç");
+  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Spindle Gücü");
+  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Spindle Ters Yön");
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Gücü Aç");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Gücü Kapat");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Ekstrüzyon");
@@ -92,13 +110,19 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Tabla Hizası");
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Hizalama Köşeleri");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Sonraki Köşe");
+  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Mesh Editörü");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Mesh Düzenle");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Mesh Düzenleme Durdu");
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Prop Noktası");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("İndeks X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("İndeks Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Değeri");
   PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("Özel Komutlar");
+  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Prob Testi");
+  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Nokta");
+  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Sapma");
   PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX Modu");
+  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Takım Ofsetleri");
   PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Oto-Park");
   PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Kopyala");
   PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Yansıtılmış kopya");
@@ -109,6 +133,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("G29 Çalışıyor");
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL Araçları");
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("UBL Yatak Hizalama");
+  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Eğim Noktası");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Elle Mesh Oluştur");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Altlık & Ölçü Ver");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Ölçü");
@@ -135,6 +160,13 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1            = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")");
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2            = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")");
   PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Özel Mesh Doğrulama");
+  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Isıtma Tablası");
+  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Isıtma Memesi");
+  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Manuel çalışma...");
+  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Birincil Sabit Uzunluk");
+  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Çalışma Tamamlandı");
+  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 İptal edildi");
+  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Çıkış G26");
   PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Tabla Mesh Devam et");
   PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Mesh Hizalama");
   PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-Nokta Hizalama");
@@ -164,6 +196,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Depolama Yok");
   PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Hata: UBL Kayıt");
   PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Hata: UBL Yenileme");
+  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Ofset: ");
   PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-Ofset Durduruldu");
   PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Adım Adım UBL");
   PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Soğuk Mesh Oluştur");
@@ -175,8 +208,8 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Yatak Mesh Kayıt Et");
 
   PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED Kontrolü");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Işıklar");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Işık Hazır Ayarları");
+  PROGMEM Language_Str MSG_LEDS                            = _UxGT("LEDler");
+  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("LED Hazır Ayarları");
   PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Kırmızı");
   PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Turuncu");
   PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Sarı");
@@ -192,6 +225,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Mavi Şiddeti");
   PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Beyaz Şiddeti");
   PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Parlaklık");
+
   PROGMEM Language_Str MSG_MOVING                          = _UxGT("Hareket Ediyor..");
   PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Durdur XY");
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("X Hareketi");
@@ -209,8 +243,10 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozul");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozul ~");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Tabla");
+  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Çevirme");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Fan Hızı");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Fan Hızı ~");
+  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Depolanan Fan ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Ekstra Fan Hızı");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Ekstra Fan Hızı ~");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Akış");
@@ -222,9 +258,22 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Oto. Sıcaklık");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Açık");
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Kapalı");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Kalibrasyon");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Kalibrasyon *");
+  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("Seç");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seç *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("İvme");
+
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Sarsım");
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Sarsım");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Sarsım");
@@ -268,15 +317,31 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Hafızadan Yükle");
   PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Fabrika Ayarları");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("EEPROM'u başlat");
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Hata: EEPROM CRC");
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Hata: EEPROM Indeks");
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Hata: EEPROM Versiyonu");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("SD Güncellemesi");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Yazıcıyı Resetle");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Yenile");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Bilgi Ekranı");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Hazırlık");
   PROGMEM Language_Str MSG_TUNE                            = _UxGT("Ayar");
+  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Yaz. Başlat");
+  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("İleri");
+  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("İçinde");
+  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Durdur");
+  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Yazdır");
+  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Resetle");
+  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("İptal");
+  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Tamamlandı");
+  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Geri");
+  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Devam ediyor");
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Duraklat");
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Sürdür");
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Durdur");
+  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Yazdırma Nesnesi");
+  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Nesneyi İptal Et");
+  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Nesneyi İptal Et =");
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Kesinti Kurtarma");
   PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("SD Karttan Yazdır");
   PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("SD Kart Yok!");
@@ -298,10 +363,12 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Oto. Geri Çekme");
   PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("G.Çekme Boyu");
+  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Tasfiye uzunluğu");
   PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Takım Değişimi");
   PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z Yükselt");
   PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD          = _UxGT("Birincil Hız");
   PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD        = _UxGT("Geri Çekme Hızı");
+  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Nozul Beklemede");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Filaman Değiştir");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Filaman Değiştir *");
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Filaman Yükle");
@@ -311,29 +378,52 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Tümünü Çıkart");
   PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("SD Kart Başlatılıyor");
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("SD Kart Değiştir");
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("SD Kart Çıkart");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Prob Açık. Tabla");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Çarpıklık Faktörü");
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Self-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Sıfırla BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("BLTouch Aç");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("BLTouch Kapat");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Prob Aç");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Sensör Kapat");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Sıfırla %s%s%s Önce");
+  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch K. Test");
+  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Cmd: Reset");
+  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Cmd: Kapat");
+  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Cmd: Aç");
+  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Cmd: SW-Modu");
+  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Cmd: 5V-Modu");
+  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Cmd: OD-Modu");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Cmd: Mode-Store");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("BLTouch 5V Ayarla");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("BLTouch OD Ayarla");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Drenaj Raporu");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("TEHLIKE: Kötü ayarlar hasara neden olabilir! Yine de devam edilsin mi?");
+  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Init TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Z Ofset Testi");
+  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Kaydet");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("TouchMI Aç");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Probe Aç");
+  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Probe Kapat");
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Önce %s%s%s Sıfırla");
+  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Prob Ofsetleri");
+  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("X Prob Ofset");
+  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Y Prob Ofset");
+  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z Prob Ofset");
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Miniadım X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Miniadım Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Miniadım Z");
+  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Toplam");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Endstop iptal");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Isınma başarısız");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD_BED          = _UxGT("Yatak Isınma Başrsız");
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD_CHAMBER      = _UxGT("Oda Isıtma Hatası");
   PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Hata: Sıcaklık Aşımı");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TERMAL PROBLEM");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TABLA TERMAL PROBLEM");
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("ODA TERMAL PROBLEM");
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Hata: MAX.SICAKLIK");
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Hata: MIN.SICAKLIK");
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("Hata: MAX.SIC. TABLA");
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("Hata: MIN.SIC. TABLA");
+  PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("Hata: MAX.SIC ODA");
+  PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("Hata: MIN.SIC ODA");
   PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("Önce XY Sıfırla");
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("YAZICI DURDURULDU");
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Lütfen Resetleyin");
@@ -344,6 +434,8 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("Soğuyor...");
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Tabla Isınıyor...");
   PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Tabla Soğuyor...");
+  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Oda Isınıyor...");
+  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Oda Soğuyor...");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibrasyonu");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Ayarla X");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Ayarla Y");
@@ -371,7 +463,6 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Aydınlatmayı Aç");
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Aydınlatma Parlaklğı");
-
   PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Yanlış Yazıcı");
 
   #if LCD_WIDTH >= 20
@@ -387,6 +478,7 @@ namespace Language_tr {
     PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("En Uzun");
     PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Filaman");
   #endif
+
   PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min Sıc.");
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Sıc.");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Güç Kaynağı");
@@ -395,7 +487,9 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Sürücü %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Sürücü %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Sürücü %");
+  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC BAĞLANTI HATASI");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Yaz");
+  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("FILAMAN DEGISTIR");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("BASKI DURAKLATILDI");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("FILAMAN YüKLE");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("FILAMAN ÇIKART");
@@ -404,15 +498,69 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Baskıyı sürdür");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Nozul: ");
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Runout Sensörü");
+  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Aşınma Farkı mm");
   PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Sıfırlama Başarısız");
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Başarısız");
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Çok Soğuk");
+
+  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("FILAMAN SEÇ");
+  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
+  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("MMU Yaz. Güncelle!");
+  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Dikkat Gerektirir.");
+  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Yaz. Devam Et");
+  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Sürdürülüyor...");
+  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Filaman Yükle");
+  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Tümünü Yükle");
+  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Nozula Yükle");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Filaman Çıkart");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Filaman Çıkart ~");
+  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Filamenti Boşalt");
+  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Fil. Yükleniyor %i...");
+  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Fil Çıkartılıyor. ...");
+  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Fil. Boşaltılıyor....");
+  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Tümü");
+  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filaman ~");
+  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("MMU Resetle");
+  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU Resetleniyot...");
+  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Kaldır, tıkla");
+
+  PROGMEM Language_Str MSG_MIX                             = _UxGT("Karışım");
+  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Bileşen =");
+  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Karıştırıcı");
+  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradyan");
+  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Tam Gradyan");
+  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Karışım Geçişi");
+  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Döngü Karışımı");
+  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradyan Karışımı");
+  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Ters Gradyan");
+  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Aktif V-tool");
+  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Başlat V-tool");
+  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  Bitir V-tool");
+  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias V-tool");
+  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Reset V-tools");
+  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("V-tool Karışıö Yap");
+  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools Resetlendi");
+  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Başlat Z:");
+  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  Bitir Z:");
+
+  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Oyunlar");
+  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Brickout");
+  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Invaders");
+  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
+  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
+
+  #define MSG_1_LINE(A)     A "\0"   "\0"
+  #define MSG_2_LINE(A,B)   A "\0" B "\0"
+  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
+
   //
-  // Filament Değiştirme ekranları, 4 satırlı bir ekranda 3 satıra kadar gösterilir
+  // Filament Değişim ekranları 4 satırlı ekranda 3 satıra kadar gösterilir
   //                        ...veya 3 satırlı ekranda 2 satıra kadar
+  //
   #if LCD_HEIGHT >= 4
-    // Up to 3 lines allowed
+
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Baskıya devam etmek", "için Butona bas"));
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("Park Ediliyor..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Filaman değişimi", "için başlama", "bekleniyor"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Filamanı yükle", "ve devam için", "tuşa bas..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Nozulü Isıtmak için", "Butona Bas."));
@@ -422,9 +570,9 @@ namespace Language_tr {
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "için bekle"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "bitirmek için tıkla"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Baskının devam ", "etmesi için bekle"));
-  #else // LCD_HEIGHT < 4
-    // Up to 2 lines allowed
+  #else
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Sürdürmek İçin Tıkla"));
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("Park Ediliyor..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Lütfen bekleyiniz..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Yükle ve bas"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Isıtmak için Tıkla"));
@@ -434,5 +582,27 @@ namespace Language_tr {
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Temizleniyor..."));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Bitirmek için Tıkla"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Sürdürülüyor..."));
-  #endif // LCD_HEIGHT < 4
+  #endif
+  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC Sürücüleri");
+  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Sürücü Akımı");
+  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hibrit Eşiği");
+  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Sensörsüz Sıfırlama");
+  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Adım Modu");
+  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop Aktif");
+  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Resetle");
+  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" içinde:");
+  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Ters Tepki");
+  PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
+  PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
+  PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
+  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Düzeltme");
+  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Yumuşatma");
 }
+
+#if FAN_COUNT == 1
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
+#else
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_N
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
+#endif
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index d0871f0e4604..06b19440f281 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -35,11 +35,23 @@ namespace Language_zh_TW {
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Traditional Chinese");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就緒.");     //" ready."
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // ”Back“
+  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
+  PROGMEM Language_Str MSG_YES                             = _UxGT("是");  //"YES"
+  PROGMEM Language_Str MSG_NO                              = _UxGT("否");  //"NO"
+  PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // "Back"
+  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("正在中止...");   //"Aborting..."
   PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("記憶卡已插入");     //"Card inserted"
   PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("記憶卡被拔出");     //"Card removed"
+  PROGMEM Language_Str MSG_MEDIA_RELEASED                  = _UxGT("記憶卡被釋放");   //"Media Released"
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("等待記憶卡");    //"Waiting for media"
+  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("記憶卡讀取錯誤"); //"Media read error"
+  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB裝置已移除");   //"USB device removed"
+  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB啟動失敗");  //"USB start failed"
   PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("擋塊");     //"Endstops" // Max length 8 characters
+  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("軟體擋塊");    //"Soft Endstops"
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("主選單");     //"Main"
+  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("進階設置");   //"Advanced Settings"
+  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("設置");    //Configuration
   PROGMEM Language_Str MSG_AUTOSTART                       = _UxGT("自動開始");     //"Autostart"
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("關閉步進馬達");     //"Disable steppers"
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("除錯選單");     // "Debug Menu"
@@ -48,6 +60,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("回X原點");     //"Home X"
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("回Y原點");     //"Home Y"
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("回Z原點");     //"Home Z"
+  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("自動Z對齊");   //"Auto Z-Align"
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("平台調平XYZ歸原點");     //"Homing XYZ"
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("單擊開始熱床調平");     //"Click to Begin"
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("下個熱床調平點");     //"Next Point"
@@ -70,7 +83,17 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_PREHEAT_2_ALL                   = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部");     //MSG_PREHEAT_2 " All"
   PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY               = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床");     //MSG_PREHEAT_2 " Bed"
   PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS              = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置");     //MSG_PREHEAT_2 " conf"
+  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("自定預熱");   //"Preheat Custom"
   PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降溫");     //"Cooldown"
+  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("激光控制");    //"Laser Control"
+  PROGMEM Language_Str MSG_LASER_OFF                       = _UxGT("激光 關");    //"Laser Off"
+  PROGMEM Language_Str MSG_LASER_ON                        = _UxGT("激光 開");   //"Laser On"
+  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("激光電源");    //"Laser Power"
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主軸控告制");    //"Spindle Control"
+  PROGMEM Language_Str MSG_SPINDLE_OFF                     = _UxGT("主軸 關");    //"Spindle Off"
+  PROGMEM Language_Str MSG_SPINDLE_ON                      = _UxGT("主軸 開");   //"Spindle On"
+  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("主軸電源");    //"Spindle Power"
+  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("主軸反轉");  //"Spindle Reverse"
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("電源打開");     //"Switch power on"
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("電源關閉");     //"Switch power off"
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("擠出");     //"Extrude"
@@ -79,15 +102,31 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("調平熱床");     //"Bed leveling"
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("調平熱床");     //"Level bed"
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("調平邊角");     // "Level corners"
-
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下個邊角");     // "Next corner"
+  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("網格編輯器");    //"Mesh Editor"
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("編輯網格");     // "Edit Mesh"
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("網格編輯已停止");     // "Mesh Editing Stopped"
-  PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("客制命令");     // "Custom Commands"
-
+  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("探測點");   //"Probing Point"
+  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("索引 X");    //"Index X"
+  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("索引 Y");    //"Index Y"
+  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z 值");    //"Z Value"
+  PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("自定命令");     // "Custom Commands"
+  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 探測測試");   //"M48 Probe Test"
+  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 探測點");    //"M48 Point"
+  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("偏差");    //"Deviation"
+  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX Mode");
+  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Tool Offsets");
+  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Park");
+  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplication");
+  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Mirrored Copy");
+  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Full Control");
+  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2nd Nozzle X");
+  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2nd Nozzle Y");
+  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2nd Nozzle Z");
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("執行G29");     // "Doing G29"
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL工具");     // "UBL Tools"
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
+  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("傾斜點");  //"Tilting Point"
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("手工建網");     // "Manually Build Mesh"
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("放置墊片並測量");     // "Place shim & measure"
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("測量");     // "Measure"
@@ -95,8 +134,10 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("移動到下一個");     // "Moving to next"
   PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("啟動UBL");     // "Activate UBL"
   PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("關閉UBL");     // "Deactivate UBL"
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("設置熱床溫度");     // "Bed Temp"
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("熱端溫度");     // "Hotend Temp"
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("置設熱床溫度");     // "Bed Temp"
+  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("置設熱床溫度");    //"Bed Temp")
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("置設噴嘴溫度");     // "Hotend Temp"
+  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("熱端溫度");    //"Hotend Temp"
   PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("網格編輯");     // "Mesh Edit"
   PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("編輯客戶網格");     // "Edit Custom Mesh"
   PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("細調網格");     // "Fine Tuning Mesh"
@@ -112,6 +153,13 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1            = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格");     // "Validate PREHEAT_1_LABEL Mesh"
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2            = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格");     // "Validate PREHEAT_2_LABEL Mesh"
   PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("批准客戶網格");     // "Validate Custom Mesh"
+  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 加熱熱床");    //"G26 Heating Bed"
+  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle"
+  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("手動填裝");  //"Manual priming..."
+  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("固定距離填裝");   //"Fixed Length Prime"
+  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("完成填裝");   //"Done Priming"
+  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26已取消");   //"G26 Canceled"
+  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("離開 G26");  //"Leaving G26"
   PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("繼續熱床網格");     // "Continue Bed Mesh"
   PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("網格調平");     // "Mesh Leveling"
   PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("三點調平");     // "3-Point Leveling"
@@ -141,6 +189,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("沒有存儲");     // "No storage"
   PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("錯誤: UBL保存");     // "Err: UBL Save"
   PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("錯誤: UBL還原");     // "Err: UBL Restore"
+  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-偏移:");   //"Z-Offset: "
   PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z偏移已停止");     // "Z-Offset Stopped"
   PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("一步步UBL");     // "Step-By-Step UBL"
   PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. 創設冷網格");
@@ -162,7 +211,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("青");     // "Indigo")
   PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("紫");     // "Violet")
   PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("白");     // "White")
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("缺省");     // "Default")
+  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("復歸");     // "Default")
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("定制燈");     // "Custom Lights")
   PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("紅飽和度");     // "Red Intensity")
   PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("綠飽和度");     // "Green Intensity")
@@ -176,7 +225,8 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("移動Y");     //"Move Y"
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("移動Z");     //"Move Z"
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("擠出機");     //"Extruder"
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("擠出機 *");
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("擠出機 *");       //"Extruder *"
+  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");  //"Hotend too cold"
   PROGMEM Language_Str MSG_MOVE_Z_DIST                     = _UxGT("移動 %s mm");     //"Move 0.025mm"
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移動 0.1 mm");     //"Move 0.1mm"
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移動 1 mm");     //"Move 1mm"
@@ -186,10 +236,12 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴");     //"Nozzle" 噴嘴
   PROGMEM Language_Str MSG_NOZZLE_N                        = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴 ~");
   PROGMEM Language_Str MSG_BED                             = " " LCD_STR_THERMOMETER _UxGT(" 熱床");     //"Bed"
+  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Enclosure");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("風扇速率");     //"Fan speed"
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("風扇速率 ~");
+  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("風扇速率 =");
+  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Stored Fan =");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("額外風扇速率");     // "Extra fan speed"
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("額外風扇速率 ~");
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("額外風扇速率 =");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("擠出速率");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("擠出速率 ~");     //"Flow"
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     //"Control"
@@ -197,8 +249,20 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" 最大");     //" " LCD_STR_THERMOMETER " Max"
   PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 系數");     //" " LCD_STR_THERMOMETER " Fact"
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("自動控溫");     //"Autotemp"
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("開");     //"On"
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("關");     //"Off"
+  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("開 ");     //"On"
+  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("關 ");     //"Off"
+  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autotune");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
+  PROGMEM Language_Str MSG_PID_P                           = _UxGT("PID-P");     //"PID-P"
+  PROGMEM Language_Str MSG_PID_P_E                         = _UxGT("PID-P *");
+  PROGMEM Language_Str MSG_PID_I                           = _UxGT("PID-I");     //"PID-I"
+  PROGMEM Language_Str MSG_PID_I_E                         = _UxGT("PID-I *");
+  PROGMEM Language_Str MSG_PID_D                           = _UxGT("PID-D");     //"PID-D"
+  PROGMEM Language_Str MSG_PID_D_E                         = _UxGT("PID-D *");
+  PROGMEM Language_Str MSG_PID_C                           = _UxGT("PID-C");     //"PID-C"
+  PROGMEM Language_Str MSG_PID_C_E                         = _UxGT("PID-C *");
+  PROGMEM Language_Str MSG_PID_F                           = _UxGT("PID-F");    //"PID-F"
+  PROGMEM Language_Str MSG_PID_F_E                         = _UxGT("PID-F *");
   PROGMEM Language_Str MSG_SELECT                          = _UxGT("選擇");     //"Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("選擇 *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration
@@ -207,6 +271,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("軸抖動速率") LCD_STR_B;     //"Vb-jerk"
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("軸抖動速率") LCD_STR_C;     //"Vc-jerk"
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("擠出機抖動速率");     //"Ve-jerk"
+  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("速度");     // "Velocity"
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("最大進料速率") LCD_STR_A;     //"Vmax " max_feedrate_mm_s
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("最大進料速率") LCD_STR_B;
@@ -237,23 +302,45 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("絲料直徑 *");
   PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("卸載 mm");     // "Unload mm"
   PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("装載 mm");     // "Load mm"
+  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Advance K");
+  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Advance K *");
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD對比度");     //"LCD contrast"
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("保存設置");     //"Store memory"
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("載入設置");     //"Load memory"
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢復安全值");     //"Restore Defaults"
+  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("恢復安全值");     //"Restore failsafe"
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化設置");     // "Initialize EEPROM"
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("刷新");     //"Refresh"
+  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("錯誤: EEPROM CRC");    //"Err: EEPROM CRC"
+  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("錯誤: EEPROM Index");    //"Err: EEPROM Index"
+  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("錯誤: EEPROM Version");    //"EEPROM Version"
+  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("媒體更新");    //"Media Update"
+  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("重置打印機");    //"Reset Printer
+  PROGMEM Language_Str MSG_REFRESH                         = _UxGT("刷新");     //"Refresh"
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("資訊界面");     //"Info screen"
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("準備");     //"Prepare"
   PROGMEM Language_Str MSG_TUNE                            = _UxGT("調整");     //"Tune"
+  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("開始列印");   //"Start Print"
+  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("下一個");   //"Next"
+  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("初始  ");   //"Init"
+  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("停止  ");   //"Stop"
+  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("列印  ");   //"Print"
+  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("復歸  ");   //"Reset"
+  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("放棄  ");   //"Cancel"
+  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("確認  ");   //"Done"
+  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("返回  ");   //"Back"
+  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("繼續  ");   //"Proceed"
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("暫停列印");     //"Pause print"
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("恢復列印");     //"Resume print"
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("停止列印");     //"Stop print"
+  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("列印物件");   //"Printing Object"
+  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("中止物件");   //"Cancel Object"
+  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("中止物件 =");   //"Cancel Object ="
+  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("中斷恢復");   //"Outage Recovery"
   PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("從記憶卡上列印");     //"Print from SD"
   PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("無記憶卡");     //"No SD card"
   PROGMEM Language_Str MSG_DWELL                           = _UxGT("休眠 ...");     //"Sleep..."
   PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("點擊繼續 ...");     //"Click to resume..."
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("列印已暫停");     // "Print paused"
+  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("列印中 ...");   //"Printing..."
   PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消列印");     //"Print aborted"
   PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("無移動");     //"No move."
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("已砍掉");     //"KILLED. "
@@ -267,6 +354,13 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回縮恢復後進料速率mm/s");     //"UnRet V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");     // "S UnRet V"
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("自動回縮");     //"AutoRetr." autoretract_enabled,
+  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("交換長度");    //"Swap Length"
+  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("清除長度");   //"Purge Length"
+  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("交換工具"); //"Tool Change"
+  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z軸提昇");    //"Z Raise"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPD          = _UxGT("最高速度");    //"Prime Speed"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPD        = _UxGT("收回速度");  //"Retract Speed"
+  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("噴嘴待機"); //"Nozzle Standby"
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更換絲料");     //"Change filament"
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更換絲料 *");
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("裝載絲料");     // "Load filament"
@@ -274,28 +368,55 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("卸載絲料");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("卸載絲料 *");     // "Unload filament"
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("卸載全部");     // "Unload All"
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("初始化記憶卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_INIT_MEDIA                      = _UxGT("初始化記憶卡");     //"Init. SD card"
+  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("連接記憶卡");     //"Attach Media
   PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("更換記憶卡");     //"Change SD card"
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("釋放媒體");   //"Release Media"
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探針在熱床之外");     //"Z probe out. bed" Z probe is not within the physical limits
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("偏斜因數");     // "Skew Factor"
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");     // "BLTouch"
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch 自檢");     // "BLTouch Self-Test"
   PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("重置BLTouch");     // "Reset BLTouch"
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署BLTouch");     // "Deploy BLTouch"
   PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("裝載BLTouch");     // "Stow BLTouch"
+  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署BLTouch");     // "Deploy BLTouch"
+  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Cmd: SW-Mode");
+  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Cmd: 5V-Mode");
+  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Cmd: OD-Mode");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Cmd: Mode-Store");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Set BLTouch to 5V");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Set BLTouch to OD");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Report Drain");
+  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("DANGER: Bad settings can cause damage! Proceed anyway?");
+  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Init TouchMI");
+  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Z Offset Test");
+  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Save");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Deploy TouchMI");
+  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Deploy Z-Probe");
+  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Stow Z-Probe");
   PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("歸位 %s%s%s 先");     //"Home ... first"
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z偏移");     //"Z Offset"
+  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("探針偏移");   //Probe Offsets
+  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("探針X偏移量");   //Probe X Offset
+  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("探針Y偏移量");   //Probe Y Offset
+  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("探針Z偏移量");   //Probe Z Offset
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("微量調整X軸");     //"Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("微量調整Y軸");     //"Babystep Y"
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("微量調整Z軸");     //"Babystep Z"
+  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("總計");    //"Total"
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("擋塊終止");     //"Endstop abort"
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("加熱失敗");     //"Heating failed"
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("錯誤：REDUNDANT TEMP");     //"Err: REDUNDANT TEMP"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("溫控失控");     //"THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD_BED          = _UxGT("熱床加熱失敗");   //"Bed Heating Failed"
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD_CHAMBER      = _UxGT("機箱加熱失敗");   //"Chamber Heating Fail"
+  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("錯誤：冗餘溫度");     //"Err: REDUNDANT TEMP"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("溫度失控");    //"THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("熱床溫度失控");    //"BED THERMAL RUNAWAY"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("機箱溫度失控");   //"CHAMBER T. RUNAWAY"
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("錯誤：最高溫度");     //"Err: MAXTEMP"
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("錯誤：最低溫度");     //"Err: MINTEMP"
   PROGMEM Language_Str MSG_ERR_MAXTEMP_BED                 = _UxGT("錯誤：最高熱床溫度");     //"Err: MAXTEMP BED"
   PROGMEM Language_Str MSG_ERR_MINTEMP_BED                 = _UxGT("錯誤：最低熱床溫度");     //"Err: MINTEMP BED"
+  PROGMEM Language_Str MSG_ERR_MAXTEMP_CHAMBER             = _UxGT("錯誤：最高機箱溫度");   //"Err: MAXTEMP CHAMBER"
+  PROGMEM Language_Str MSG_ERR_MINTEMP_CHAMBER             = _UxGT("錯誤：最低機箱溫度");   //"Err: MINTEMP CHAMBER"
   PROGMEM Language_Str MSG_ERR_Z_HOMING                    = _UxGT("歸位 XY 先");     //"Home XY First"
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("印表機停機");     //"PRINTER HALTED"
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     //"Please reset"
@@ -303,7 +424,11 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("時");     //"h" // One character only
   PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("分");     //"m" // One character only
   PROGMEM Language_Str MSG_HEATING                         = _UxGT("加熱中 ...");     //"Heating..."
+  PROGMEM Language_Str MSG_COOLING                         = _UxGT("冷卻中 ...");   //"Cooling..."
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加熱熱床中 ...");     //"Bed Heating..."
+  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("熱床冷卻中 ...");   //"Bed Cooling..."
+  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("機箱加熱中 ..");   //"Chamber Heating..."
+  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("機箱冷卻中 ...");   //Chamber Cooling...
   PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("⊿校準");     //"Delta Calibration"
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("⊿校準X");     //"Calibrate X"
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("⊿校準Y");     //"Calibrate Y"
@@ -312,6 +437,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("⊿設置");     // "Delta Settings"
   PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("⊿自動校準");     // "Auto Calibration"
   PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("設置⊿高度");     // "Set Delta Height"
+  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Z偏移");
   PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("⊿斜柱");     // "Diag Rod"
   PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("⊿高度");     // "Height"
   PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("⊿半徑");     // "Radius"
@@ -319,18 +445,20 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("印表機訊息");     //"Printer Info"
   PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("三點調平");     // "3-Point Leveling"
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("線性調平");     // "Linear Leveling"
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("雙線性調平");     // "Bilinear Leveling"
+  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("      雙線性調平");     // "Bilinear Leveling"
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("網格調平");     // "Mesh Leveling"
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("印表機統計");     //"Printer Stats"
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("主板訊息");     //"Board Info"
   PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("溫度計");     //"Thermistors"
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("擠出機");     //"Extruders"
+  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("      擠出機");     //"Extruders"
   PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("傳輸率");     //"Baud"
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("協議");     //"Protocol"
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("監測溫度失控:關");   //"Runaway Watch: OFF"
+  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("監測溫度失控:開");    //"Runaway Watch: ON"
+
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("外殼燈");     // "Case light"
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("燈亮度");     // "Light BRIGHTNESS"
-
   PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("打印機不正確");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
@@ -351,11 +479,14 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高溫度");     //"Max Temp"
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("電源供應");     //"Power Supply"
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("驅動力度");     // "Drive Strength"
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X 驅動 %");     // "X Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y 驅動 %");     // "Y Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z 驅動 %");     // "Z Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驅動 %");     // "E Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT                     = _UxGT("驅動 %");     // "Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X 驅動 %");    //X Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y 驅動 %");    //Y Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z 驅動 %");    //Z Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驅動 %");    //E Driver %
+  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC連接錯誤");   //"TMC CONNECTION ERROR"
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("保存驅動設置");     // "DAC EEPROM Write"
+  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("更換絲料");   //"FILAMENT CHANGE"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("列印已暫停");     // "PRINT PAUSED"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("裝載絲料");     // "LOAD FILAMENT"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("卸載絲料");     // "UNLOAD FILAMENT"
@@ -363,26 +494,112 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("清除更多");     // "Purge more"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("恢復列印");     //"Resume print"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  噴嘴: ");     // "  Nozzle: "
+  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("斷絲偵測");    //"Runout Sensor"
+  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("絲距離mm");   //"Runout Dist mm"
   PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("歸原位失敗");     // "Homing failed"
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探針探測失敗");     // "Probing failed"
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: 太冷");     // "M600: Too cold"
 
+  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("CHOOSE FILAMENT");
+  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
+  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Update MMU Firmware!");
+  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Needs Attention.");
+  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Resume Print");
+  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Resuming...");
+  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Load Filament");
+  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Load All");
+  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Load to Nozzle");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Eject Filament");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Eject Filament ~");
+  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Unload Filament");
+  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Loading Fil. %i...");
+  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Ejecting Fil. ...");
+  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Unloading Fil....");
+  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("All");
+  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filament ~");
+  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Reset MMU");
+  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Resetting MMU...");
+  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Remove, click");
+
+  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mix");
+  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Component =");
+  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mixer");
+  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradient");
+  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Full Gradient");
+  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Toggle Mix");
+  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Cycle Mix");
+  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradient Mix");
+  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Reverse Gradient");
+  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Active V-tool");
+  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Start V-tool");
+  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  End V-tool");
+  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias V-tool");
+  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Reset V-tools");
+  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Commit V-tool Mix");
+  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools Were Reset");
+  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Start Z:");
+  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  End Z:");
+
+  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Games");
+  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Brickout");
+  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Invaders");
+  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
+  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
+
+  #define MSG_1_LINE(A)     A "\0"   "\0"
+  #define MSG_2_LINE(A,B)   A "\0" B "\0"
+  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
+
+  //
+  // Filament Change screens show up to 3 lines on a 4-line display
+  //                        ...or up to 2 lines on a 3-line display
+  //
   #if LCD_HEIGHT >= 4
+    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("按下按鈕", "恢復列印")); //"Press Button to resume print"
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("停車中 ..."));   //"Parking..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("等待開始", "絲料", "變更"));     //"Wait for start of the filament change"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("等待", "卸下絲料"));     //"Wait for filament unload"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("插入絲料", "並按鍵", "繼續 ..."));     //"Insert filament and press button to continue..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("按下按鈕來", "加熱噴嘴."));     // "Press button to heat nozzle."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("按下按鈕", "加熱噴嘴."));     // "Press button to heat nozzle."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("加熱噴嘴", "請等待 ..."));     // "Heating nozzle Please wait..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("等待", "進料"));     //"Wait for filament load"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("等待", "絲料清除"));     // "Wait for filament purge"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("按下完成","絲料清除")); //"Press button to filament purge"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("等待列印", "恢復"));     //"Wait for print to resume"
   #else // LCD_HEIGHT < 4
+    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下繼續.."));   //"Click to continue"
+    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("停車中 ..."));     //"Parking..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("請等待 ..."));     //"Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     //"Ejecting..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入並點擊"));     //"Insert and Click"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("加熱中 ..."));     // "Heating..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("按下加熱.."));     //"Click to heat"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("加熱中 ..."));     //"Heating..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("退出中 ..."));     //"Ejecting..."
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("載入中 ..."));     //"Loading..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("清除中 ..."));     // "Purging..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("清除中 ..."));     //"Purging..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成.."));     //"Click to finish"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢復中 ..."));     //"Resuming..."
   #endif // LCD_HEIGHT < 4
+
+  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC Drivers");
+  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Driver Current");
+  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hybrid Threshold");
+  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Sensorless Homing");
+  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Stepping Mode");
+  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop Enabled");
+  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Reset");
+  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" in:");
+  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Backlash");
+  PROGMEM Language_Str MSG_BACKLASH_A                      = LCD_STR_A;
+  PROGMEM Language_Str MSG_BACKLASH_B                      = LCD_STR_B;
+  PROGMEM Language_Str MSG_BACKLASH_C                      = LCD_STR_C;
+  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
+  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
 }
+
+#if FAN_COUNT == 1
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
+#else
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_N
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
+#endif
diff --git a/Marlin/src/lcd/menu/game/brickout.cpp b/Marlin/src/lcd/menu/game/brickout.cpp
index 50da0f9cc756..6fe0a31ffaea 100644
--- a/Marlin/src/lcd/menu/game/brickout.cpp
+++ b/Marlin/src/lcd/menu/game/brickout.cpp
@@ -140,13 +140,13 @@ void BrickoutGame::game_screen() {
 
   // Draw bricks
   if (PAGE_CONTAINS(BRICK_TOP, BRICK_BOT)) {
-    for (uint8_t y = 0; y < BRICK_ROWS; ++y) {
+    LOOP_L_N(y, BRICK_ROWS) {
       const uint8_t yy = y * BRICK_H + BRICK_TOP;
       if (PAGE_CONTAINS(yy, yy + BRICK_H - 1)) {
-        for (uint8_t x = 0; x < BRICK_COLS; ++x) {
+        LOOP_L_N(x, BRICK_COLS) {
           if (TEST(bdat.bricks[y], x)) {
             const uint8_t xx = x * BRICK_W;
-            for (uint8_t v = 0; v < BRICK_H - 1; ++v)
+            LOOP_L_N(v, BRICK_H - 1)
               if (PAGE_CONTAINS(yy + v, yy + v))
                 u8g.drawHLine(xx, yy + v, BRICK_W - 1);
           }
diff --git a/Marlin/src/lcd/menu/game/invaders.cpp b/Marlin/src/lcd/menu/game/invaders.cpp
index 487f5406716f..31df47ce7f0f 100644
--- a/Marlin/src/lcd/menu/game/invaders.cpp
+++ b/Marlin/src/lcd/menu/game/invaders.cpp
@@ -170,7 +170,7 @@ inline void update_invader_data() {
     uint8_t m = idat.bugs[y];
     if (m) idat.botmost = y + 1;
     inv_mask |= m;
-    for (uint8_t x = 0; x < INVADER_COLS; ++x)
+    LOOP_L_N(x, INVADER_COLS)
       if (TEST(m, x)) idat.shooters[sc++] = (y << 4) | x;
   }
   idat.leftmost = 0;
@@ -371,11 +371,11 @@ void InvadersGame::game_screen() {
   // Draw invaders
   if (PAGE_CONTAINS(idat.pos.y, idat.pos.y + idat.botmost * (INVADER_ROW_H) - 2 - 1)) {
     int8_t yy = idat.pos.y;
-    for (uint8_t y = 0; y < INVADER_ROWS; ++y) {
+    LOOP_L_N(y, INVADER_ROWS) {
       const uint8_t type = inv_type[y];
       if (PAGE_CONTAINS(yy, yy + INVADER_H - 1)) {
         int8_t xx = idat.pos.x;
-        for (uint8_t x = 0; x < INVADER_COLS; ++x) {
+        LOOP_L_N(x, INVADER_COLS) {
           if (TEST(idat.bugs[y], x))
             u8g.drawBitmapP(xx, yy, 2, INVADER_H, invader[type][idat.game_blink]);
           xx += INVADER_COL_W;
diff --git a/Marlin/src/lcd/menu/game/maze.cpp b/Marlin/src/lcd/menu/game/maze.cpp
index 9cfa5da4da6e..d92f14ecd8b1 100644
--- a/Marlin/src/lcd/menu/game/maze.cpp
+++ b/Marlin/src/lcd/menu/game/maze.cpp
@@ -83,7 +83,7 @@ void MazeGame::game_screen() {
   if (PAGE_UNDER(HEADER_H)) lcd_put_int(0, HEADER_H - 1, score);
 
   // Draw the maze
-  // for (uint8_t n = 0; n < head_ind; ++n) {
+  // LOOP_L_N(n, head_ind) {
   //   const pos_t &p = maze_walls[n], &q = maze_walls[n + 1];
   //   if (p.x == q.x) {
   //     const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
diff --git a/Marlin/src/lcd/menu/game/snake.cpp b/Marlin/src/lcd/menu/game/snake.cpp
index 8c5280b6898d..d6af22455312 100644
--- a/Marlin/src/lcd/menu/game/snake.cpp
+++ b/Marlin/src/lcd/menu/game/snake.cpp
@@ -84,14 +84,14 @@ void shorten_tail() {
   }
   if (shift) {
     sdat.head_ind--;
-    for (uint8_t i = 0; i <= sdat.head_ind; ++i)
+    LOOP_LE_N(i, sdat.head_ind)
       sdat.snake_tail[i] = sdat.snake_tail[i + 1];
   }
 }
 
 // The food is on a line
 inline bool food_on_line() {
-  for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+  LOOP_L_N(n, sdat.head_ind) {
     pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
     if (p.x == q.x) {
       if ((sdat.foodx == p.x - 1 || sdat.foodx == p.x) && WITHIN(sdat.foody, _MIN(p.y, q.y), _MAX(p.y, q.y)))
@@ -151,7 +151,7 @@ bool snake_overlap() {
   // VERTICAL head segment?
   if (h1.x == h2.x) {
     // Loop from oldest to segment two away from head
-    for (uint8_t n = 0; n < sdat.head_ind - 2; ++n) {
+    LOOP_L_N(n, sdat.head_ind - 2) {
       // Segment p to q
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x != q.x) {
@@ -163,7 +163,7 @@ bool snake_overlap() {
   }
   else {
     // Loop from oldest to segment two away from head
-    for (uint8_t n = 0; n < sdat.head_ind - 2; ++n) {
+    LOOP_L_N(n, sdat.head_ind - 2) {
       // Segment p to q
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.y != q.y) {
@@ -240,7 +240,7 @@ void SnakeGame::game_screen() {
   #if SNAKE_WH < 2
 
     // At this scale just draw a line
-    for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+    LOOP_L_N(n, sdat.head_ind) {
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x == q.x) {
         const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
@@ -256,7 +256,7 @@ void SnakeGame::game_screen() {
   #elif SNAKE_WH == 2
 
     // At this scale draw two lines
-    for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+    LOOP_L_N(n, sdat.head_ind) {
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x == q.x) {
         const int8_t y1 = GAMEY(_MIN(p.y, q.y)), y2 = GAMEY(_MAX(p.y, q.y));
@@ -275,7 +275,7 @@ void SnakeGame::game_screen() {
   #else
 
     // Draw a series of boxes
-    for (uint8_t n = 0; n < sdat.head_ind; ++n) {
+    LOOP_L_N(n, sdat.head_ind) {
       const pos_t &p = sdat.snake_tail[n], &q = sdat.snake_tail[n + 1];
       if (p.x == q.x) {
         const int8_t y1 = _MIN(p.y, q.y), y2 = _MAX(p.y, q.y);
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index f1bcb970d413..501120252ab9 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -127,7 +127,7 @@ void MenuItem_gcode::action(PGM_P const, PGM_P const pgcode) { queue.inject_P(pg
  *
  * The prerequisite is that in the header the type was already declared:
  *
- *   DEFINE_MENU_EDIT_ITEM_TYPE(int16_t, int3, i16tostr3, 1)
+ *   DEFINE_MENU_EDIT_ITEM_TYPE(int3, int16_t, i16tostr3rj, 1)
  *
  * For example, DEFINE_MENU_EDIT_ITEM(int3) expands into:
  *
@@ -193,7 +193,7 @@ DEFINE_MENU_EDIT_ITEM(uint16_3);    // 123        right-justified
 DEFINE_MENU_EDIT_ITEM(uint16_4);    // 1234       right-justified
 DEFINE_MENU_EDIT_ITEM(uint16_5);    // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM(float3);      // 123        right-justified
-DEFINE_MENU_EDIT_ITEM(float52);     // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM(float42_52);  // _2.34, 12.34, -2.34 or 123.45, -23.45
 DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
 DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM(float5_25);   // 12345      right-justified (25 increment)
@@ -396,11 +396,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
   void lcd_babystep_zoffset() {
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
     ui.defer_status_screen();
-    #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
-      const bool do_probe = (active_extruder == 0);
-    #else
-      constexpr bool do_probe = true;
-    #endif
+    const bool do_probe = DISABLED(BABYSTEP_HOTEND_Z_OFFSET) || active_extruder == 0;
     if (ui.encoderPosition) {
       const int16_t babystep_increment = int16_t(ui.encoderPosition) * (BABYSTEP_MULTIPLICATOR_Z);
       ui.encoderPosition = 0;
@@ -429,14 +425,14 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
     if (ui.should_draw()) {
       #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
         if (!do_probe)
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), LCD_Z_OFFSET_FUNC(hotend_offset[active_extruder].z));
-        else
-      #endif
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), LCD_Z_OFFSET_FUNC(probe.offset.z));
-
-      #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
-        if (do_probe) _lcd_zoffset_overlay_gfx(probe.offset.z);
+          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), ftostr54sign(hotend_offset[active_extruder].z));
       #endif
+      if (do_probe) {
+        MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z));
+        #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
+          _lcd_zoffset_overlay_gfx(probe.offset.z);
+        #endif
+      }
     }
   }
 
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 5299fefde2b7..e9ec3b2496b7 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -47,12 +47,18 @@ typedef void (*selectFunc_t)();
   void _lcd_zoffset_overlay_gfx(const float zvalue);
 #endif
 
-#if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
-  #define LCD_Z_OFFSET_FUNC(N) ftostr54sign(N)
-  #define LCD_Z_OFFSET_TYPE float43
-#else
-  #define LCD_Z_OFFSET_FUNC(N) ftostr52sign(N)
-  #define LCD_Z_OFFSET_TYPE float52
+#if HAS_BED_PROBE
+  #if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+    #define LCD_Z_OFFSET_TYPE float43    // Values from -9.000 to +9.000
+  #else
+    #define LCD_Z_OFFSET_TYPE float42_52 // Values from -99.99 to 99.99
+  #endif
+#endif
+
+#if ENABLED(BABYSTEP_ZPROBE_OFFSET) && Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+  #define BABYSTEP_TO_STR(N) ftostr43sign(N)
+#elif ENABLED(BABYSTEPPING)
+  #define BABYSTEP_TO_STR(N) ftostr53sign(N)
 #endif
 
 ////////////////////////////////////////////
@@ -266,35 +272,37 @@ class TMenuEditItem : MenuEditItemBase {
 // Provide a set of Edit Item Types which encompass a primitive
 // type, a string function, and a scale factor for edit and display.
 // These items call the Edit Item draw method passing the prepared string.
-#define DEFINE_MENU_EDIT_ITEM_TYPE(TYPE, NAME, FIX, STRFUNC, SCALE, V...) \
+#define __DOFIXfloat PROBE()
+#define _DOFIX(TYPE,V) TYPE(TERN(IS_PROBE(__DOFIX##TYPE),FIXFLOAT(V),(V)))
+#define DEFINE_MENU_EDIT_ITEM_TYPE(NAME, TYPE, STRFUNC, SCALE, V...) \
   struct MenuEditItemInfo_##NAME { \
     typedef TYPE type_t; \
     static inline float scale(const float value)   { return value * (SCALE) + (V+0); } \
     static inline float unscale(const float value) { return value / (SCALE) + (V+0); } \
-    static inline const char* strfunc(const float value) { return STRFUNC((TYPE)(FIX ? FIXFLOAT(value) : value)); } \
+    static inline const char* strfunc(const float value) { return STRFUNC(_DOFIX(TYPE,value)); } \
   }; \
   typedef TMenuEditItem<MenuEditItemInfo_##NAME> MenuItem_##NAME
 
-//                         TYPE      NAME         STRFUNC       SCALE
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  percent,     0, ui8tostr4pct, 100.0/255, 0.5);  // 100%   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int3,        0, i16tostr3,       1     );   // 123, -12   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int16_t,  int4,        0, i16tostr4sign,   1     );   // 1234, -123 right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(int8_t,   int8,        0, i8tostr3,        1     );   // 123, -12   right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint8_t,  uint8,       0, ui8tostr3,       1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_3,    0, ui16tostr3,      1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_4,    0, ui16tostr4,      0.1   );   // 1234       right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint16_t, uint16_5,    0, ui16tostr5,      0.01  );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float3,      1, ftostr3,         1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52,     1, ftostr42_52,   100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float43,     1, ftostr43sign, 1000     );   // 1.234
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5,      1, ftostr5rj,       1     );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float5_25,   1, ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51,     1, ftostr51rj,     10     );   // 1234.5     right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float41sign, 1, ftostr41sign,   10     );   // +123.4
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float51sign, 1, ftostr51sign,   10     );   // +1234.5
-DEFINE_MENU_EDIT_ITEM_TYPE(float,    float52sign, 1, ftostr52sign,  100     );   // +123.45
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5,       0, ftostr5rj,       0.01f );   // 12345      right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(uint32_t, long5_25,    0, ftostr5rj,       0.04f );   // 12345      right-justified (25 increment)
+//                         NAME         TYPE      STRFUNC          SCALE         +ROUND
+DEFINE_MENU_EDIT_ITEM_TYPE(percent     ,uint8_t  ,ui8tostr4pctrj  , 100.f/255.f, 0.5f);  // 100%   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int3        ,int16_t  ,i16tostr3rj     ,   1     );   // 123, -12   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int4        ,int16_t  ,i16tostr4signrj ,   1     );   // 1234, -123 right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(int8        ,int8_t   ,i8tostr3rj      ,   1     );   // 123, -12   right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint8       ,uint8_t  ,ui8tostr3rj     ,   1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_3    ,uint16_t ,ui16tostr3rj    ,   1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_4    ,uint16_t ,ui16tostr4rj    ,   0.1f  );   // 1234       right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(uint16_5    ,uint16_t ,ui16tostr5rj    ,   0.01f );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float3      ,float    ,ftostr3         ,   1     );   // 123        right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float42_52  ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM_TYPE(float43     ,float    ,ftostr43sign    ,1000     );   // -1.234, _1.234, +1.234
+DEFINE_MENU_EDIT_ITEM_TYPE(float5      ,float    ,ftostr5rj       ,   1     );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float5_25   ,float    ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)
+DEFINE_MENU_EDIT_ITEM_TYPE(float51     ,float    ,ftostr51rj      ,  10     );   // 1234.5     right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(float41sign ,float    ,ftostr41sign    ,  10     );   // +123.4
+DEFINE_MENU_EDIT_ITEM_TYPE(float51sign ,float    ,ftostr51sign    ,  10     );   // +1234.5
+DEFINE_MENU_EDIT_ITEM_TYPE(float52sign ,float    ,ftostr52sign    , 100     );   // +123.45
+DEFINE_MENU_EDIT_ITEM_TYPE(long5       ,uint32_t ,ftostr5rj       ,   0.01f );   // 12345      right-justified
+DEFINE_MENU_EDIT_ITEM_TYPE(long5_25    ,uint32_t ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)
 
 class MenuItem_bool : public MenuEditItemBase {
   public:
@@ -322,10 +330,10 @@ class MenuItem_bool : public MenuEditItemBase {
  *   _menuLineNr is the menu item to draw and process
  *   _thisItemNr is the index of each MENU_ITEM or STATIC_ITEM
  */
-#define SCREEN_OR_MENU_LOOP(IS_MENU)                \
-  scroll_screen(IS_MENU ? 1 : LCD_HEIGHT, IS_MENU); \
-  int8_t _menuLineNr = encoderTopLine, _thisItemNr; \
-  bool _skipStatic = IS_MENU; UNUSED(_thisItemNr);  \
+#define SCREEN_OR_MENU_LOOP(IS_MENU)                    \
+  scroll_screen(IS_MENU ? 1 : LCD_HEIGHT, IS_MENU);     \
+  int8_t _menuLineNr = encoderTopLine, _thisItemNr = 0; \
+  bool _skipStatic = IS_MENU; UNUSED(_thisItemNr);      \
   for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
     _thisItemNr = 0
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 03bcedb7305a..f2327b75e5e4 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -84,7 +84,7 @@ void menu_cancelobject();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_CURRENT_PWM(LABEL,I) EDIT_ITEM_P(long5, PSTR(LABEL), &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
-    #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
+    #if ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y)
       EDIT_CURRENT_PWM(STR_X STR_Y, 0);
     #endif
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
@@ -112,10 +112,10 @@ void menu_cancelobject();
 
     #if ENABLED(LIN_ADVANCE)
       #if EXTRUDERS == 1
-        EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+        EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
       #elif EXTRUDERS > 1
-        for (uint8_t n = 0; n < EXTRUDERS; n++)
-          EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+        LOOP_L_N(n, EXTRUDERS)
+          EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
       #endif
     #endif
 
@@ -125,7 +125,7 @@ void menu_cancelobject();
       if (parser.volumetric_enabled) {
         EDIT_ITEM_FAST(float43, MSG_FILAMENT_DIAM, &planner.filament_size[active_extruder], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
         #if EXTRUDERS > 1
-          for (uint8_t n = 0; n < EXTRUDERS; n++)
+          LOOP_L_N(n, EXTRUDERS)
             EDIT_ITEM_FAST_N(float43, n, MSG_FILAMENT_DIAM_E, &planner.filament_size[n], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
         #endif
       }
@@ -142,13 +142,13 @@ void menu_cancelobject();
 
       EDIT_ITEM_FAST(float3, MSG_FILAMENT_UNLOAD, &fc_settings[active_extruder].unload_length, 0, extrude_maxlength);
       #if EXTRUDERS > 1
-        for (uint8_t n = 0; n < EXTRUDERS; n++)
+        LOOP_L_N(n, EXTRUDERS)
           EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTUNLOAD_E, &fc_settings[n].unload_length, 0, extrude_maxlength);
       #endif
 
       EDIT_ITEM_FAST(float3, MSG_FILAMENT_LOAD, &fc_settings[active_extruder].load_length, 0, extrude_maxlength);
       #if EXTRUDERS > 1
-        for (uint8_t n = 0; n < EXTRUDERS; n++)
+        LOOP_L_N(n, EXTRUDERS)
           EDIT_ITEM_FAST_N(float3, n, MSG_FILAMENTLOAD_E, &fc_settings[n].load_length, 0, extrude_maxlength);
       #endif
     #endif
@@ -257,7 +257,7 @@ void menu_cancelobject();
       EDIT_ITEM(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
       EDIT_ITEM(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
       EDIT_ITEM(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
-      EDIT_ITEM(float52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
+      EDIT_ITEM(float42_52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
     #endif
 
     //
@@ -358,7 +358,7 @@ void menu_cancelobject();
       EDIT_ITEM_FAST(float3, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
     #endif
     #if ENABLED(DISTINCT_E_FACTORS)
-      for (uint8_t n = 0; n < E_STEPPERS; n++)
+      LOOP_L_N(n, E_STEPPERS)
         EDIT_ITEM_FAST_N(float3, n, MSG_VMAX_EN, &planner.settings.max_feedrate_mm_s[E_AXIS_N(n)], 1, max_fr_edit_scaled.e);
     #endif
 
@@ -376,12 +376,12 @@ void menu_cancelobject();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-    static float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
+    const float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
     // M204 P Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_ACC, &planner.settings.acceleration, 25, max_accel);
 
     // M204 R Retract Acceleration
-    EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, max_accel);
+    EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)]);
 
     // M204 T Travel Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);
@@ -409,7 +409,7 @@ void menu_cancelobject();
 
     #if ENABLED(DISTINCT_E_FACTORS)
       EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
-      for (uint8_t n = 0; n < E_STEPPERS; n++)
+      LOOP_L_N(n, E_STEPPERS)
         EDIT_ITEM_FAST_N(long5_25, n, MSG_AMAX_EN, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(n)], 100, max_accel_edit_scaled.e, []{ _reset_e_acceleration_rate(MenuItemBase::itemIndex); });
     #elif E_STEPPERS
       EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS], 100, max_accel_edit_scaled.e, []{ planner.reset_acceleration_rates(); });
@@ -484,7 +484,7 @@ void menu_advanced_steps_per_mm() {
 
   #if ENABLED(DISTINCT_E_FACTORS)
     EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, []{ planner.refresh_positioning(); });
-    for (uint8_t n = 0; n < E_STEPPERS; n++)
+    LOOP_L_N(n, E_STEPPERS)
       EDIT_ITEM_FAST_N(float51, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{ _planner_refresh_e_positioning(MenuItemBase::itemIndex); });
   #elif E_STEPPERS
     EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
@@ -544,7 +544,7 @@ void menu_advanced_settings() {
     SUBMENU(MSG_DRIVE_STRENGTH, menu_pwm);
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     SUBMENU(MSG_TMC_DRIVERS, menu_tmc);
   #endif
 
@@ -556,10 +556,10 @@ void menu_advanced_settings() {
     SUBMENU(MSG_FILAMENT, menu_advanced_filament);
   #elif ENABLED(LIN_ADVANCE)
     #if EXTRUDERS == 1
-      EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+      EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
-      for (uint8_t n = 0; n < E_STEPPERS; n++)
-        EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+      LOOP_L_N(n, E_STEPPERS)
+        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index ad9c51d4cfda..720694bfffba 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -39,9 +39,9 @@ void menu_backlash() {
   EDIT_ITEM_FAST(percent, MSG_BACKLASH_CORRECTION, &backlash.correction, all_off, all_on);
 
   #define EDIT_BACKLASH_DISTANCE(N) EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &backlash.distance_mm[_AXIS(N)], 0.0f, 9.9f);
-  EDIT_BACKLASH_DISTANCE(A);
-  EDIT_BACKLASH_DISTANCE(B);
-  EDIT_BACKLASH_DISTANCE(C);
+  if (AXIS_CAN_CALIBRATE(A)) EDIT_BACKLASH_DISTANCE(A);
+  if (AXIS_CAN_CALIBRATE(B)) EDIT_BACKLASH_DISTANCE(B);
+  if (AXIS_CAN_CALIBRATE(C)) EDIT_BACKLASH_DISTANCE(C);
 
   #ifdef BACKLASH_SMOOTHING_MM
     EDIT_ITEM_FAST(float43, MSG_BACKLASH_SMOOTHING, &backlash.smoothing_mm, 0.0f, 9.9f);
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index d2285e083560..6dbc680659c6 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../feature/power_loss_recovery.h"
+  #include "../../feature/powerloss.h"
 #endif
 
 #if HAS_BED_PROBE
@@ -138,12 +138,12 @@ void menu_advanced_settings();
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
     #if ENABLED(DUAL_X_CARRIAGE)
-      EDIT_ITEM_FAST(float51, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
+      EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
     #else
-      EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
+      EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
     #endif
-    EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
-    EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
     #if ENABLED(EEPROM_SETTINGS)
       ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
     #endif
@@ -227,6 +227,24 @@ void menu_advanced_settings();
   }
 #endif
 
+#if ENABLED(CONTROLLER_FAN_MENU)
+
+  #include "../../feature/controllerfan.h"
+
+  void menu_controller_fan() {
+    START_MENU();
+    BACK_ITEM(MSG_CONFIGURATION);
+    EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+    EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode);
+    if (controllerFan.settings.auto_mode) {
+      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+      EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800);
+    }
+    END_MENU();
+  }
+
+#endif
+
 #if ENABLED(CASE_LIGHT_MENU)
 
   #include "../../feature/caselight.h"
@@ -320,6 +338,13 @@ void menu_configuration() {
     EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
   #endif
 
+  //
+  // Set Fan Controller speed
+  //
+  #if ENABLED(CONTROLLER_FAN_MENU)
+    SUBMENU(MSG_CONTROLLER_FAN, menu_controller_fan);
+  #endif
+
   const bool busy = printer_busy();
   if (!busy) {
     #if EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 2b3cac5bd2b4..ac80870ac8b6 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 void _man_probe_pt(const xy_pos_t &xy) {
@@ -61,16 +61,14 @@ void _man_probe_pt(const xy_pos_t &xy) {
 
   float lcd_probe_pt(const xy_pos_t &xy) {
     _man_probe_pt(xy);
-    KEEPALIVE_STATE(PAUSED_FOR_USER);
     ui.defer_status_screen();
-    wait_for_user = true;
     #if ENABLED(HOST_PROMPT_SUPPORT)
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR);
     #endif
     #if ENABLED(EXTENSIBLE_UI)
       ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress"));
     #endif
-    while (wait_for_user) idle();
+    wait_for_user_response();
     ui.goto_previous_screen_no_defer();
     return current_position.z;
   }
@@ -103,7 +101,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
 #endif
 
 void lcd_delta_settings() {
-  auto _recalc_delta_settings = []() {
+  auto _recalc_delta_settings = []{
     #if HAS_LEVELING
       reset_bed_level(); // After changing kinematics bed-level data is no longer valid
     #endif
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 5f2ecb9ccd33..0c8f1f61c865 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -114,7 +114,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
         GCODES_ITEM_P(msg, PSTR("M600 B0"));
     #else
       PGM_P const msg = GET_TEXT(MSG_FILAMENTCHANGE_E);
-      for (uint8_t s = 0; s < E_STEPPERS; s++) {
+      LOOP_L_N(s, E_STEPPERS) {
         if (thermalManager.targetTooColdToExtrude(s))
           SUBMENU_N_P(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
         else {
@@ -138,7 +138,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
             GCODES_ITEM_P(msg_load, PSTR("M701"));
         #else
           PGM_P const msg_load = GET_TEXT(MSG_FILAMENTLOAD_E);
-          for (uint8_t s = 0; s < E_STEPPERS; s++) {
+          LOOP_L_N(s, E_STEPPERS) {
             if (thermalManager.targetTooColdToExtrude(s))
               SUBMENU_N_P(s, msg_load, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, MenuItemBase::itemIndex); });
             else {
@@ -162,7 +162,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
           #if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
           {
             bool too_cold = false;
-            for (uint8_t s = 0; s < E_STEPPERS; s++) {
+            LOOP_L_N(s, E_STEPPERS) {
               if (thermalManager.targetTooColdToExtrude(s)) {
                 too_cold = true; break;
               }
@@ -174,7 +174,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
           }
           #endif
           PGM_P const msg_unload = GET_TEXT(MSG_FILAMENTUNLOAD_E);
-          for (uint8_t s = 0; s < E_STEPPERS; s++) {
+          LOOP_L_N(s, E_STEPPERS) {
             if (thermalManager.targetTooColdToExtrude(s))
               SUBMENU_N_P(s, msg_unload, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, MenuItemBase::itemIndex); });
             else {
diff --git a/Marlin/src/lcd/menu/menu_job_recovery.cpp b/Marlin/src/lcd/menu/menu_job_recovery.cpp
index 5b57992f457e..31db50fe23d3 100644
--- a/Marlin/src/lcd/menu/menu_job_recovery.cpp
+++ b/Marlin/src/lcd/menu/menu_job_recovery.cpp
@@ -31,7 +31,7 @@
 #include "menu.h"
 #include "../../gcode/queue.h"
 #include "../../sd/cardreader.h"
-#include "../../feature/power_loss_recovery.h"
+#include "../../feature/powerloss.h"
 
 static void lcd_power_loss_recovery_resume() {
   ui.return_to_status();
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index 65b8af20ca19..7230320fa202 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -181,8 +181,8 @@ void lcd_mixer_mix_edit() {
 
     #if CHANNEL_MIX_EDITING
 
-      for (uint8_t n = 1; n <= MIXING_STEPPERS; n++)
-        EDIT_ITEM_FAST_N(float52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
+      LOOP_S_LE_N(n, 1, MIXING_STEPPERS)
+        EDIT_ITEM_FAST_N(float42_52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
 
       ACTION_ITEM(MSG_CYCLE_MIX, _lcd_mixer_cycle_mix);
       ACTION_ITEM(MSG_COMMIT_VTOOL, _lcd_mixer_commit_vtool);
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index c2b8d4ae0a3c..e2f5e8d65813 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -24,7 +24,7 @@
 
 #if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
 
-#include "../../feature/prusa_MMU2/mmu2.h"
+#include "../../feature/mmu2/mmu2.h"
 #include "menu_mmu2.h"
 #include "menu.h"
 
@@ -54,7 +54,7 @@ void _mmu2_load_filament(uint8_t index) {
   ui.reset_status();
 }
 void action_mmu2_load_all() {
-  for (uint8_t i = 0; i < EXTRUDERS; i++)
+  LOOP_L_N(i, EXTRUDERS)
     _mmu2_load_filament(i);
   ui.return_to_status();
 }
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 12cc7a331e2b..b7f57c8146fa 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -357,7 +357,7 @@ void menu_move() {
     #elif E_MANUAL > 1
 
       // Independent extruders with one E-stepper per hotend
-      for (uint8_t n = 0; n < E_MANUAL; n++) SUBMENU_MOVE_E(n);
+      LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
 
     #endif
 
@@ -393,9 +393,9 @@ void menu_motion() {
   //
   GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
   #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
-    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28 X"));
-    GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28 Y"));
-    GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28 Z"));
+    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+    GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+    GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
   #endif
 
   //
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 40fb88fccaed..01cf39d7b318 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -111,7 +111,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
       #if HAS_HEATED_BED
         _PREHEAT_ITEMS(1,0);
       #endif
-      for (uint8_t n = 1; n < HOTENDS; n++) PREHEAT_ITEMS(1,n);
+      LOOP_S_L_N(n, 1, HOTENDS) PREHEAT_ITEMS(1,n);
       ACTION_ITEM(MSG_PREHEAT_1_ALL, []() {
         #if HAS_HEATED_BED
           _preheat_bed(0);
@@ -139,7 +139,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
       #if HAS_HEATED_BED
         _PREHEAT_ITEMS(2,0);
       #endif
-      for (uint8_t n = 1; n < HOTENDS; n++) PREHEAT_ITEMS(2,n);
+      LOOP_S_L_N(n, 1, HOTENDS) PREHEAT_ITEMS(2,n);
       ACTION_ITEM(MSG_PREHEAT_2_ALL, []() {
         #if HAS_HEATED_BED
           _preheat_bed(1);
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index 0350d788eb15..296a132e149a 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_TRINAMIC && HAS_LCD_MENU
+#if HAS_TRINAMIC_CONFIG && HAS_LCD_MENU
 
 #include "menu.h"
 #include "../../module/stepper/indirection.h"
@@ -249,4 +249,4 @@ void menu_tmc() {
   END_MENU();
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 9221d7700541..ac18e89df48a 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -65,7 +65,7 @@
     }
     if (ui.should_draw()) {
       const float spm = planner.steps_to_mm[axis];
-      MenuEditItemBase::draw_edit_screen(msg, LCD_Z_OFFSET_FUNC(spm * babystep.accum));
+      MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(spm * babystep.accum));
       #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
         const bool in_view = (true
           #if HAS_GRAPHICAL_LCD
@@ -81,7 +81,7 @@
           #endif
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
           lcd_put_wchar(':');
-          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
+          lcd_put_u8str(BABYSTEP_TO_STR(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
         }
       #endif
     }
@@ -222,7 +222,7 @@ void menu_tune() {
     EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
     // Flow En:
     #if EXTRUDERS > 1
-      for (uint8_t n = 0; n < EXTRUDERS; n++)
+      LOOP_L_N(n, EXTRUDERS)
         EDIT_ITEM_N(int3, n, MSG_FLOW_N, &planner.flow_percentage[n], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
     #endif
   #endif
@@ -232,10 +232,10 @@ void menu_tune() {
   //
   #if ENABLED(LIN_ADVANCE) && DISABLED(SLIM_LCD_MENUS)
     #if EXTRUDERS == 1
-      EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+      EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
-      for (uint8_t n = 0; n < EXTRUDERS; n++)
-        EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+      LOOP_L_N(n, EXTRUDERS)
+        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 422c8b0b81c4..bbcb678dd84a 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -103,7 +103,7 @@ MarlinUI ui;
   #include "../feature/bedlevel/bedlevel.h"
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "../feature/tmc_util.h"
 #endif
 
@@ -227,7 +227,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0
     SETCURSOR(col, row);
     if (!string) return;
 
-    auto _newline = [&col, &row]() {
+    auto _newline = [&col, &row]{
       col = 0; row++;                 // Move col to string len (plus space)
       SETCURSOR(0, row);              // Simulate carriage return
     };
@@ -391,7 +391,7 @@ bool MarlinUI::get_blink() {
 
     void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
       move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
-      encoderPosition = dir;
+      ui.encoderPosition = dir;
       switch (axis) {
         case X_AXIS: lcd_move_x(); break;
         case Y_AXIS: lcd_move_y(); break;
@@ -524,7 +524,7 @@ void MarlinUI::status_screen() {
     #if PROGRESS_MSG_EXPIRE > 0
 
       // Handle message expire
-      if (expire_status_ms > 0) {
+      if (expire_status_ms) {
 
         // Expire the message if a job is active and the bar has ticks
         if (get_progress_percent() > 2 && !print_job_timer.isPaused()) {
@@ -776,6 +776,13 @@ void MarlinUI::update() {
     // If the action button is pressed...
     static bool wait_for_unclick; // = false
 
+    auto do_click = [&]{
+      wait_for_unclick = true;                        //  - Set debounce flag to ignore continous clicks
+      lcd_clicked = !wait_for_user && !no_reentry;    //  - Keep the click if not waiting for a user-click
+      wait_for_user = false;                          //  - Any click clears wait for user
+      quick_feedback();                               //  - Always make a click sound
+    };
+
     #if ENABLED(TOUCH_BUTTONS)
       if (touch_buttons) {
         RESET_STATUS_TIMEOUT();
@@ -796,12 +803,8 @@ void MarlinUI::update() {
             }
           }
         }
-        else if (!wait_for_unclick && (buttons & EN_C)) { // OK button, if not waiting for a debounce release:
-          wait_for_unclick = true;                        //  - Set debounce flag to ignore continous clicks
-          lcd_clicked = !wait_for_user && !no_reentry;    //  - Keep the click if not waiting for a user-click
-          wait_for_user = false;                          //  - Any click clears wait for user
-          quick_feedback();                               //  - Always make a click sound
-        }
+        else if (!wait_for_unclick && (buttons & EN_C))   // OK button, if not waiting for a debounce release:
+          do_click();
       }
       else // keep wait_for_unclick value
 
@@ -810,12 +813,7 @@ void MarlinUI::update() {
       {
         // Integrated LCD click handling via button_pressed
         if (!external_control && button_pressed()) {
-          if (!wait_for_unclick) {                        // If not waiting for a debounce release:
-            wait_for_unclick = true;                      //  - Set debounce flag to ignore continous clicks
-            lcd_clicked = !wait_for_user && !no_reentry;  //  - Keep the click if not waiting for a user-click
-            wait_for_user = false;                        //  - Any click clears wait for user
-            quick_feedback();                             //  - Always make a click sound
-          }
+          if (!wait_for_unclick) do_click();              // Handle the click
         }
         else
           wait_for_unclick = false;
@@ -1136,7 +1134,7 @@ void MarlinUI::update() {
       thermalManager.current_ADCKey_raw = HAL_ADC_RANGE;
       thermalManager.ADCKey_count = 0;
       if (currentkpADCValue < adc_other_button)
-        for (uint8_t i = 0; i < ADC_KEY_NUM; i++) {
+        LOOP_L_N(i, ADC_KEY_NUM) {
           const uint16_t lo = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMin),
                          hi = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMax);
           if (WITHIN(currentkpADCValue, lo, hi)) return pgm_read_byte(&stADCKeyTable[i].ADCKeyNo);
@@ -1149,27 +1147,6 @@ void MarlinUI::update() {
 
 #if HAS_ENCODER_ACTION
 
-  #if DISABLED(ADC_KEYPAD) && (ENABLED(REPRAPWORLD_KEYPAD) || !HAS_DIGITAL_BUTTONS)
-
-    /**
-     * Setup Rotary Encoder Bit Values (for two pin encoders to indicate movement)
-     * These values are independent of which pins are used for EN_A and EN_B indications
-     * The rotary encoder part is also independent to the chipset used for the LCD
-     */
-    #define GET_SHIFT_BUTTON_STATES(DST) \
-      uint8_t new_##DST = 0; \
-      WRITE(SHIFT_LD, LOW); \
-      WRITE(SHIFT_LD, HIGH); \
-      for (int8_t i = 0; i < 8; i++) { \
-        new_##DST >>= 1; \
-        if (READ(SHIFT_OUT)) SBI(new_##DST, 7); \
-        WRITE(SHIFT_CLK, HIGH); \
-        WRITE(SHIFT_CLK, LOW); \
-      } \
-      DST = ~new_##DST; //invert it, because a pressed switch produces a logical 0
-
-  #endif
-
   /**
    * Read encoder buttons from the hardware registers
    * Warning: This function is called from interrupt context!
@@ -1267,15 +1244,25 @@ void MarlinUI::update() {
       #endif
 
       #if HAS_SHIFT_ENCODER
-
-        GET_SHIFT_BUTTON_STATES((
-          #if ENABLED(REPRAPWORLD_KEYPAD)
-            keypad_buttons
-          #else
-            buttons
-          #endif
-        ));
-
+        /**
+         * Set up Rotary Encoder bit values (for two pin encoders to indicate movement).
+         * These values are independent of which pins are used for EN_A / EN_B indications.
+         * The rotary encoder part is also independent of the LCD chipset.
+         */
+        uint8_t val = 0;
+        WRITE(SHIFT_LD, LOW);
+        WRITE(SHIFT_LD, HIGH);
+        LOOP_L_N(i, 8) {
+          val >>= 1;
+          if (READ(SHIFT_OUT)) SBI(val, 7);
+          WRITE(SHIFT_CLK, HIGH);
+          WRITE(SHIFT_CLK, LOW);
+        }
+        #if ENABLED(REPRAPWORLD_KEYPAD)
+          keypad_buttons = ~val;
+        #else
+          buttons = ~val;
+        #endif
       #endif
 
     } // next_button_update_ms
@@ -1320,7 +1307,7 @@ void MarlinUI::update() {
 #if HAS_DISPLAY
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "extensible_ui/ui_api.h"
+    #include "extui/ui_api.h"
   #endif
 
   ////////////////////////////////////////////
@@ -1348,15 +1335,19 @@ void MarlinUI::update() {
       UNUSED(persist);
     #endif
 
+    #if ENABLED(LCD_PROGRESS_BAR) || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+      const millis_t ms = millis();
+    #endif
+
     #if ENABLED(LCD_PROGRESS_BAR)
-      progress_bar_ms = millis();
+      progress_bar_ms = ms;
       #if PROGRESS_MSG_EXPIRE > 0
-        expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
+        expire_status_ms = persist ? 0 : ms + PROGRESS_MSG_EXPIRE;
       #endif
     #endif
 
     #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
-      next_filament_display = millis() + 5000UL; // Show status message for 5s
+      next_filament_display = ms + 5000UL; // Show status message for 5s
     #endif
 
     #if HAS_SPI_LCD && ENABLED(STATUS_MESSAGE_SCROLLING)
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index f614e2009b82..1bcf9956feee 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -27,10 +27,18 @@
   #include "../libs/buzzer.h"
 #endif
 
-#define HAS_ENCODER_ACTION (HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY))
-#define HAS_ENCODER_WHEEL  ((!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTONS_EXIST(EN1, EN2))
-#define HAS_DIGITAL_BUTTONS (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT))
-#define HAS_SHIFT_ENCODER   (!HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL))))
+#if HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY)
+  #define HAS_ENCODER_ACTION 1
+#endif
+#if (!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTONS_EXIST(EN1, EN2)
+  #define HAS_ENCODER_WHEEL 1
+#endif
+#if HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)
+  #define HAS_DIGITAL_BUTTONS 1
+#endif
+#if !HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL)))
+  #define HAS_SHIFT_ENCODER 1
+#endif
 
 // I2C buttons must be read in the main thread
 #define HAS_SLOW_BUTTONS EITHER(LCD_I2C_VIKI, LCD_I2C_PANELOLU2)
@@ -337,6 +345,9 @@ class MarlinUI {
       #endif
 
       #if ENABLED(SHOW_BOOTSCREEN)
+        #ifndef BOOTSCREEN_TIMEOUT
+          #define BOOTSCREEN_TIMEOUT 2500
+        #endif
         static void draw_marlin_bootscreen(const bool line2=false);
         static void show_marlin_bootscreen();
         static void show_bootscreen();
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 37fbf021d17f..ad7053714128 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -508,7 +508,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   // Work on the drivers
   //
 
-  for (uint8_t k = 0; k < driver_count; k++) {
+  LOOP_L_N(k, driver_count) {
     uint8_t not_found = true;
     for (j = 1; j <= L64XX::chain[0]; j++) {
       PGM_P const str = (PGM_P)pgm_read_ptr(&index_to_axis[L64XX::chain[j]]);
diff --git a/Marlin/src/libs/buzzer.cpp b/Marlin/src/libs/buzzer.cpp
index 35631708c425..3b0a23917871 100644
--- a/Marlin/src/libs/buzzer.cpp
+++ b/Marlin/src/libs/buzzer.cpp
@@ -28,7 +28,7 @@
 #include "../module/temperature.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 Buzzer::state_t Buzzer::state;
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index 58ba57e42571..ecbfeb331ede 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -54,7 +54,7 @@ Nozzle nozzle;
     #endif
 
     // Start the stroke pattern
-    for (uint8_t i = 0; i < (strokes >> 1); i++) {
+    LOOP_L_N(i, strokes >> 1) {
       do_blocking_move_to_xy(end);
       do_blocking_move_to_xy(start);
     }
@@ -91,7 +91,7 @@ Nozzle nozzle;
     const bool horiz = ABS(diff.x) >= ABS(diff.y);    // Do a horizontal wipe?
     const float P = (horiz ? diff.x : diff.y) / zigs; // Period of each zig / zag
     const xyz_pos_t *side;
-    for (uint8_t j = 0; j < strokes; j++) {
+    LOOP_L_N(j, strokes) {
       for (int8_t i = 0; i < zigs; i++) {
         side = (i & 1) ? &end : &start;
         if (horiz)
@@ -134,8 +134,8 @@ Nozzle nozzle;
       do_blocking_move_to(start);
     #endif
 
-    for (uint8_t s = 0; s < strokes; s++)
-      for (uint8_t i = 0; i < NOZZLE_CLEAN_CIRCLE_FN; i++)
+    LOOP_L_N(s, strokes)
+      LOOP_L_N(i, NOZZLE_CLEAN_CIRCLE_FN)
         do_blocking_move_to_xy(
           middle.x + sin((RADIANS(360) / NOZZLE_CLEAN_CIRCLE_FN) * i) * radius,
           middle.y + cos((RADIANS(360) / NOZZLE_CLEAN_CIRCLE_FN) * i) * radius
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index e5ddc147489b..1ed315ae07d7 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -33,7 +33,7 @@ char conv[8] = { 0 };
 #define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
 
 // Convert a full-range unsigned 8bit int to a percentage
-const char* ui8tostr4pct(const uint8_t i) {
+const char* ui8tostr4pctrj(const uint8_t i) {
   const uint8_t n = ui8_to_percent(i);
   conv[3] = RJDIGIT(n, 100);
   conv[4] = RJDIGIT(n, 10);
@@ -43,7 +43,7 @@ const char* ui8tostr4pct(const uint8_t i) {
 }
 
 // Convert unsigned 8bit int to string 123 format
-const char* ui8tostr3(const uint8_t i) {
+const char* ui8tostr3rj(const uint8_t i) {
   conv[4] = RJDIGIT(i, 100);
   conv[5] = RJDIGIT(i, 10);
   conv[6] = DIGIMOD(i, 1);
@@ -51,7 +51,7 @@ const char* ui8tostr3(const uint8_t i) {
 }
 
 // Convert signed 8bit int to rj string with 123 or -12 format
-const char* i8tostr3(const int8_t x) {
+const char* i8tostr3rj(const int8_t x) {
   int xx = x;
   conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
   conv[5] = RJDIGIT(xx, 10);
@@ -88,7 +88,7 @@ const char* i8tostr3(const int8_t x) {
 #endif
 
 // Convert unsigned 16bit int to string 12345 format
-const char* ui16tostr5(const uint16_t xx) {
+const char* ui16tostr5rj(const uint16_t xx) {
   conv[2] = RJDIGIT(xx, 10000);
   conv[3] = RJDIGIT(xx, 1000);
   conv[4] = RJDIGIT(xx, 100);
@@ -98,7 +98,7 @@ const char* ui16tostr5(const uint16_t xx) {
 }
 
 // Convert unsigned 16bit int to string 1234 format
-const char* ui16tostr4(const uint16_t xx) {
+const char* ui16tostr4rj(const uint16_t xx) {
   conv[3] = RJDIGIT(xx, 1000);
   conv[4] = RJDIGIT(xx, 100);
   conv[5] = RJDIGIT(xx, 10);
@@ -107,7 +107,7 @@ const char* ui16tostr4(const uint16_t xx) {
 }
 
 // Convert unsigned 16bit int to string 123 format
-const char* ui16tostr3(const uint16_t xx) {
+const char* ui16tostr3rj(const uint16_t xx) {
   conv[4] = RJDIGIT(xx, 100);
   conv[5] = RJDIGIT(xx, 10);
   conv[6] = DIGIMOD(xx, 1);
@@ -115,7 +115,7 @@ const char* ui16tostr3(const uint16_t xx) {
 }
 
 // Convert signed 16bit int to rj string with 123 or -12 format
-const char* i16tostr3(const int16_t x) {
+const char* i16tostr3rj(const int16_t x) {
   int xx = x;
   conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
   conv[5] = RJDIGIT(xx, 10);
@@ -136,7 +136,7 @@ const char* i16tostr3left(const int16_t i) {
 }
 
 // Convert signed 16bit int to rj string with 1234, _123, -123, _-12, or __-1 format
-const char* i16tostr4sign(const int16_t i) {
+const char* i16tostr4signrj(const int16_t i) {
   const bool neg = i < 0;
   const int ii = neg ? -i : i;
   if (i >= 1000) {
@@ -174,9 +174,9 @@ const char* ftostr12ns(const float &f) {
   return &conv[3];
 }
 
-// Convert signed float to fixed-length string with 12.34 / -2.34 format or 123.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
 const char* ftostr42_52(const float &f) {
-  if (f <= -10 || f >= 100) return ftostr52(f); // need more digits
+  if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
   conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000));
   conv[3] = DIGIMOD(i, 100);
@@ -198,12 +198,38 @@ const char* ftostr52(const float &f) {
   return &conv[1];
 }
 
+// Convert signed float to fixed-length string with 12.345 / _2.345 / -2.345 or -23.45 / 123.45 format
+const char* ftostr53_63(const float &f) {
+  if (f <= -10 || f >= 100) return ftostr63(f); // -23.456 / 123.456
+  long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+  conv[1] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 10000));
+  conv[2] = DIGIMOD(i, 1000);
+  conv[3] = '.';
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return &conv[1];
+}
+
+// Convert signed float to fixed-length string with 023.456 / -23.456 format
+const char* ftostr63(const float &f) {
+  long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+  conv[0] = MINUSOR(i, DIGIMOD(i, 100000));
+  conv[1] = DIGIMOD(i, 10000);
+  conv[2] = DIGIMOD(i, 1000);
+  conv[3] = '.';
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return &conv[0];
+}
+
 #if ENABLED(LCD_DECIMAL_SMALL_XY)
 
   // Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
   const char* ftostr4sign(const float &f) {
     const int i = (f * 100 + (f < 0 ? -5: 5)) / 10;
-    if (!WITHIN(i, -99, 999)) return i16tostr4sign((int)f);
+    if (!WITHIN(i, -99, 999)) return i16tostr4signrj((int)f);
     const bool neg = i < 0;
     const int ii = neg ? -i : i;
     conv[3] = neg ? '-' : (ii >= 100 ? DIGIMOD(ii, 100) : ' ');
@@ -255,7 +281,7 @@ const char* ftostr54sign(const float &f, char plus/*=' '*/) {
 // Convert unsigned float to rj string with 12345 format
 const char* ftostr5rj(const float &f) {
   const long i = ((f < 0 ? -f : f) * 10 + 5) / 10;
-  return ui16tostr5(i);
+  return ui16tostr5rj(i);
 }
 
 // Convert signed float to string with +1234.5 format
@@ -284,7 +310,20 @@ const char* ftostr52sign(const float &f) {
   return conv;
 }
 
-// Convert unsigned float to string with 1234.5 format omitting trailing zeros
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f) {
+  long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
+  conv[0] = MINUSOR(i, '+');
+  conv[1] = DIGIMOD(i, 10000);
+  conv[2] = DIGIMOD(i, 1000);
+  conv[3] = '.';
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return conv;
+}
+
+// Convert unsigned float to string with ____4.5, __34.5, _234.5, 1234.5 format
 const char* ftostr51rj(const float &f) {
   const long i = ((f < 0 ? -f : f) * 100 + 5) / 10;
   conv[0] = ' ';
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index ee29b26ab08e..8b6b83391f8e 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -24,13 +24,13 @@
 #include <stdint.h>
 
 // Convert a full-range unsigned 8bit int to a percentage
-const char* ui8tostr4pct(const uint8_t i);
+const char* ui8tostr4pctrj(const uint8_t i);
 
 // Convert uint8_t to string with 123 format
-const char* ui8tostr3(const uint8_t i);
+const char* ui8tostr3rj(const uint8_t i);
 
 // Convert int8_t to string with 123 format
-const char* i8tostr3(const int8_t x);
+const char* i8tostr3rj(const int8_t x);
 
 #if HAS_PRINT_PROGRESS_PERMYRIAD
   // Convert 16-bit unsigned permyriad value to percent: 100 / 23 / 23.4 / 3.45
@@ -38,32 +38,38 @@ const char* i8tostr3(const int8_t x);
 #endif
 
 // Convert uint16_t to string with 12345 format
-const char* ui16tostr5(const uint16_t x);
+const char* ui16tostr5rj(const uint16_t x);
 
 // Convert uint16_t to string with 1234 format
-const char* ui16tostr4(const uint16_t x);
+const char* ui16tostr4rj(const uint16_t x);
 
 // Convert uint16_t to string with 123 format
-const char* ui16tostr3(const uint16_t x);
+const char* ui16tostr3rj(const uint16_t x);
 
 // Convert int16_t to string with 123 format
-const char* i16tostr3(const int16_t x);
+const char* i16tostr3rj(const int16_t x);
 
 // Convert unsigned int to lj string with 123 format
 const char* i16tostr3left(const int16_t xx);
 
 // Convert signed int to rj string with _123, -123, _-12, or __-1 format
-const char* i16tostr4sign(const int16_t x);
+const char* i16tostr4signrj(const int16_t x);
 
 // Convert unsigned float to string with 1.23 format
 const char* ftostr12ns(const float &x);
 
-// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
 const char* ftostr42_52(const float &x);
 
 // Convert signed float to fixed-length string with 023.45 / -23.45 format
 const char* ftostr52(const float &x);
 
+// Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
+const char* ftostr53_63(const float &x);
+
+// Convert signed float to fixed-length string with 023.456 / -23.456 format
+const char* ftostr63(const float &x);
+
 // Convert float to fixed-length string with +123.4 / -123.4 format
 const char* ftostr41sign(const float &x);
 
@@ -85,13 +91,16 @@ const char* ftostr52sp(const float &x);
 // Convert signed float to string with +123.45 format
 const char* ftostr52sign(const float &x);
 
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f);
+
 // Convert unsigned float to string with 1234.5 format omitting trailing zeros
 const char* ftostr51rj(const float &x);
 
 #include "../core/macros.h"
 
 // Convert float to rj string with 123 or -12 format
-FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
+FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3rj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
 
 #include "../inc/MarlinConfigPre.h"
 
@@ -100,5 +109,5 @@ FORCE_INLINE const char* ftostr3(const float &x) { return i16tostr3(int16_t(x +
   const char* ftostr4sign(const float &fx);
 #else
   // Convert float to rj string with 1234, _123, -123, __12, _-12, ___1, or __-1 format
-  FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4sign(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
+  FORCE_INLINE const char* ftostr4sign(const float &x) { return i16tostr4signrj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }
 #endif
diff --git a/Marlin/src/libs/stopwatch.cpp b/Marlin/src/libs/stopwatch.cpp
index fe80b17462b9..6b01158cb9a9 100644
--- a/Marlin/src/libs/stopwatch.cpp
+++ b/Marlin/src/libs/stopwatch.cpp
@@ -25,7 +25,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 Stopwatch::State Stopwatch::state;
diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index d2af0f3d5630..c0da29e702bd 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -96,8 +96,8 @@ void apply_rotation_xyz(const matrix_3x3 &matrix, float &_x, float &_y, float &_
 
 // Reset to identity. No rotate or translate.
 void matrix_3x3::set_to_identity() {
-  for (uint8_t i = 0; i < 3; i++)
-    for (uint8_t j = 0; j < 3; j++)
+  LOOP_L_N(i, 3)
+    LOOP_L_N(j, 3)
       vectors[i][j] = float(i == j);
 }
 
@@ -134,8 +134,8 @@ matrix_3x3 matrix_3x3::create_look_at(const vector_3 &target) {
 // Get a transposed copy of the matrix
 matrix_3x3 matrix_3x3::transpose(const matrix_3x3 &original) {
   matrix_3x3 new_matrix;
-  for (uint8_t i = 0; i < 3; i++)
-    for (uint8_t j = 0; j < 3; j++)
+  LOOP_L_N(i, 3)
+    LOOP_L_N(j, 3)
       new_matrix.vectors[i][j] = original.vectors[j][i];
   return new_matrix;
 }
@@ -145,8 +145,8 @@ void matrix_3x3::debug(PGM_P const title) {
     serialprintPGM(title);
     SERIAL_EOL();
   }
-  for (uint8_t i = 0; i < 3; i++) {
-    for (uint8_t j = 0; j < 3; j++) {
+  LOOP_L_N(i, 3) {
+    LOOP_L_N(j, 3) {
       if (vectors[i][j] >= 0.0) SERIAL_CHAR('+');
       SERIAL_ECHO_F(vectors[i][j], 6);
       SERIAL_CHAR(' ');
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 3fe38d4ade8f..2ecc9299c9b3 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -57,7 +57,7 @@
 #include "../MarlinCore.h"
 
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
-  #include "../HAL/shared/persistent_store_api.h"
+  #include "../HAL/shared/eeprom_api.h"
 #endif
 
 #include "probe.h"
@@ -71,7 +71,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_SERVOS
@@ -87,7 +87,7 @@
 #include "../feature/fwretract.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #include "../feature/pause.h"
@@ -101,7 +101,7 @@
 #endif
 
 #if ENABLED(EXTRA_LIN_ADVANCE_K)
-  extern float saved_extruder_advance_K[EXTRUDERS];
+  extern float other_extruder_advance_K[EXTRUDERS];
 #endif
 
 #if EXTRUDERS > 1
@@ -113,13 +113,23 @@
   #include "../feature/bltouch.h"
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "stepper/indirection.h"
   #include "../feature/tmc_util.h"
 #endif
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
-  #include "../feature/probe_temp_compensation.h"
+  #include "../feature/probe_temp_comp.h"
+#endif
+
+#include "../feature/controllerfan.h"
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+  void M710_report(const bool forReplay);
+#endif
+
+#define HAS_CASE_LIGHT_BRIGHTNESS (ENABLED(CASE_LIGHT_MENU) && DISABLED(CASE_LIGHT_NO_BRIGHTNESS))
+#if HAS_CASE_LIGHT_BRIGHTNESS
+  #include "../feature/caselight.h"
 #endif
 
 #pragma pack(push, 1) // No padding between variables
@@ -181,11 +191,8 @@ typedef struct SettingsDataStruct {
   //
   float mbl_z_offset;                                   // mbl.z_offset
   uint8_t mesh_num_x, mesh_num_y;                       // GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y
-  #if ENABLED(MESH_BED_LEVELING)
-    float mbl_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y]; // mbl.z_values
-  #else
-    float mbl_z_values[3][3];
-  #endif
+  float mbl_z_values[TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3)]   // mbl.z_values
+                    [TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_Y, 3)];
 
   //
   // HAS_BED_PROBE
@@ -295,6 +302,11 @@ typedef struct SettingsDataStruct {
   //
   int16_t lcd_contrast;                                 // M250 C
 
+  //
+  // Controller fan settings
+  //
+  controllerFan_settings_t controllerFan_settings;      // M710
+
   //
   // POWER_LOSS_RECOVERY
   //
@@ -313,7 +325,7 @@ typedef struct SettingsDataStruct {
   float planner_filament_size[EXTRUDERS];               // M200 T D  planner.filament_size[]
 
   //
-  // HAS_TRINAMIC
+  // HAS_TRINAMIC_CONFIG
   //
   tmc_stepper_current_t tmc_stepper_current;            // M906 X Y Z X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
   tmc_hybrid_threshold_t tmc_hybrid_threshold;          // M913 X Y Z X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
@@ -369,6 +381,13 @@ typedef struct SettingsDataStruct {
     uint8_t extui_data[ExtUI::eeprom_data_size];
   #endif
 
+  //
+  // HAS_CASE_LIGHT_BRIGHTNESS
+  //
+  #if HAS_CASE_LIGHT_BRIGHTNESS
+    uint8_t case_light_brightness;
+  #endif
+
 } SettingsData;
 
 //static_assert(sizeof(SettingsData) <= E2END + 1, "EEPROM too small to contain SettingsData!");
@@ -434,6 +453,10 @@ void MarlinSettings::postprocess() {
     planner.recalculate_max_e_jerk();
   #endif
 
+  #if HAS_CASE_LIGHT_BRIGHTNESS
+    update_case_light();
+  #endif
+
   // Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
   // and init stepper.count[], planner.position[] with current_position
   planner.refresh_positioning();
@@ -525,7 +548,7 @@ void MarlinSettings::postprocess() {
    * M500 - Store Configuration
    */
   bool MarlinSettings::save() {
-    float dummy = 0;
+    float dummyf = 0;
     char ver[4] = "ERR";
 
     uint16_t working_crc = 0;
@@ -533,11 +556,10 @@ void MarlinSettings::postprocess() {
     EEPROM_START();
 
     eeprom_error = false;
-    #if ENABLED(FLASH_EEPROM_EMULATION)
-      EEPROM_SKIP(ver);   // Flash doesn't allow rewriting without erase
-    #else
-      EEPROM_WRITE(ver);  // invalidate data first
-    #endif
+
+    // Write or Skip version. (Flash doesn't allow rewrite without erase.)
+    TERN(FLASH_EEPROM_EMULATION, EEPROM_SKIP, EEPROM_WRITE)(ver);
+
     EEPROM_SKIP(working_crc); // Skip the checksum slot
 
     working_crc = 0; // clear before first "real data"
@@ -556,20 +578,18 @@ void MarlinSettings::postprocess() {
       #if HAS_CLASSIC_JERK
         EEPROM_WRITE(planner.max_jerk);
         #if HAS_LINEAR_E_JERK
-          dummy = float(DEFAULT_EJERK);
-          EEPROM_WRITE(dummy);
+          dummyf = float(DEFAULT_EJERK);
+          EEPROM_WRITE(dummyf);
         #endif
       #else
         const xyze_pos_t planner_max_jerk = { 10, 10, 0.4, float(DEFAULT_EJERK) };
         EEPROM_WRITE(planner_max_jerk);
       #endif
 
-      #if DISABLED(CLASSIC_JERK)
-        EEPROM_WRITE(planner.junction_deviation_mm);
-      #else
-        dummy = 0.02f;
-        EEPROM_WRITE(dummy);
+      #if ENABLED(CLASSIC_JERK)
+        dummyf = 0.02f;
       #endif
+      EEPROM_WRITE(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
     }
 
     //
@@ -589,7 +609,7 @@ void MarlinSettings::postprocess() {
 
       #if HAS_HOTEND_OFFSET
         // Skip hotend 0 which must be 0
-        for (uint8_t e = 1; e < HOTENDS; e++)
+        LOOP_S_L_N(e, 1, HOTENDS)
           EEPROM_WRITE(hotend_offset[e]);
       #endif
     }
@@ -617,13 +637,7 @@ void MarlinSettings::postprocess() {
     // Global Leveling
     //
     {
-      const float zfh = (
-        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-          planner.z_fade_height
-        #else
-          10.0
-        #endif
-      );
+      const float zfh = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.z_fade_height, 10.0f);
       EEPROM_WRITE(zfh);
     }
 
@@ -632,23 +646,25 @@ void MarlinSettings::postprocess() {
     //
     {
       #if ENABLED(MESH_BED_LEVELING)
-        // Compile time test that sizeof(mbl.z_values) is as expected
         static_assert(
           sizeof(mbl.z_values) == (GRID_MAX_POINTS) * sizeof(mbl.z_values[0][0]),
           "MBL Z array is the wrong size."
         );
-        const uint8_t mesh_num_x = GRID_MAX_POINTS_X, mesh_num_y = GRID_MAX_POINTS_Y;
-        EEPROM_WRITE(mbl.z_offset);
-        EEPROM_WRITE(mesh_num_x);
-        EEPROM_WRITE(mesh_num_y);
+      #else
+        dummyf = 0;
+      #endif
+
+      const uint8_t mesh_num_x = TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3),
+                    mesh_num_y = TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_Y, 3);
+
+      EEPROM_WRITE(TERN(MESH_BED_LEVELING, mbl.z_offset, dummyf));
+      EEPROM_WRITE(mesh_num_x);
+      EEPROM_WRITE(mesh_num_y);
+
+      #if ENABLED(MESH_BED_LEVELING)
         EEPROM_WRITE(mbl.z_values);
-      #else // For disabled MBL write a default mesh
-        dummy = 0;
-        const uint8_t mesh_num_x = 3, mesh_num_y = 3;
-        EEPROM_WRITE(dummy); // z_offset
-        EEPROM_WRITE(mesh_num_x);
-        EEPROM_WRITE(mesh_num_y);
-        for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummy);
+      #else
+        for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -672,8 +688,8 @@ void MarlinSettings::postprocess() {
       #if ABL_PLANAR
         EEPROM_WRITE(planner.bed_level_matrix);
       #else
-        dummy = 0;
-        for (uint8_t q = 9; q--;) EEPROM_WRITE(dummy);
+        dummyf = 0;
+        for (uint8_t q = 9; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -682,27 +698,26 @@ void MarlinSettings::postprocess() {
     //
     {
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        // Compile time test that sizeof(z_values) is as expected
         static_assert(
           sizeof(z_values) == (GRID_MAX_POINTS) * sizeof(z_values[0][0]),
           "Bilinear Z array is the wrong size."
         );
-        const uint8_t grid_max_x = GRID_MAX_POINTS_X, grid_max_y = GRID_MAX_POINTS_Y;
-        EEPROM_WRITE(grid_max_x);            // 1 byte
-        EEPROM_WRITE(grid_max_y);            // 1 byte
-        EEPROM_WRITE(bilinear_grid_spacing); // 2 ints
-        EEPROM_WRITE(bilinear_start);        // 2 ints
-        EEPROM_WRITE(z_values);              // 9-256 floats
       #else
-        // For disabled Bilinear Grid write an empty 3x3 grid
-        const uint8_t grid_max_x = 3, grid_max_y = 3;
         const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
-        dummy = 0;
-        EEPROM_WRITE(grid_max_x);
-        EEPROM_WRITE(grid_max_y);
-        EEPROM_WRITE(bilinear_grid_spacing);
-        EEPROM_WRITE(bilinear_start);
-        for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummy);
+      #endif
+
+      const uint8_t grid_max_x = TERN(AUTO_BED_LEVELING_BILINEAR, GRID_MAX_POINTS_X, 3),
+                    grid_max_y = TERN(AUTO_BED_LEVELING_BILINEAR, GRID_MAX_POINTS_Y, 3);
+      EEPROM_WRITE(grid_max_x);
+      EEPROM_WRITE(grid_max_y);
+      EEPROM_WRITE(bilinear_grid_spacing);
+      EEPROM_WRITE(bilinear_start);
+
+      #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
+        EEPROM_WRITE(z_values);              // 9-256 floats
+      #else
+        dummyf = 0;
+        for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -711,16 +726,10 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(planner_leveling_active);
-
-      #if ENABLED(AUTO_BED_LEVELING_UBL)
-        EEPROM_WRITE(planner.leveling_active);
-        EEPROM_WRITE(ubl.storage_slot);
-      #else
-        const bool ubl_active = false;
-        const int8_t storage_slot = -1;
-        EEPROM_WRITE(ubl_active);
-        EEPROM_WRITE(storage_slot);
-      #endif // AUTO_BED_LEVELING_UBL
+      const bool ubl_active = TERN(AUTO_BED_LEVELING_UBL, planner.leveling_active, false);
+      const int8_t storage_slot = TERN(AUTO_BED_LEVELING_UBL, ubl.storage_slot, -1);
+      EEPROM_WRITE(ubl_active);
+      EEPROM_WRITE(storage_slot);
     }
 
     //
@@ -728,7 +737,6 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(servo_angles);
-
       #if !HAS_SERVO_ANGLES
         uint16_t servo_angles[EEPROM_NUM_SERVOS][2] = { { 0, 0 } };
       #endif
@@ -753,11 +761,7 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(bltouch_last_written_mode);
-      #if ENABLED(BLTOUCH)
-        const bool &bltouch_last_written_mode = bltouch.last_written_mode;
-      #else
-        constexpr bool bltouch_last_written_mode = false;
-      #endif
+      const bool bltouch_last_written_mode = TERN(BLTOUCH, bltouch.last_written_mode, false);
       EEPROM_WRITE(bltouch_last_written_mode);
     }
 
@@ -781,35 +785,21 @@ void MarlinSettings::postprocess() {
         _FIELD_TEST(x2_endstop_adj);
 
         // Write dual endstops in X, Y, Z order. Unused = 0.0
-        dummy = 0;
-        #if ENABLED(X_DUAL_ENDSTOPS)
-          EEPROM_WRITE(endstops.x2_endstop_adj);   // 1 float
-        #else
-          EEPROM_WRITE(dummy);
-        #endif
-
-        #if ENABLED(Y_DUAL_ENDSTOPS)
-          EEPROM_WRITE(endstops.y2_endstop_adj);   // 1 float
-        #else
-          EEPROM_WRITE(dummy);
-        #endif
-
-        #if ENABLED(Z_MULTI_ENDSTOPS)
-          EEPROM_WRITE(endstops.z2_endstop_adj);   // 1 float
-        #else
-          EEPROM_WRITE(dummy);
-        #endif
+        dummyf = 0;
+        EEPROM_WRITE(TERN(X_DUAL_ENDSTOPS, endstops.x2_endstop_adj, dummyf));   // 1 float
+        EEPROM_WRITE(TERN(Y_DUAL_ENDSTOPS, endstops.y2_endstop_adj, dummyf));   // 1 float
+        EEPROM_WRITE(TERN(Z_MULTI_ENDSTOPS, endstops.z2_endstop_adj, dummyf));  // 1 float
 
         #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
           EEPROM_WRITE(endstops.z3_endstop_adj);   // 1 float
         #else
-          EEPROM_WRITE(dummy);
+          EEPROM_WRITE(dummyf);
         #endif
 
         #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
           EEPROM_WRITE(endstops.z4_endstop_adj);   // 1 float
         #else
-          EEPROM_WRITE(dummy);
+          EEPROM_WRITE(dummyf);
         #endif
 
       #endif
@@ -851,8 +841,8 @@ void MarlinSettings::postprocess() {
       HOTEND_LOOP() {
         PIDCF_t pidcf = {
           #if DISABLED(PIDTEMP)
-            DUMMY_PID_VALUE, DUMMY_PID_VALUE, DUMMY_PID_VALUE,
-            DUMMY_PID_VALUE, DUMMY_PID_VALUE
+            NAN, NAN, NAN,
+            NAN, NAN
           #else
                          PID_PARAM(Kp, e),
             unscalePID_i(PID_PARAM(Ki, e)),
@@ -865,12 +855,10 @@ void MarlinSettings::postprocess() {
       }
 
       _FIELD_TEST(lpq_len);
-      #if ENABLED(PID_EXTRUSION_SCALING)
-        EEPROM_WRITE(thermalManager.lpq_len);
-      #else
+      #if DISABLED(PID_EXTRUSION_SCALING)
         const int16_t lpq_len = 20;
-        EEPROM_WRITE(lpq_len);
       #endif
+      EEPROM_WRITE(TERN(PID_EXTRUSION_SCALING, thermalManager.lpq_len, lpq_len));
     }
 
     //
@@ -881,7 +869,7 @@ void MarlinSettings::postprocess() {
 
       const PID_t bed_pid = {
         #if DISABLED(PIDTEMPBED)
-          DUMMY_PID_VALUE, DUMMY_PID_VALUE, DUMMY_PID_VALUE
+          NAN, NAN, NAN
         #else
           // Store the unscaled PID values
           thermalManager.temp_bed.pid.Kp,
@@ -911,8 +899,6 @@ void MarlinSettings::postprocess() {
       const int16_t lcd_contrast =
         #if HAS_LCD_CONTRAST
           ui.contrast
-        #elif defined(DEFAULT_LCD_CONTRAST)
-          DEFAULT_LCD_CONTRAST
         #else
           127
         #endif
@@ -920,19 +906,25 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(lcd_contrast);
     }
 
+    //
+    // Controller Fan
+    //
+    {
+      _FIELD_TEST(controllerFan_settings);
+      #if ENABLED(USE_CONTROLLER_FAN)
+        const controllerFan_settings_t &cfs = controllerFan.settings;
+      #else
+        controllerFan_settings_t cfs = controllerFan_defaults;
+      #endif
+      EEPROM_WRITE(cfs);
+    }
+
     //
     // Power-Loss Recovery
     //
     {
       _FIELD_TEST(recovery_enabled);
-
-      const bool recovery_enabled =
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          recovery.enabled
-        #else
-          true
-        #endif
-      ;
+      const bool recovery_enabled = TERN(POWER_LOSS_RECOVERY, recovery.enabled, ENABLED(PLR_ENABLED_DEFAULT));
       EEPROM_WRITE(recovery_enabled);
     }
 
@@ -941,19 +933,15 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(fwretract_settings);
-
-      #if ENABLED(FWRETRACT)
-        EEPROM_WRITE(fwretract.settings);
-      #else
+      #if DISABLED(FWRETRACT)
         const fwretract_settings_t autoretract_defaults = { 3, 45, 0, 0, 0, 13, 0, 8 };
-        EEPROM_WRITE(autoretract_defaults);
       #endif
-      #if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
-        EEPROM_WRITE(fwretract.autoretract_enabled);
-      #else
+      EEPROM_WRITE(TERN(FWRETRACT, fwretract.settings, autoretract_defaults));
+
+      #if DISABLED(FWRETRACT_AUTORETRACT)
         const bool autoretract_enabled = false;
-        EEPROM_WRITE(autoretract_enabled);
       #endif
+      EEPROM_WRITE(TERN(FWRETRACT_AUTORETRACT, fwretract.autoretract_enabled, autoretract_enabled));
     }
 
     //
@@ -970,9 +958,9 @@ void MarlinSettings::postprocess() {
       #else
 
         const bool volumetric_enabled = false;
-        dummy = DEFAULT_NOMINAL_FILAMENT_DIA;
+        dummyf = DEFAULT_NOMINAL_FILAMENT_DIA;
         EEPROM_WRITE(volumetric_enabled);
-        for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummy);
+        for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummyf);
 
       #endif
     }
@@ -985,7 +973,7 @@ void MarlinSettings::postprocess() {
 
       tmc_stepper_current_t tmc_stepper_current = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-      #if HAS_TRINAMIC
+      #if HAS_TRINAMIC_CONFIG
         #if AXIS_IS_TMC(X)
           tmc_stepper_current.X = stepperX.getMilliamps();
         #endif
@@ -1245,8 +1233,8 @@ void MarlinSettings::postprocess() {
       #if ENABLED(LIN_ADVANCE)
         EEPROM_WRITE(planner.extruder_advance_K);
       #else
-        dummy = 0;
-        for (uint8_t q = _MAX(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummy);
+        dummyf = 0;
+        for (uint8_t q = _MAX(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
@@ -1259,7 +1247,7 @@ void MarlinSettings::postprocess() {
       #if HAS_MOTOR_CURRENT_PWM
         EEPROM_WRITE(stepper.motor_current_setting);
       #else
-        const xyz_ulong_t no_current{0};
+        const uint32_t no_current[3] = { 0 };
         EEPROM_WRITE(no_current);
       #endif
     }
@@ -1270,12 +1258,10 @@ void MarlinSettings::postprocess() {
 
     _FIELD_TEST(coordinate_system);
 
-    #if ENABLED(CNC_COORDINATE_SYSTEMS)
-      EEPROM_WRITE(gcode.coordinate_system);
-    #else
+    #if DISABLED(CNC_COORDINATE_SYSTEMS)
       const xyz_pos_t coordinate_system[MAX_COORDINATE_SYSTEMS] = { { 0 } };
-      EEPROM_WRITE(coordinate_system);
     #endif
+    EEPROM_WRITE(TERN(CNC_COORDINATE_SYSTEMS, gcode.coordinate_system, coordinate_system));
 
     //
     // Skew correction factors
@@ -1339,6 +1325,13 @@ void MarlinSettings::postprocess() {
       }
     #endif
 
+    //
+    // Case Light Brightness
+    //
+    #if HAS_CASE_LIGHT_BRIGHTNESS
+      EEPROM_WRITE(case_light_brightness);
+    #endif
+
     //
     // Validate CRC and Data Size
     //
@@ -1403,7 +1396,7 @@ void MarlinSettings::postprocess() {
       eeprom_error = true;
     }
     else {
-      float dummy = 0;
+      float dummyf = 0;
       working_crc = 0;  // Init to 0. Accumulated by EEPROM_READ
 
       _FIELD_TEST(esteppers);
@@ -1442,17 +1435,13 @@ void MarlinSettings::postprocess() {
         #if HAS_CLASSIC_JERK
           EEPROM_READ(planner.max_jerk);
           #if HAS_LINEAR_E_JERK
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
         #else
-          for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
+          for (uint8_t q = 4; q--;) EEPROM_READ(dummyf);
         #endif
 
-        #if DISABLED(CLASSIC_JERK)
-          EEPROM_READ(planner.junction_deviation_mm);
-        #else
-          EEPROM_READ(dummy);
-        #endif
+        EEPROM_READ(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
       }
 
       //
@@ -1477,7 +1466,7 @@ void MarlinSettings::postprocess() {
       {
         #if HAS_HOTEND_OFFSET
           // Skip hotend 0 which must be 0
-          for (uint8_t e = 1; e < HOTENDS; e++)
+          LOOP_S_L_N(e, 1, HOTENDS)
             EEPROM_READ(hotend_offset[e]);
         #endif
       }
@@ -1504,25 +1493,19 @@ void MarlinSettings::postprocess() {
       //
       // Global Leveling
       //
-      {
-        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-          EEPROM_READ(new_z_fade_height);
-        #else
-          EEPROM_READ(dummy);
-        #endif
-      }
+      EEPROM_READ(TERN(ENABLE_LEVELING_FADE_HEIGHT, new_z_fade_height, dummyf));
 
       //
       // Mesh (Manual) Bed Leveling
       //
       {
         uint8_t mesh_num_x, mesh_num_y;
-        EEPROM_READ(dummy);
+        EEPROM_READ(dummyf);
         EEPROM_READ_ALWAYS(mesh_num_x);
         EEPROM_READ_ALWAYS(mesh_num_y);
 
         #if ENABLED(MESH_BED_LEVELING)
-          if (!validating) mbl.z_offset = dummy;
+          if (!validating) mbl.z_offset = dummyf;
           if (mesh_num_x == GRID_MAX_POINTS_X && mesh_num_y == GRID_MAX_POINTS_Y) {
             // EEPROM data fits the current mesh
             EEPROM_READ(mbl.z_values);
@@ -1530,11 +1513,11 @@ void MarlinSettings::postprocess() {
           else {
             // EEPROM data is stale
             if (!validating) mbl.reset();
-            for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
+            for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummyf);
           }
         #else
           // MBL is disabled - skip the stored data
-          for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
+          for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummyf);
         #endif // MESH_BED_LEVELING
       }
 
@@ -1558,7 +1541,7 @@ void MarlinSettings::postprocess() {
         #if ABL_PLANAR
           EEPROM_READ(planner.bed_level_matrix);
         #else
-          for (uint8_t q = 9; q--;) EEPROM_READ(dummy);
+          for (uint8_t q = 9; q--;) EEPROM_READ(dummyf);
         #endif
       }
 
@@ -1567,8 +1550,8 @@ void MarlinSettings::postprocess() {
       //
       {
         uint8_t grid_max_x, grid_max_y;
-        EEPROM_READ_ALWAYS(grid_max_x);                       // 1 byte
-        EEPROM_READ_ALWAYS(grid_max_y);                       // 1 byte
+        EEPROM_READ_ALWAYS(grid_max_x);                // 1 byte
+        EEPROM_READ_ALWAYS(grid_max_y);                // 1 byte
         #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
           if (grid_max_x == GRID_MAX_POINTS_X && grid_max_y == GRID_MAX_POINTS_Y) {
             if (!validating) set_bed_leveling_enabled(false);
@@ -1583,7 +1566,7 @@ void MarlinSettings::postprocess() {
             xy_pos_t bgs, bs;
             EEPROM_READ(bgs);
             EEPROM_READ(bs);
-            for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummy);
+            for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummyf);
           }
       }
 
@@ -1592,16 +1575,15 @@ void MarlinSettings::postprocess() {
       //
       {
         _FIELD_TEST(planner_leveling_active);
-
         #if ENABLED(AUTO_BED_LEVELING_UBL)
-          EEPROM_READ(planner.leveling_active);
-          EEPROM_READ(ubl.storage_slot);
+          const bool &planner_leveling_active = planner.leveling_active;
+          const int8_t &ubl_storage_slot = ubl.storage_slot;
         #else
           bool planner_leveling_active;
-          uint8_t ubl_storage_slot;
-          EEPROM_READ(planner_leveling_active);
-          EEPROM_READ(ubl_storage_slot);
+          int8_t ubl_storage_slot;
         #endif
+        EEPROM_READ(planner_leveling_active);
+        EEPROM_READ(ubl_storage_slot);
       }
 
       //
@@ -1609,7 +1591,6 @@ void MarlinSettings::postprocess() {
       //
       {
         _FIELD_TEST(servo_angles);
-
         #if ENABLED(EDITABLE_SERVO_ANGLES)
           uint16_t (&servo_angles_arr)[EEPROM_NUM_SERVOS][2] = servo_angles;
         #else
@@ -1664,30 +1645,19 @@ void MarlinSettings::postprocess() {
 
           _FIELD_TEST(x2_endstop_adj);
 
-          #if ENABLED(X_DUAL_ENDSTOPS)
-            EEPROM_READ(endstops.x2_endstop_adj);  // 1 float
-          #else
-            EEPROM_READ(dummy);
-          #endif
-          #if ENABLED(Y_DUAL_ENDSTOPS)
-            EEPROM_READ(endstops.y2_endstop_adj);  // 1 float
-          #else
-            EEPROM_READ(dummy);
-          #endif
-          #if ENABLED(Z_MULTI_ENDSTOPS)
-            EEPROM_READ(endstops.z2_endstop_adj); // 1 float
-          #else
-            EEPROM_READ(dummy);
-          #endif
+          EEPROM_READ(TERN(X_DUAL_ENDSTOPS, endstops.x2_endstop_adj, dummyf));  // 1 float
+          EEPROM_READ(TERN(Y_DUAL_ENDSTOPS, endstops.y2_endstop_adj, dummyf));  // 1 float
+          EEPROM_READ(TERN(Z_MULTI_ENDSTOPS, endstops.z2_endstop_adj, dummyf)); // 1 float
+
           #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
             EEPROM_READ(endstops.z3_endstop_adj); // 1 float
           #else
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
           #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
             EEPROM_READ(endstops.z4_endstop_adj); // 1 float
           #else
-            EEPROM_READ(dummy);
+            EEPROM_READ(dummyf);
           #endif
 
         #endif
@@ -1727,7 +1697,7 @@ void MarlinSettings::postprocess() {
           PIDCF_t pidcf;
           EEPROM_READ(pidcf);
           #if ENABLED(PIDTEMP)
-            if (!validating && pidcf.Kp != DUMMY_PID_VALUE) {
+            if (!validating && !isnan(pidcf.Kp)) {
               // Scale PID values since EEPROM values are unscaled
               PID_PARAM(Kp, e) = pidcf.Kp;
               PID_PARAM(Ki, e) = scalePID_i(pidcf.Ki);
@@ -1749,11 +1719,11 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(lpq_len);
         #if ENABLED(PID_EXTRUSION_SCALING)
-          EEPROM_READ(thermalManager.lpq_len);
+          const int16_t &lpq_len = thermalManager.lpq_len;
         #else
           int16_t lpq_len;
-          EEPROM_READ(lpq_len);
         #endif
+        EEPROM_READ(lpq_len);
       }
 
       //
@@ -1763,7 +1733,7 @@ void MarlinSettings::postprocess() {
         PID_t pid;
         EEPROM_READ(pid);
         #if ENABLED(PIDTEMPBED)
-          if (!validating && pid.Kp != DUMMY_PID_VALUE) {
+          if (!validating && !isnan(pid.Kp)) {
             // Scale PID values since EEPROM values are unscaled
             thermalManager.temp_bed.pid.Kp = pid.Kp;
             thermalManager.temp_bed.pid.Ki = scalePID_i(pid.Ki);
@@ -1795,18 +1765,30 @@ void MarlinSettings::postprocess() {
         #endif
       }
 
+      //
+      // Controller Fan
+      //
+      {
+        _FIELD_TEST(controllerFan_settings);
+        #if ENABLED(CONTROLLER_FAN_EDITABLE)
+          const controllerFan_settings_t &cfs = controllerFan.settings;
+        #else
+          controllerFan_settings_t cfs = { 0 };
+        #endif
+        EEPROM_READ(cfs);
+      }
+
       //
       // Power-Loss Recovery
       //
       {
         _FIELD_TEST(recovery_enabled);
-
         #if ENABLED(POWER_LOSS_RECOVERY)
-          EEPROM_READ(recovery.enabled);
+          const bool &recovery_enabled = recovery.enabled;
         #else
           bool recovery_enabled;
-          EEPROM_READ(recovery_enabled);
         #endif
+        EEPROM_READ(recovery_enabled);
       }
 
       //
@@ -1862,7 +1844,7 @@ void MarlinSettings::postprocess() {
         tmc_stepper_current_t currents;
         EEPROM_READ(currents);
 
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
 
           #define SET_CURR(Q) stepper##Q.rms_current(currents.Q ? currents.Q : Q##_CURRENT)
           if (!validating) {
@@ -2034,7 +2016,7 @@ void MarlinSettings::postprocess() {
         tmc_stealth_enabled_t tmc_stealth_enabled;
         EEPROM_READ(tmc_stealth_enabled);
 
-        #if HAS_TRINAMIC
+        #if HAS_TRINAMIC_CONFIG
 
           #define SET_STEPPING_MODE(ST) stepper##ST.stored.stealthChop_enabled = tmc_stealth_enabled.ST; stepper##ST.refresh_stepping_mode();
           if (!validating) {
@@ -2204,6 +2186,14 @@ void MarlinSettings::postprocess() {
         }
       #endif
 
+      //
+      // Case Light Brightness
+      //
+      #if HAS_CASE_LIGHT_BRIGHTNESS
+        _FIELD_TEST(case_light_brightness);
+        EEPROM_READ(case_light_brightness);
+      #endif
+
       eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET));
       if (eeprom_error) {
         DEBUG_ECHO_START();
@@ -2262,8 +2252,10 @@ void MarlinSettings::postprocess() {
     }
 
     #if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
-      if (!validating) report();
+      // Report the EEPROM settings
+      if (!validating && (DISABLED(EEPROM_BOOT_SILENT) || IsRunning())) report();
     #endif
+
     EEPROM_FINISH();
 
     return !eeprom_error;
@@ -2497,6 +2489,14 @@ void MarlinSettings::reset() {
     ExtUI::onFactoryReset();
   #endif
 
+  //
+  // Case Light Brightness
+  //
+
+  #if HAS_CASE_LIGHT_BRIGHTNESS
+    case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS;
+  #endif
+
   //
   // Magnetic Parking Extruder
   //
@@ -2665,12 +2665,19 @@ void MarlinSettings::reset() {
     ui.set_contrast(DEFAULT_LCD_CONTRAST);
   #endif
 
+  //
+  // Controller Fan
+  //
+  #if ENABLED(USE_CONTROLLER_FAN)
+    controllerFan.reset();
+  #endif
+
   //
   // Power-Loss Recovery
   //
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    recovery.enable(true);
+    recovery.enable(ENABLED(PLR_ENABLED_DEFAULT));
   #endif
 
   //
@@ -2717,7 +2724,7 @@ void MarlinSettings::reset() {
     LOOP_L_N(i, EXTRUDERS) {
       planner.extruder_advance_K[i] = LIN_ADVANCE_K;
       #if ENABLED(EXTRA_LIN_ADVANCE_K)
-        saved_extruder_advance_K[i] = LIN_ADVANCE_K;
+        other_extruder_advance_K[i] = LIN_ADVANCE_K;
       #endif
     }
   #endif
@@ -2728,7 +2735,7 @@ void MarlinSettings::reset() {
 
   #if HAS_MOTOR_CURRENT_PWM
     constexpr uint32_t tmp_motor_current_setting[3] = PWM_MOTOR_CURRENT;
-    for (uint8_t q = 3; q--;)
+    LOOP_L_N(q, 3)
       stepper.digipot_current(q, (stepper.motor_current_setting[q] = tmp_motor_current_setting[q]));
   #endif
 
@@ -2788,7 +2795,7 @@ void MarlinSettings::reset() {
   #define CONFIG_ECHO_MSG(STR)      do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); }while(0)
   #define CONFIG_ECHO_HEADING(STR)  config_heading(forReplay, PSTR(STR))
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     inline void say_M906(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M906"); }
     #if HAS_STEALTHCHOP
       void say_M569(const bool forReplay, const char * const etc=nullptr, const bool newLine = false) {
@@ -2992,7 +2999,7 @@ void MarlinSettings::reset() {
     #if HAS_HOTEND_OFFSET
       CONFIG_ECHO_HEADING("Hotend offsets:");
       CONFIG_ECHO_START();
-      for (uint8_t e = 1; e < HOTENDS; e++) {
+      LOOP_S_L_N(e, 1, HOTENDS) {
         SERIAL_ECHOPAIR_P(
           PSTR("  M218 T"), (int)e,
           SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
@@ -3229,6 +3236,10 @@ void MarlinSettings::reset() {
       SERIAL_ECHOLNPAIR("  M250 C", ui.contrast);
     #endif
 
+    #if ENABLED(CONTROLLER_FAN_EDITABLE)
+      M710_report(forReplay);
+    #endif
+
     #if ENABLED(POWER_LOSS_RECOVERY)
       CONFIG_ECHO_HEADING("Power-Loss Recovery:");
       CONFIG_ECHO_START();
@@ -3298,7 +3309,7 @@ void MarlinSettings::reset() {
       #endif
     #endif
 
-    #if HAS_TRINAMIC
+    #if HAS_TRINAMIC_CONFIG
 
       /**
        * TMC stepper driver current
@@ -3599,7 +3610,7 @@ void MarlinSettings::reset() {
 
       #endif // HAS_STEALTHCHOP
 
-    #endif // HAS_TRINAMIC
+    #endif // HAS_TRINAMIC_CONFIG
 
     /**
      * Linear Advance
diff --git a/Marlin/src/module/configuration_store.h b/Marlin/src/module/configuration_store.h
index a2c8d97dfad1..f2e84c96649b 100644
--- a/Marlin/src/module/configuration_store.h
+++ b/Marlin/src/module/configuration_store.h
@@ -24,7 +24,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../HAL/shared/persistent_store_api.h"
+  #include "../HAL/shared/eeprom_api.h"
 #endif
 
 class MarlinSettings {
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 58de4a8d05f9..1c8384cc53d4 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -481,7 +481,7 @@ void _O2 Endstops::report_states() {
       print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
     #else
       #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
-      for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
+      LOOP_S_LE_N(i, 1, NUM_RUNOUT_SENSORS) {
         pin_t pin;
         switch (i) {
           default: continue;
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 9f6cbf1b387b..1cc0a04712ad 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -55,6 +55,10 @@
   #include "../lcd/ultralcd.h"
 #endif
 
+#if HAS_FILAMENT_SENSOR
+  #include "../feature/runout.h"
+#endif
+
 #if ENABLED(SENSORLESS_HOMING)
   #include "../feature/tmc_util.h"
 #endif
@@ -104,7 +108,7 @@ xyze_pos_t current_position = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
 /**
  * Cartesian Destination
  *   The destination for a move, filled in by G-code movement commands,
- *   and expected by functions like 'prepare_move_to_destination'.
+ *   and expected by functions like 'prepare_line_to_destination'.
  *   G-codes can set destination using 'get_destination_from_command'
  */
 xyze_pos_t destination; // {0}
@@ -206,17 +210,56 @@ xyz_pos_t cartes;
 /**
  * Output the current position to serial
  */
-void report_current_position() {
-  const xyz_pos_t lpos = current_position.asLogical();
-  SERIAL_ECHOPAIR("X:", lpos.x, " Y:", lpos.y, " Z:", lpos.z, " E:", current_position.e);
 
+inline void report_more_positions() {
   stepper.report_positions();
-
   #if IS_SCARA
     scara_report_positions();
   #endif
 }
 
+// Report the logical position for a given machine position
+inline void report_logical_position(const xyze_pos_t &rpos) {
+  const xyze_pos_t lpos = rpos.asLogical();
+  SERIAL_ECHOPAIR_P(X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z, SP_E_LBL, lpos.e);
+}
+
+// Report the real current position according to the steppers.
+// Forward kinematics and un-leveling are applied.
+void report_real_position() {
+  get_cartesian_from_steppers();
+  xyze_pos_t npos = cartes;
+  npos.e = planner.get_axis_position_mm(E_AXIS);
+
+  #if HAS_POSITION_MODIFIERS
+    planner.unapply_modifiers(npos
+      #if HAS_LEVELING
+        , true
+      #endif
+    );
+  #endif
+
+  report_logical_position(npos);
+  report_more_positions();
+}
+
+// Report the logical current position according to the most recent G-code command
+void report_current_position() {
+  report_logical_position(current_position);
+  report_more_positions();
+}
+
+/**
+ * Report the logical current position according to the most recent G-code command.
+ * The planner.position always corresponds to the last G-code too. This makes M114
+ * suitable for debugging kinematics and leveling while avoiding planner sync that
+ * definitively interrupts the printing flow.
+ */
+void report_current_position_projected() {
+  report_logical_position(current_position);
+  stepper.report_a_position(planner.position);
+}
+
 /**
  * sync_plan_position
  *
@@ -241,11 +284,7 @@ void sync_plan_position_e() { planner.set_e_position_mm(current_position.e); }
  */
 void get_cartesian_from_steppers() {
   #if ENABLED(DELTA)
-    forward_kinematics_DELTA(
-      planner.get_axis_position_mm(A_AXIS),
-      planner.get_axis_position_mm(B_AXIS),
-      planner.get_axis_position_mm(C_AXIS)
-    );
+    forward_kinematics_DELTA(planner.get_axis_positions_mm());
   #else
     #if IS_SCARA
       forward_kinematics_SCARA(
@@ -272,20 +311,21 @@ void get_cartesian_from_steppers() {
  */
 void set_current_from_steppers_for_axis(const AxisEnum axis) {
   get_cartesian_from_steppers();
+  xyze_pos_t pos = cartes;
+  pos.e = planner.get_axis_position_mm(E_AXIS);
 
   #if HAS_POSITION_MODIFIERS
-    xyze_pos_t pos = { cartes.x, cartes.y, cartes.z, current_position.e };
     planner.unapply_modifiers(pos
       #if HAS_LEVELING
         , true
       #endif
     );
-    const xyze_pos_t &cartes = pos;
   #endif
+
   if (axis == ALL_AXES)
-    current_position = cartes;
+    current_position = pos;
   else
-    current_position[axis] = cartes[axis];
+    current_position[axis] = pos[axis];
 }
 
 /**
@@ -296,6 +336,17 @@ void line_to_current_position(const feedRate_t &fr_mm_s/*=feedrate_mm_s*/) {
   planner.buffer_line(current_position, fr_mm_s, active_extruder);
 }
 
+#if EXTRUDERS
+  void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s) {
+    #if HAS_FILAMENT_SENSOR
+      runout.reset();
+    #endif
+    current_position.e += length / planner.e_factor[active_extruder];
+    line_to_current_position(fr_mm_s);
+    planner.synchronize();
+  }
+#endif
+
 #if IS_KINEMATIC
 
   /**
@@ -339,7 +390,7 @@ void _internal_move_to_destination(const feedRate_t &fr_mm_s/*=0.0f*/
       prepare_fast_move_to_destination();
     else
   #endif
-      prepare_move_to_destination();
+      prepare_line_to_destination();
 
   feedrate_mm_s = old_feedrate;
   feedrate_percentage = old_pct;
@@ -587,7 +638,7 @@ void restore_feedrate_and_scaling() {
     #endif
 
   if (DEBUGGING(LEVELING))
-    SERIAL_ECHOLNPAIR("Axis ", axis_codes[axis], " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
+    SERIAL_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
 }
 
   /**
@@ -621,7 +672,7 @@ void restore_feedrate_and_scaling() {
       ) {
         const float dist_2 = HYPOT2(target.x - offs.x, target.y - offs.y);
         if (dist_2 > delta_max_radius_2)
-          target *= delta_max_radius / SQRT(dist_2); // 200 / 300 = 0.66
+          target *= float(delta_max_radius / SQRT(dist_2)); // 200 / 300 = 0.66
       }
 
     #else
@@ -659,6 +710,16 @@ void restore_feedrate_and_scaling() {
 #endif // HAS_SOFTWARE_ENDSTOPS
 
 #if !UBL_SEGMENTED
+
+FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
+  const millis_t ms = millis();
+  if (ELAPSED(ms, next_idle_ms)) {
+    next_idle_ms = ms + 200UL;
+    return idle();
+  }
+  thermalManager.manage_heater();  // Returns immediately on most calls
+}
+
 #if IS_KINEMATIC
 
   #if IS_SCARA
@@ -678,7 +739,7 @@ void restore_feedrate_and_scaling() {
   /**
    * Prepare a linear move in a DELTA or SCARA setup.
    *
-   * Called from prepare_move_to_destination as the
+   * Called from prepare_line_to_destination as the
    * default Delta/SCARA segmenter.
    *
    * This calls planner.buffer_line several times, adding
@@ -751,17 +812,10 @@ void restore_feedrate_and_scaling() {
     xyze_pos_t raw = current_position;
 
     // Calculate and execute the segments
+    millis_t next_idle_ms = millis() + 200UL;
     while (--segments) {
-
-      static millis_t next_idle_ms = millis() + 200UL;
-      thermalManager.manage_heater();  // This returns immediately if not really needed.
-      if (ELAPSED(millis(), next_idle_ms)) {
-        next_idle_ms = millis() + 200UL;
-        idle();
-      }
-
+      segment_idle(next_idle_ms);
       raw += segment_distance;
-
       if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, cartesian_segment_mm
         #if ENABLED(SCARA_FEEDRATE_SCALING)
           , inv_duration
@@ -830,13 +884,9 @@ void restore_feedrate_and_scaling() {
       xyze_pos_t raw = current_position;
 
       // Calculate and execute the segments
+      millis_t next_idle_ms = millis() + 200UL;
       while (--segments) {
-        static millis_t next_idle_ms = millis() + 200UL;
-        thermalManager.manage_heater();  // This returns immediately if not really needed.
-        if (ELAPSED(millis(), next_idle_ms)) {
-          next_idle_ms = millis() + 200UL;
-          idle();
-        }
+        segment_idle(next_idle_ms);
         raw += segment_distance;
         if (!planner.buffer_line(raw, fr_mm_s, active_extruder, cartesian_segment_mm
           #if ENABLED(SCARA_FEEDRATE_SCALING)
@@ -865,7 +915,7 @@ void restore_feedrate_and_scaling() {
    *
    * Return true if 'current_position' was set to 'destination'
    */
-  inline bool prepare_move_to_destination_cartesian() {
+  inline bool line_to_destination_cartesian() {
     const float scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
     #if HAS_MESH
       if (planner.leveling_active && planner.leveling_active_at_z(destination.z)) {
@@ -1008,7 +1058,7 @@ void restore_feedrate_and_scaling() {
  *
  * Before exit, current_position is set to destination.
  */
-void prepare_move_to_destination() {
+void prepare_line_to_destination() {
   apply_motion_limits(destination);
 
   #if EITHER(PREVENT_COLD_EXTRUSION, PREVENT_LENGTHY_EXTRUDE)
@@ -1058,12 +1108,12 @@ void prepare_move_to_destination() {
       #if IS_KINEMATIC // UBL using Kinematic / Cartesian cases as a workaround for now.
         ubl.line_to_destination_segmented(MMS_SCALED(feedrate_mm_s))
       #else
-        prepare_move_to_destination_cartesian()
+        line_to_destination_cartesian()
       #endif
     #elif IS_KINEMATIC
       line_to_destination_kinematic()
     #else
-      prepare_move_to_destination_cartesian()
+      line_to_destination_cartesian()
     #endif
   ) return;
 
@@ -1176,15 +1226,9 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
 
     #if ENABLED(SPI_ENDSTOPS)
       switch (axis) {
-        #if X_SPI_SENSORLESS
-          case X_AXIS: endstops.tmc_spi_homing.x = true; break;
-        #endif
-        #if Y_SPI_SENSORLESS
-          case Y_AXIS: endstops.tmc_spi_homing.y = true; break;
-        #endif
-        #if Z_SPI_SENSORLESS
-          case Z_AXIS: endstops.tmc_spi_homing.z = true; break;
-        #endif
+        case X_AXIS: if (ENABLED(X_SPI_SENSORLESS)) endstops.tmc_spi_homing.x = true; break;
+        case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = true; break;
+        case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = true; break;
         default: break;
       }
     #endif
@@ -1248,15 +1292,9 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
 
     #if ENABLED(SPI_ENDSTOPS)
       switch (axis) {
-        #if X_SPI_SENSORLESS
-          case X_AXIS: endstops.tmc_spi_homing.x = false; break;
-        #endif
-        #if Y_SPI_SENSORLESS
-          case Y_AXIS: endstops.tmc_spi_homing.y = false; break;
-        #endif
-        #if Z_SPI_SENSORLESS
-          case Z_AXIS: endstops.tmc_spi_homing.z = false; break;
-        #endif
+        case X_AXIS: if (ENABLED(X_SPI_SENSORLESS)) endstops.tmc_spi_homing.x = false; break;
+        case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = false; break;
+        case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = false; break;
         default: break;
       }
     #endif
@@ -1269,27 +1307,21 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
  */
 void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t fr_mm_s=0.0) {
 
+  const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
+
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOPAIR(">>> do_homing_move(", axis_codes[axis], ", ", distance, ", ");
     if (fr_mm_s)
       DEBUG_ECHO(fr_mm_s);
     else
-      DEBUG_ECHOPAIR("[", homing_feedrate(axis), "]");
+      DEBUG_ECHOPAIR("[", real_fr_mm_s, "]");
     DEBUG_ECHOLNPGM(")");
   }
 
   #if HOMING_Z_WITH_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
     // Wait for bed to heat back up between probing points
-    if (axis == Z_AXIS && distance < 0 && thermalManager.isHeatingBed()) {
-      serialprintPGM(probe.msg_wait_for_bed_heating);
-      #if HAS_DISPLAY
-        LCD_MESSAGEPGM(MSG_BED_HEATING);
-      #endif
-      thermalManager.wait_for_bed();
-      #if HAS_DISPLAY
-        ui.reset_status();
-      #endif
-    }
+    if (axis == Z_AXIS && distance < 0)
+      thermalManager.wait_for_bed_heating();
   #endif
 
   // Only do some things when moving towards an endstop
@@ -1316,7 +1348,6 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
     #endif
   }
 
-  const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
   #if IS_SCARA
     // Tell the planner the axis is at 0
     current_position[axis] = 0;
@@ -1324,19 +1355,19 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
     current_position[axis] = distance;
     line_to_current_position(real_fr_mm_s);
   #else
-    abce_pos_t target = { planner.get_axis_position_mm(A_AXIS), planner.get_axis_position_mm(B_AXIS), planner.get_axis_position_mm(C_AXIS), planner.get_axis_position_mm(E_AXIS) };
+    abce_pos_t target = planner.get_axis_positions_mm();
     target[axis] = 0;
     planner.set_machine_position_mm(target);
     target[axis] = distance;
 
-    #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-      const xyze_float_t delta_mm_cart{0};
+    #if HAS_DIST_MM_ARG
+      const xyze_float_t cart_dist_mm{0};
     #endif
 
     // Set delta/cartesian axes directly
     planner.buffer_segment(target
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , cart_dist_mm
       #endif
       , real_fr_mm_s, active_extruder
     );
@@ -1448,13 +1479,13 @@ void set_axis_is_at_home(const AxisEnum axis) {
 /**
  * Set an axis' to be unhomed.
  */
-void set_axis_is_not_at_home(const AxisEnum axis) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_is_not_at_home(", axis_codes[axis], ")");
+void set_axis_not_trusted(const AxisEnum axis) {
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_not_trusted(", axis_codes[axis], ")");
 
   CBI(axis_known_position, axis);
   CBI(axis_homed, axis);
 
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_is_not_at_home(", axis_codes[axis], ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_not_trusted(", axis_codes[axis], ")");
 
   #if ENABLED(I2C_POSITION_ENCODERS)
     I2CPEM.unhomed(axis);
@@ -1764,6 +1795,13 @@ void homeaxis(const AxisEnum axis) {
         #endif
         homing_feedrate(axis)
       );
+
+      #if ENABLED(SENSORLESS_HOMING)
+        planner.synchronize();
+        #if IS_CORE
+          if (axis != NORMAL_AXIS) safe_delay(200);  // Short delay to allow belts to spring back
+        #endif
+      #endif
     }
   #endif
 
@@ -1779,7 +1817,7 @@ void homeaxis(const AxisEnum axis) {
 #if HAS_WORKSPACE_OFFSET
   void update_workspace_offset(const AxisEnum axis) {
     workspace_offset[axis] = home_offset[axis] + position_shift[axis];
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", axis_codes[axis], " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", XYZ_CHAR(axis), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
   }
 #endif
 
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index c50da25a3e27..e504f187f9e1 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -30,10 +30,6 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if HAS_BED_PROBE
-  #include "probe.h"
-#endif
-
 #if IS_SCARA
   #include "scara.h"
 #endif
@@ -58,7 +54,7 @@ FORCE_INLINE bool homing_needed() {
 }
 
 // Error margin to work around float imprecision
-constexpr float slop = 0.0001;
+constexpr float fslop = 0.0001;
 
 extern bool relative_mode;
 
@@ -166,7 +162,9 @@ typedef struct { xyz_pos_t min, max; } axis_limits_t;
   #define update_software_endstops(...) NOOP
 #endif
 
+void report_real_position();
 void report_current_position();
+void report_current_position_projected();
 
 void get_cartesian_from_steppers();
 void set_current_from_steppers_for_axis(const AxisEnum axis);
@@ -186,7 +184,11 @@ void sync_plan_position_e();
  */
 void line_to_current_position(const feedRate_t &fr_mm_s=feedrate_mm_s);
 
-void prepare_move_to_destination();
+#if EXTRUDERS
+  void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s);
+#endif
+
+void prepare_line_to_destination();
 
 void _internal_move_to_destination(const feedRate_t &fr_mm_s=0.0f
   #if IS_KINEMATIC
@@ -246,7 +248,7 @@ bool axis_unhomed_error(uint8_t axis_bits=0x07);
 
 void set_axis_is_at_home(const AxisEnum axis);
 
-void set_axis_is_not_at_home(const AxisEnum axis);
+void set_axis_not_trusted(const AxisEnum axis);
 
 void homeaxis(const AxisEnum axis);
 
@@ -306,7 +308,7 @@ void homeaxis(const AxisEnum axis);
   // Return true if the given point is within the printable area
   inline bool position_is_reachable(const float &rx, const float &ry, const float inset=0) {
     #if ENABLED(DELTA)
-      return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + slop);
+      return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + fslop);
     #elif IS_SCARA
       const float R2 = HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y);
       return (
@@ -322,67 +324,24 @@ void homeaxis(const AxisEnum axis);
     return position_is_reachable(pos.x, pos.y, inset);
   }
 
-  #if HAS_BED_PROBE
-
-    #if HAS_PROBE_XY_OFFSET
-
-      // Return true if the both nozzle and the probe can reach the given point.
-      // Note: This won't work on SCARA since the probe offset rotates with the arm.
-      inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-        return position_is_reachable(rx - probe.offset_xy.x, ry - probe.offset_xy.y)
-               && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE));
-      }
-
-    #else
-
-      FORCE_INLINE bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-        return position_is_reachable(rx, ry, MIN_PROBE_EDGE);
-      }
-
-    #endif
-
-  #endif // HAS_BED_PROBE
-
 #else // CARTESIAN
 
   // Return true if the given position is within the machine bounds.
   inline bool position_is_reachable(const float &rx, const float &ry) {
-    if (!WITHIN(ry, Y_MIN_POS - slop, Y_MAX_POS + slop)) return false;
+    if (!WITHIN(ry, Y_MIN_POS - fslop, Y_MAX_POS + fslop)) return false;
     #if ENABLED(DUAL_X_CARRIAGE)
       if (active_extruder)
-        return WITHIN(rx, X2_MIN_POS - slop, X2_MAX_POS + slop);
+        return WITHIN(rx, X2_MIN_POS - fslop, X2_MAX_POS + fslop);
       else
-        return WITHIN(rx, X1_MIN_POS - slop, X1_MAX_POS + slop);
+        return WITHIN(rx, X1_MIN_POS - fslop, X1_MAX_POS + fslop);
     #else
-      return WITHIN(rx, X_MIN_POS - slop, X_MAX_POS + slop);
+      return WITHIN(rx, X_MIN_POS - fslop, X_MAX_POS + fslop);
     #endif
   }
   inline bool position_is_reachable(const xy_pos_t &pos) { return position_is_reachable(pos.x, pos.y); }
 
-  #if HAS_BED_PROBE
-
-    /**
-     * Return whether the given position is within the bed, and whether the nozzle
-     * can reach the position required to put the probe at the given position.
-     *
-     * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
-     *          nozzle must be be able to reach +10,-10.
-     */
-    inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
-      return position_is_reachable(rx - probe.offset_xy.x, ry - probe.offset_xy.y)
-          && WITHIN(rx, probe.min_x() - slop, probe.max_x() + slop)
-          && WITHIN(ry, probe.min_y() - slop, probe.max_y() + slop);
-    }
-
-  #endif // HAS_BED_PROBE
-
 #endif // CARTESIAN
 
-#if !HAS_BED_PROBE
-  FORCE_INLINE bool position_is_reachable_by_probe(const float &rx, const float &ry) { return position_is_reachable(rx, ry); }
-#endif
-FORCE_INLINE bool position_is_reachable_by_probe(const xy_pos_t &pos) { return position_is_reachable_by_probe(pos.x, pos.y); }
-
 /**
  * Duplication mode
  */
@@ -420,11 +379,13 @@ FORCE_INLINE bool position_is_reachable_by_probe(const xy_pos_t &pos) { return p
 
   FORCE_INLINE int x_home_dir(const uint8_t extruder) { return extruder ? X2_HOME_DIR : X_HOME_DIR; }
 
-#elif ENABLED(MULTI_NOZZLE_DUPLICATION)
+#else
 
-  enum DualXMode : char {
-    DXC_DUPLICATION_MODE = 2
-  };
+  #if ENABLED(MULTI_NOZZLE_DUPLICATION)
+    enum DualXMode : char { DXC_DUPLICATION_MODE = 2 };
+  #endif
+
+  FORCE_INLINE int x_home_dir(const uint8_t) { return home_dir(X_AXIS); }
 
 #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 2067ecc23f56..e1a050a45924 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -101,7 +101,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if HAS_CUTTER
@@ -1408,7 +1408,7 @@ void Planner::check_axes_activity() {
    * The multiplier converts a given E value into a length.
    */
   void Planner::calculate_volumetric_multipliers() {
-    for (uint8_t i = 0; i < COUNT(filament_size); i++) {
+    LOOP_L_N(i, COUNT(filament_size)) {
       volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
       refresh_e_factor(i);
     }
@@ -1519,10 +1519,6 @@ void Planner::check_axes_activity() {
 
       #endif
     }
-
-    #if ENABLED(SKEW_CORRECTION)
-      unskew(raw);
-    #endif
   }
 
 #endif // HAS_LEVELING
@@ -1648,8 +1644,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
   #if HAS_POSITION_FLOAT
     , const xyze_pos_t &target_float
   #endif
-  #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-    , const xyze_float_t &delta_mm_cart
+  #if HAS_DIST_MM_ARG
+    , const xyze_float_t &cart_dist_mm
   #endif
   , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters
 ) {
@@ -1666,8 +1662,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
     #if HAS_POSITION_FLOAT
       , target_float
     #endif
-    #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-      , delta_mm_cart
+    #if HAS_DIST_MM_ARG
+      , cart_dist_mm
     #endif
     , fr_mm_s, extruder, millimeters
   )) {
@@ -1712,8 +1708,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #if HAS_POSITION_FLOAT
     , const xyze_pos_t &target_float
   #endif
-  #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-    , const xyze_float_t &delta_mm_cart
+  #if HAS_DIST_MM_ARG
+    , const xyze_float_t &cart_dist_mm
   #endif
   , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
 ) {
@@ -1840,51 +1836,51 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
    * So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning the real displacement of the Head.
    * Having the real displacement of the head, we can calculate the total movement length and apply the desired speed.
    */
-  struct DeltaMM : abce_float_t {
+  struct DistanceMM : abce_float_t {
     #if IS_CORE
       xyz_pos_t head;
     #endif
-  } delta_mm;
+  } steps_dist_mm;
   #if IS_CORE
     #if CORE_IS_XY
-      delta_mm.head.x = da * steps_to_mm[A_AXIS];
-      delta_mm.head.y = db * steps_to_mm[B_AXIS];
-      delta_mm.z      = dc * steps_to_mm[Z_AXIS];
-      delta_mm.a      = (da + db) * steps_to_mm[A_AXIS];
-      delta_mm.b      = CORESIGN(da - db) * steps_to_mm[B_AXIS];
+      steps_dist_mm.head.x = da * steps_to_mm[A_AXIS];
+      steps_dist_mm.head.y = db * steps_to_mm[B_AXIS];
+      steps_dist_mm.z      = dc * steps_to_mm[Z_AXIS];
+      steps_dist_mm.a      = (da + db) * steps_to_mm[A_AXIS];
+      steps_dist_mm.b      = CORESIGN(da - db) * steps_to_mm[B_AXIS];
     #elif CORE_IS_XZ
-      delta_mm.head.x = da * steps_to_mm[A_AXIS];
-      delta_mm.y      = db * steps_to_mm[Y_AXIS];
-      delta_mm.head.z = dc * steps_to_mm[C_AXIS];
-      delta_mm.a      = (da + dc) * steps_to_mm[A_AXIS];
-      delta_mm.c      = CORESIGN(da - dc) * steps_to_mm[C_AXIS];
+      steps_dist_mm.head.x = da * steps_to_mm[A_AXIS];
+      steps_dist_mm.y      = db * steps_to_mm[Y_AXIS];
+      steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS];
+      steps_dist_mm.a      = (da + dc) * steps_to_mm[A_AXIS];
+      steps_dist_mm.c      = CORESIGN(da - dc) * steps_to_mm[C_AXIS];
     #elif CORE_IS_YZ
-      delta_mm.x      = da * steps_to_mm[X_AXIS];
-      delta_mm.head.y = db * steps_to_mm[B_AXIS];
-      delta_mm.head.z = dc * steps_to_mm[C_AXIS];
-      delta_mm.b      = (db + dc) * steps_to_mm[B_AXIS];
-      delta_mm.c      = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
+      steps_dist_mm.x      = da * steps_to_mm[X_AXIS];
+      steps_dist_mm.head.y = db * steps_to_mm[B_AXIS];
+      steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS];
+      steps_dist_mm.b      = (db + dc) * steps_to_mm[B_AXIS];
+      steps_dist_mm.c      = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
     #endif
   #else
-    delta_mm.a = da * steps_to_mm[A_AXIS];
-    delta_mm.b = db * steps_to_mm[B_AXIS];
-    delta_mm.c = dc * steps_to_mm[C_AXIS];
+    steps_dist_mm.a = da * steps_to_mm[A_AXIS];
+    steps_dist_mm.b = db * steps_to_mm[B_AXIS];
+    steps_dist_mm.c = dc * steps_to_mm[C_AXIS];
   #endif
 
   #if EXTRUDERS
-    delta_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
+    steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
   #else
-    delta_mm.e = 0.0f;
+    steps_dist_mm.e = 0.0f;
   #endif
 
   #if ENABLED(LCD_SHOW_E_TOTAL)
-    e_move_accumulator += delta_mm.e;
+    e_move_accumulator += steps_dist_mm.e;
   #endif
 
   if (block->steps.a < MIN_STEPS_PER_SEGMENT && block->steps.b < MIN_STEPS_PER_SEGMENT && block->steps.c < MIN_STEPS_PER_SEGMENT) {
     block->millimeters = (0
       #if EXTRUDERS
-        + ABS(delta_mm.e)
+        + ABS(steps_dist_mm.e)
       #endif
     );
   }
@@ -1894,13 +1890,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     else
       block->millimeters = SQRT(
         #if CORE_IS_XY
-          sq(delta_mm.head.x) + sq(delta_mm.head.y) + sq(delta_mm.z)
+          sq(steps_dist_mm.head.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.z)
         #elif CORE_IS_XZ
-          sq(delta_mm.head.x) + sq(delta_mm.y) + sq(delta_mm.head.z)
+          sq(steps_dist_mm.head.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.head.z)
         #elif CORE_IS_YZ
-          sq(delta_mm.x) + sq(delta_mm.head.y) + sq(delta_mm.head.z)
+          sq(steps_dist_mm.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.head.z)
         #else
-          sq(delta_mm.x) + sq(delta_mm.y) + sq(delta_mm.z)
+          sq(steps_dist_mm.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.z)
         #endif
       );
 
@@ -1991,7 +1987,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
       #if ENABLED(DISABLE_INACTIVE_EXTRUDER) // Enable only the selected extruder
 
-        for (uint8_t i = 0; i < EXTRUDERS; i++)
+        LOOP_L_N(i, EXTRUDERS)
           if (g_uc_extruder_last_move[i] > 0) g_uc_extruder_last_move[i]--;
 
         #if HAS_DUPLICATION_MODE
@@ -2041,7 +2037,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif
 
   #if ENABLED(SLOWDOWN)
-    if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / 2 - 1)) {
+    #ifndef SLOWDOWN_DIVISOR
+      #define SLOWDOWN_DIVISOR 2
+    #endif
+    if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / (SLOWDOWN_DIVISOR) - 1)) {
       if (segment_time_us < settings.min_segment_time_us) {
         // buffer is draining, add extra time.  The amount of time added increases if the buffer is still emptied more.
         const uint32_t nst = segment_time_us + LROUND(2 * (settings.min_segment_time_us - segment_time_us) / moves_queued);
@@ -2068,7 +2067,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
     if (extruder == FILAMENT_SENSOR_EXTRUDER_NUM)   // Only for extruder with filament sensor
-      filwidth.advance_e(delta_mm.e);
+      filwidth.advance_e(steps_dist_mm.e);
   #endif
 
   // Calculate and limit speed in mm/sec
@@ -2078,7 +2077,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   // Linear axes first with less logic
   LOOP_XYZ(i) {
-    current_speed[i] = delta_mm[i] * inverse_secs;
+    current_speed[i] = steps_dist_mm[i] * inverse_secs;
     const feedRate_t cs = ABS(current_speed[i]),
                  max_fr = settings.max_feedrate_mm_s[i];
     if (cs > max_fr) NOMORE(speed_factor, max_fr / cs);
@@ -2087,7 +2086,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Limit speed on extruders, if any
   #if EXTRUDERS
     {
-      current_speed.e = delta_mm.e * inverse_secs;
+      current_speed.e = steps_dist_mm.e * inverse_secs;
       #if BOTH(MIXING_EXTRUDER, RETRACT_SYNC_MIXING)
         // Move all mixing extruders at the specified rate
         if (mixer.get_current_vtool() == MIXER_AUTORETRACT_TOOL)
@@ -2305,10 +2304,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     static xyze_float_t prev_unit_vec;
 
     xyze_float_t unit_vec =
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        cart_dist_mm
       #else
-        { delta_mm.x, delta_mm.y, delta_mm.z, delta_mm.e }
+        { steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.e }
       #endif
     ;
     unit_vec *= inverse_millimeters;
@@ -2404,12 +2403,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     #endif
     {
       const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
-                  maxj = (max_jerk[i]             // mj : The max jerk setting for this axis
-                    #ifdef TRAVEL_EXTRA_XYJERK
-                      + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0)
-                    #endif
-                  );
-
+                  maxj = (max_jerk[i] + (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0.0f)); // mj : The max jerk setting for this axis
       if (jerk > maxj) {                          // cs > mj : New current speed too fast?
         if (limited) {                            // limited already?
           const float mjerk = nominal_speed * maxj; // ns*mj
@@ -2461,11 +2455,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
             : // v_exit <= v_entry                coasting             axis reversal
               ( (v_entry < 0 || v_exit > 0) ? (v_entry - v_exit) : _MAX(-v_exit, v_entry) );
 
-        const float maxj = (max_jerk[axis]
-          #ifdef TRAVEL_EXTRA_XYJERK
-            + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
-          #endif
-        );
+        const float maxj = (max_jerk[axis] + (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0.0f));
 
         if (jerk > maxj) {
           v_factor *= maxj / jerk;
@@ -2578,8 +2568,8 @@ void Planner::buffer_sync_block() {
  *  millimeters - the length of the movement, if known
  */
 bool Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e
-  #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-    , const xyze_float_t &delta_mm_cart
+  #if HAS_DIST_MM_ARG
+    , const xyze_float_t &cart_dist_mm
   #endif
   , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
 ) {
@@ -2628,21 +2618,24 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con
       SERIAL_ECHOPAIR("->", target.a);
       SERIAL_ECHOPAIR(") B:", b);
     #else
-      SERIAL_ECHOPAIR(" X:", a);
+      SERIAL_ECHOPAIR_P(SP_X_LBL, a);
       SERIAL_ECHOPAIR(" (", position.x);
       SERIAL_ECHOPAIR("->", target.x);
-      SERIAL_ECHOPAIR(") Y:", b);
+      SERIAL_CHAR(')');
+      SERIAL_ECHOPAIR_P(SP_Y_LBL, b);
     #endif
     SERIAL_ECHOPAIR(" (", position.y);
     SERIAL_ECHOPAIR("->", target.y);
     #if ENABLED(DELTA)
       SERIAL_ECHOPAIR(") C:", c);
     #else
-      SERIAL_ECHOPAIR(") Z:", c);
+      SERIAL_CHAR(')');
+      SERIAL_ECHOPAIR_P(SP_Z_LBL, c);
     #endif
     SERIAL_ECHOPAIR(" (", position.z);
     SERIAL_ECHOPAIR("->", target.z);
-    SERIAL_ECHOPAIR(") E:", e);
+    SERIAL_CHAR(')');
+    SERIAL_ECHOPAIR_P(SP_E_LBL, e);
     SERIAL_ECHOPAIR(" (", position.e);
     SERIAL_ECHOPAIR("->", target.e);
     SERIAL_ECHOLNPGM(")");
@@ -2654,8 +2647,8 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con
       #if HAS_POSITION_FLOAT
         , target_float
       #endif
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , cart_dist_mm
       #endif
       , fr_mm_s, extruder, millimeters
     )
@@ -2689,17 +2682,17 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
   #if IS_KINEMATIC
 
     #if DISABLED(CLASSIC_JERK)
-      const xyze_pos_t delta_mm_cart = {
+      const xyze_pos_t cart_dist_mm = {
         rx - position_cart.x, ry - position_cart.y,
         rz - position_cart.z, e  - position_cart.e
       };
     #else
-      const xyz_pos_t delta_mm_cart = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z };
+      const xyz_pos_t cart_dist_mm = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z };
     #endif
 
     float mm = millimeters;
     if (mm == 0.0)
-      mm = (delta_mm_cart.x != 0.0 || delta_mm_cart.y != 0.0) ? delta_mm_cart.magnitude() : ABS(delta_mm_cart.z);
+      mm = (cart_dist_mm.x != 0.0 || cart_dist_mm.y != 0.0) ? cart_dist_mm.magnitude() : ABS(cart_dist_mm.z);
 
     // Cartesian XYZ to kinematic ABC, stored in global 'delta'
     inverse_kinematics(machine);
@@ -2715,7 +2708,7 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
     #endif
     if (buffer_segment(delta.a, delta.b, delta.c, machine.e
       #if DISABLED(CLASSIC_JERK)
-        , delta_mm_cart
+        , cart_dist_mm
       #endif
       , feedrate, extruder, mm
     )) {
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 6942ec602876..24c02c01c5c6 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -61,6 +61,10 @@
                             manual_feedrate_mm_s { _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f, _mf.e / 60.0f };
 #endif
 
+#if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
+  #define HAS_DIST_MM_ARG 1
+#endif
+
 enum BlockFlagBit : char {
   // Recalculate trapezoids on entry junction. For optimization.
   BLOCK_BIT_RECALCULATE,
@@ -289,6 +293,12 @@ class Planner {
       static float extruder_advance_K[EXTRUDERS];
     #endif
 
+    /**
+     * The current position of the tool in absolute steps
+     * Recalculated if any axis_steps_per_mm are changed by gcode
+     */
+    static xyze_long_t position;
+
     #if HAS_POSITION_FLOAT
       static xyze_pos_t position_float;
     #endif
@@ -305,12 +315,6 @@ class Planner {
 
   private:
 
-    /**
-     * The current position of the tool in absolute steps
-     * Recalculated if any axis_steps_per_mm are changed by gcode
-     */
-    static xyze_long_t position;
-
     /**
      * Speed of previous path line segment
      */
@@ -403,7 +407,7 @@ class Planner {
       FORCE_INLINE static void set_filament_size(const uint8_t e, const float &v) {
         filament_size[e] = v;
         // make sure all extruders have some sane value for the filament size
-        for (uint8_t i = 0; i < COUNT(filament_size); i++)
+        LOOP_L_N(i, COUNT(filament_size))
           if (!filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
       }
 
@@ -588,8 +592,8 @@ class Planner {
       #if HAS_POSITION_FLOAT
         , const xyze_pos_t &target_float
       #endif
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     );
@@ -611,8 +615,8 @@ class Planner {
       #if HAS_POSITION_FLOAT
         , const xyze_pos_t &target_float
       #endif
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     );
@@ -643,21 +647,21 @@ class Planner {
      *  millimeters - the length of the movement, if known
      */
     static bool buffer_segment(const float &a, const float &b, const float &c, const float &e
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     );
 
     FORCE_INLINE static bool buffer_segment(abce_pos_t &abce
-      #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-        , const xyze_float_t &delta_mm_cart
+      #if HAS_DIST_MM_ARG
+        , const xyze_float_t &cart_dist_mm
       #endif
       , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
     ) {
       return buffer_segment(abce.a, abce.b, abce.c, abce.e
-        #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
-          , delta_mm_cart
+        #if HAS_DIST_MM_ARG
+          , cart_dist_mm
         #endif
         , fr_mm_s, extruder, millimeters);
     }
@@ -725,6 +729,16 @@ class Planner {
      */
     static float get_axis_position_mm(const AxisEnum axis);
 
+    static inline abce_pos_t get_axis_positions_mm() {
+      const abce_pos_t out = {
+        get_axis_position_mm(A_AXIS),
+        get_axis_position_mm(B_AXIS),
+        get_axis_position_mm(C_AXIS),
+        get_axis_position_mm(E_AXIS)
+      };
+      return out;
+    }
+
     // SCARA AB axes are in degrees, not mm
     #if IS_SCARA
       FORCE_INLINE static float get_axis_position_degrees(const AxisEnum axis) { return get_axis_position_mm(axis); }
@@ -797,7 +811,7 @@ class Planner {
       FORCE_INLINE static void recalculate_max_e_jerk() {
         #define GET_MAX_E_JERK(N) SQRT(SQRT(0.5) * junction_deviation_mm * (N) * RECIPROCAL(1.0 - SQRT(0.5)))
         #if ENABLED(DISTINCT_E_FACTORS)
-          for (uint8_t i = 0; i < EXTRUDERS; i++)
+          LOOP_L_N(i, EXTRUDERS)
             max_e_jerk[i] = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS_N(i)]);
         #else
           max_e_jerk = GET_MAX_E_JERK(settings.max_acceleration_mm_per_s2[E_AXIS]);
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 3fa09c8834ec..3623c88a13de 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -30,12 +30,12 @@ Stopwatch print_job_timer;      // Global Print Job Timer instance
 #else // PRINTCOUNTER
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #include "printcounter.h"
 #include "../MarlinCore.h"
-#include "../HAL/shared/persistent_store_api.h"
+#include "../HAL/shared/eeprom_api.h"
 
 #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0
   #include "../libs/buzzer.h"
diff --git a/Marlin/src/module/printcounter.h b/Marlin/src/module/printcounter.h
index 1630de988dde..39a237cc4451 100644
--- a/Marlin/src/module/printcounter.h
+++ b/Marlin/src/module/printcounter.h
@@ -28,7 +28,7 @@
 // Print debug messages with M111 S2
 //#define DEBUG_PRINTCOUNTER
 
-#if EITHER(I2C_EEPROM, SPI_EEPROM)
+#if USE_WIRED_EEPROM
   // round up address to next page boundary (assuming 32 byte pages)
   #define STATS_EEPROM_ADDRESS 0x40
 #else
@@ -57,7 +57,7 @@ class PrintCounter: public Stopwatch {
   private:
     typedef Stopwatch super;
 
-    #if EITHER(I2C_EEPROM, SPI_EEPROM) || defined(CPU_32_BIT)
+    #if USE_WIRED_EEPROM || defined(CPU_32_BIT)
       typedef uint32_t eeprom_address_t;
     #else
       typedef uint16_t eeprom_address_t;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 858dcae747ac..6e3f2baa6692 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -78,7 +78,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
@@ -89,7 +89,7 @@ Probe probe;
 xyz_pos_t Probe::offset; // Initialized by settings.load()
 
 #if HAS_PROBE_XY_OFFSET
-  const xyz_pos_t &Probe::offset_xy = probe.offset;
+  const xyz_pos_t &Probe::offset_xy = Probe::offset;
 #endif
 
 #if ENABLED(Z_PROBE_SLED)
@@ -134,12 +134,10 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
       LCD_MESSAGEPGM(MSG_MANUAL_DEPLOY_TOUCHMI);
       ui.return_to_status();
 
-      KEEPALIVE_STATE(PAUSED_FOR_USER);
-      wait_for_user = true; // LCD click or M108 will clear this
       #if ENABLED(HOST_PROMPT_SUPPORT)
-        host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI probe."), CONTINUE_STR);
+        host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR);
       #endif
-      while (wait_for_user) idle();
+      wait_for_user_response();
       ui.reset_status();
       ui.goto_screen(prev_screen);
 
@@ -297,15 +295,13 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       serialprintPGM(ds_str);
       SERIAL_EOL();
 
-      KEEPALIVE_STATE(PAUSED_FOR_USER);
-      wait_for_user = true;
       #if ENABLED(HOST_PROMPT_SUPPORT)
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR);
       #endif
       #if ENABLED(EXTENSIBLE_UI)
         ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe"));
       #endif
-      while (wait_for_user) idle();
+      wait_for_user_response();
       ui.reset_status();
 
     } while(
@@ -455,10 +451,6 @@ bool Probe::set_deployed(const bool deploy) {
  * @return true to indicate an error
  */
 
-#if HAS_BED_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-  const char Probe::msg_wait_for_bed_heating[25] PROGMEM = "Wait for bed heating...\n";
-#endif
-
 /**
  * @brief Move down until the probe triggers or the low limit is reached
  *
@@ -473,13 +465,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
   if (DEBUGGING(LEVELING)) DEBUG_POS(">>> Probe::probe_down_to_z", current_position);
 
   #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-    // Wait for bed to heat back up between probing points
-    if (thermalManager.isHeatingBed()) {
-      serialprintPGM(msg_wait_for_bed_heating);
-      LCD_MESSAGEPGM(MSG_BED_HEATING);
-      thermalManager.wait_for_bed();
-      ui.reset_status();
-    }
+    thermalManager.wait_for_bed_heating();
   #endif
 
   #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
@@ -634,7 +620,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
       #if EXTRA_PROBING
         // Insert Z measurement into probes[]. Keep it sorted ascending.
-        for (uint8_t i = 0; i <= p; i++) {                            // Iterate the saved Zs to insert the new Z
+        LOOP_LE_N(i, p) {                            // Iterate the saved Zs to insert the new Z
           if (i == p || probes[i] > z) {                              // Last index or new Z is smaller than this Z
             for (int8_t m = p; --m >= i;) probes[m + 1] = probes[m];  // Shift items down after the insertion point
             probes[i] = z;                                            // Insert the new Z measurement
@@ -672,7 +658,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
           max_avg_idx--; else min_avg_idx++;
 
       // Return the average value of all remaining probes.
-      for (uint8_t i = min_avg_idx; i <= max_avg_idx; i++)
+      LOOP_S_LE_N(i, min_avg_idx, max_avg_idx)
         probes_z_sum += probes[i];
 
     #endif
@@ -727,7 +713,7 @@ float Probe::probe_at_point(const float &rx, const float &ry, const ProbePtRaise
   // TODO: Adapt for SCARA, where the offset rotates
   xyz_pos_t npos = { rx, ry };
   if (probe_relative) {                                     // The given position is in terms of the probe
-    if (!position_is_reachable_by_probe(npos)) {
+    if (!can_reach(npos)) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
       return NAN;
     }
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 6f17090e69c0..083867ab48f9 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -27,6 +27,8 @@
 
 #include "../inc/MarlinConfig.h"
 
+#include "motion.h"
+
 #if HAS_BED_PROBE
   enum ProbePtRaise : uint8_t {
     PROBE_PT_NONE,      // No raise or stow after run_z_probe
@@ -45,16 +47,46 @@ class Probe {
 
     static bool set_deployed(const bool deploy);
 
+
+    #if IS_KINEMATIC
+
+      #if HAS_PROBE_XY_OFFSET
+        // Return true if the both nozzle and the probe can reach the given point.
+        // Note: This won't work on SCARA since the probe offset rotates with the arm.
+        static inline bool can_reach(const float &rx, const float &ry) {
+          return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y) // The nozzle can go where it needs to go?
+              && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE));       // Can the nozzle also go near there?
+        }
+      #else
+        FORCE_INLINE static bool can_reach(const float &rx, const float &ry) {
+          return position_is_reachable(rx, ry, MIN_PROBE_EDGE);
+        }
+      #endif
+
+    #else
+
+      /**
+       * Return whether the given position is within the bed, and whether the nozzle
+       * can reach the position required to put the probe at the given position.
+       *
+       * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
+       *          nozzle must be be able to reach +10,-10.
+       */
+      static inline bool can_reach(const float &rx, const float &ry) {
+        return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y)
+            && WITHIN(rx, min_x() - fslop, max_x() + fslop)
+            && WITHIN(ry, min_y() - fslop, max_y() + fslop);
+      }
+
+    #endif
+
     #ifdef Z_AFTER_PROBING
       static void move_z_after_probing();
     #endif
     static float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true);
     static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true) {
-      return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative);
+      return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative, sanity_check);
     }
-    #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
-      static const char msg_wait_for_bed_heating[25];
-    #endif
 
   #else
 
@@ -62,8 +94,22 @@ class Probe {
 
     static bool set_deployed(const bool) { return false; }
 
+    FORCE_INLINE static bool can_reach(const float &rx, const float &ry) { return position_is_reachable(rx, ry); }
+
   #endif
 
+  FORCE_INLINE static bool can_reach(const xy_pos_t &pos) { return can_reach(pos.x, pos.y); }
+
+  FORCE_INLINE static bool good_bounds(const xy_pos_t &lf, const xy_pos_t &rb) {
+    return (
+      #if IS_KINEMATIC
+         can_reach(lf.x, 0) && can_reach(rb.x, 0) && can_reach(0, lf.y) && can_reach(0, rb.y)
+      #else
+         can_reach(lf) && can_reach(rb)
+      #endif
+    );
+  }
+
   // Use offset_xy for read only access
   // More optimal the XY offset is known to always be zero.
   #if HAS_PROBE_XY_OFFSET
@@ -131,7 +177,7 @@ class Probe {
       // Retrieve three points to probe the bed. Any type exposing set(X,Y) may be used.
       template <typename T>
       static inline void get_three_points(T points[3]) {
-        #if ENABLED(HAS_FIXED_3POINT)
+        #if HAS_FIXED_3POINT
           points[0].set(PROBE_PT_1_X, PROBE_PT_1_Y);
           points[1].set(PROBE_PT_2_X, PROBE_PT_2_Y);
           points[2].set(PROBE_PT_3_X, PROBE_PT_3_Y);
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index f7eb8d192b93..5fbbfd65a6bc 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -53,11 +53,13 @@ void scara_set_axis_is_at_home(const AxisEnum axis) {
       current_position[axis] = cartes[axis];
     #else
       // MP_SCARA uses a Cartesian XY home position
-      // SERIAL_ECHOLNPAIR("homeposition X:", homeposition.x, " Y:", homeposition.y);
+      // SERIAL_ECHOPGM("homeposition");
+      // SERIAL_ECHOLNPAIR_P(SP_X_LBL, homeposition.x, SP_Y_LBL, homeposition.y);
       current_position[axis] = homeposition[axis];
     #endif
 
-    // SERIAL_ECHOLNPAIR("Cartesian X:", current_position.x, " Y:", current_position.y);
+    // SERIAL_ECHOPGM("Cartesian");
+    // SERIAL_ECHOLNPAIR_P(SP_X_LBL, current_position.x, SP_Y_LBL, current_position.y);
     update_software_endstops(axis);
   }
 }
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 68639d40f003..ed48b83d5a6c 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -130,7 +130,7 @@ Stepper stepper; // Singleton
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 // public:
@@ -2116,7 +2116,7 @@ void Stepper::init() {
   #if MB(ALLIGATOR)
     const float motor_current[] = MOTOR_CURRENT;
     unsigned int digipot_motor = 0;
-    for (uint8_t i = 0; i < 3 + EXTRUDERS; i++) {
+    LOOP_L_N(i, 3 + EXTRUDERS) {
       digipot_motor = 255 * (motor_current[i] / 2.5);
       dac084s085::setValue(i, digipot_motor);
     }
@@ -2448,6 +2448,19 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
   return v;
 }
 
+void Stepper::report_a_position(const xyz_long_t &pos) {
+  #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
+    SERIAL_ECHOPAIR(STR_COUNT_A, pos.x, " B:", pos.y);
+  #else
+    SERIAL_ECHOPAIR_P(PSTR(STR_COUNT_X), pos.x, SP_Y_LBL, pos.y);
+  #endif
+  #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
+    SERIAL_ECHOLNPAIR(" C:", pos.z);
+  #else
+    SERIAL_ECHOLNPAIR_P(SP_Z_LBL, pos.z);
+  #endif
+}
+
 void Stepper::report_positions() {
 
   #ifdef __AVR__
@@ -2461,16 +2474,7 @@ void Stepper::report_positions() {
     if (was_enabled) wake_up();
   #endif
 
-  #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA
-    SERIAL_ECHOPAIR(STR_COUNT_A, pos.x, " B:", pos.y);
-  #else
-    SERIAL_ECHOPAIR(STR_COUNT_X, pos.x, " Y:", pos.y);
-  #endif
-  #if CORE_IS_XZ || CORE_IS_YZ || ENABLED(DELTA)
-    SERIAL_ECHOLNPAIR(" C:", pos.z);
-  #else
-    SERIAL_ECHOLNPAIR(" Z:", pos.z);
-  #endif
+  report_a_position(pos);
 }
 
 #if ENABLED(BABYSTEPPING)
@@ -2752,7 +2756,7 @@ void Stepper::report_positions() {
         SPI.begin();
         SET_OUTPUT(DIGIPOTSS_PIN);
 
-        for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++) {
+        LOOP_L_N(i, COUNT(digipot_motor_current)) {
           //digitalPotWrite(digipot_ch[i], digipot_motor_current[i]);
           digipot_current(i, digipot_motor_current[i]);
         }
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 6671b946dfcf..46c6c1c16a78 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -411,6 +411,7 @@ class Stepper {
     static void set_axis_position(const AxisEnum a, const int32_t &v);
 
     // Report the positions of the steppers, in steps
+    static void report_a_position(const xyz_long_t &pos);
     static void report_positions();
 
     // Quickly stop all steppers
diff --git a/Marlin/src/module/stepper/TMC26X.h b/Marlin/src/module/stepper/TMC26X.h
index d44bc19a7486..39192cea2580 100644
--- a/Marlin/src/module/stepper/TMC26X.h
+++ b/Marlin/src/module/stepper/TMC26X.h
@@ -32,7 +32,7 @@
 
 #include <SPI.h>
 #if defined(STM32GENERIC) && defined(STM32F7)
-  #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h"
+  #include "../../HAL/STM32_F4_F7/STM32F7/TMC2660.h"
 #else
   #include <TMC26XStepper.h>
 #endif
diff --git a/Marlin/src/module/stepper/indirection.cpp b/Marlin/src/module/stepper/indirection.cpp
index d468a2afdd62..2ddbfe62e390 100644
--- a/Marlin/src/module/stepper/indirection.cpp
+++ b/Marlin/src/module/stepper/indirection.cpp
@@ -33,7 +33,7 @@
 #include "indirection.h"
 
 void restore_stepper_drivers() {
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     restore_trinamic_drivers();
   #endif
 }
@@ -47,7 +47,7 @@ void reset_stepper_drivers() {
     L64xxManager.init_to_defaults();
   #endif
 
-  #if HAS_TRINAMIC
+  #if HAS_TRINAMIC_CONFIG
     reset_trinamic_drivers();
   #endif
 }
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 295c3aca2e90..0b36a5d0c022 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -40,7 +40,7 @@
   #include "TMC26X.h"
 #endif
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   #include "trinamic.h"
 #endif
 
@@ -185,18 +185,18 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #ifndef Z4_ENABLE_INIT
     #define Z4_ENABLE_INIT() SET_OUTPUT(Z4_ENABLE_PIN)
     #define Z4_ENABLE_WRITE(STATE) WRITE(Z4_ENABLE_PIN,STATE)
-    #define Z4_ENABLE_READ() READ(Z4_ENABLE_PIN)
+    #define Z4_ENABLE_READ() bool(READ(Z4_ENABLE_PIN))
   #endif
   #ifndef Z4_DIR_INIT
     #define Z4_DIR_INIT() SET_OUTPUT(Z4_DIR_PIN)
     #define Z4_DIR_WRITE(STATE) WRITE(Z4_DIR_PIN,STATE)
-    #define Z4_DIR_READ() READ(Z4_DIR_PIN)
+    #define Z4_DIR_READ() bool(READ(Z4_DIR_PIN))
   #endif
-  #define Z4_STEP_INIT SET_OUTPUT(Z4_STEP_PIN)
+  #define Z4_STEP_INIT() SET_OUTPUT(Z4_STEP_PIN)
   #ifndef Z4_STEP_WRITE
     #define Z4_STEP_WRITE(STATE) WRITE(Z4_STEP_PIN,STATE)
   #endif
-  #define Z4_STEP_READ READ(Z4_STEP_PIN)
+  #define Z4_STEP_READ() bool(READ(Z4_STEP_PIN))
 #else
   #define Z4_DIR_WRITE(STATE) NOOP
 #endif
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 0b14aaf64779..14598f9c73dc 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -27,7 +27,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
 
 #include "trinamic.h"
 #include "../stepper.h"
@@ -818,4 +818,4 @@ void reset_trinamic_drivers() {
   stepper.set_directions();
 }
 
-#endif // HAS_TRINAMIC
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 7cee5fb1ea6d..4018c7586c74 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -33,7 +33,7 @@
 #include "../core/language.h"
 #include "../HAL/shared/Delay.h"
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if ENABLED(MAX6675_IS_MAX31865)
@@ -80,7 +80,7 @@
 #endif
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../feature/emergency_parser.h"
+  #include "../feature/e_parser.h"
 #endif
 
 #if ENABLED(PRINTER_EVENT_LEDS)
@@ -101,11 +101,13 @@
 
 #if HOTEND_USES_THERMISTOR
   #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-    static void* heater_ttbl_map[2] = { (void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE };
+    static const void* heater_ttbl_map[2] = { (void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE };
     static constexpr uint8_t heater_ttbllen_map[2] = { HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN };
   #else
-    static void* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS((void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE, (void*)HEATER_2_TEMPTABLE, (void*)HEATER_3_TEMPTABLE, (void*)HEATER_4_TEMPTABLE, (void*)HEATER_5_TEMPTABLE);
-    static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN, HEATER_3_TEMPTABLE_LEN, HEATER_4_TEMPTABLE_LEN, HEATER_5_TEMPTABLE_LEN);
+    #define NEXT_TEMPTABLE(N) ,HEATER_##N##_TEMPTABLE
+    #define NEXT_TEMPTABLE_LEN(N) ,HEATER_##N##_TEMPTABLE_LEN
+    static const void* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE));
+    static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_TEMPTABLE_LEN REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE_LEN));
   #endif
 #endif
 
@@ -409,7 +411,7 @@ volatile bool Temperature::raw_temps_ready = false;
     if (target > GHV(BED_MAXTEMP - 10, temp_range[heater].maxtemp - 15)) {
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       #if ENABLED(EXTENSIBLE_UI)
-        ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
+        ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
       #endif
       return;
     }
@@ -525,7 +527,7 @@ volatile bool Temperature::raw_temps_ready = false;
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
+          ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH);
         #endif
         break;
       }
@@ -570,7 +572,7 @@ volatile bool Temperature::raw_temps_ready = false;
       #endif
       if (((ms - t1) + (ms - t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) {
         #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::OnPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT);
+          ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT);
         #endif
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
         break;
@@ -621,7 +623,7 @@ volatile bool Temperature::raw_temps_ready = false;
           printerEventLEDs.onPidTuningDone(color);
         #endif
         #if ENABLED(EXTENSIBLE_UI)
-          ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE);
+          ExtUI::onPidTuning(ExtUI::result_t::PID_DONE);
         #endif
 
         goto EXIT_M303;
@@ -635,7 +637,7 @@ volatile bool Temperature::raw_temps_ready = false;
       printerEventLEDs.onPidTuningDone(color);
     #endif
     #if ENABLED(EXTENSIBLE_UI)
-      ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE);
+      ExtUI::onPidTuning(ExtUI::result_t::PID_DONE);
     #endif
 
     EXIT_M303:
@@ -706,7 +708,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
     }while(0)
 
     uint8_t fanDone = 0;
-    for (uint8_t f = 0; f < COUNT(fanBit); f++) {
+    LOOP_L_N(f, COUNT(fanBit)) {
       const uint8_t realFan = pgm_read_byte(&fanBit[f]);
       if (TEST(fanDone, realFan)) continue;
       const bool fan_on = TEST(fanState, realFan);
@@ -763,7 +765,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
 //
 
 inline void loud_kill(PGM_P const lcd_msg, const heater_ind_t heater) {
-  Running = false;
+  marlin_state = MF_KILLED;
   #if USE_BEEPER
     for (uint8_t i = 20; i--;) {
       WRITE(BEEPER_PIN, HIGH); delay(25);
@@ -828,6 +830,9 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
 }
 
 #if HOTENDS
+  #if ENABLED(PID_DEBUG)
+    extern bool PID_Debug_Flag;
+  #endif
 
   float Temperature::get_pid_output_hotend(const uint8_t E_NAME) {
     const uint8_t ee = HOTEND_INDEX;
@@ -909,24 +914,15 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
       #endif // PID_OPENLOOP
 
       #if ENABLED(PID_DEBUG)
-        if (ee == active_extruder) {
+        if (ee == active_extruder && PID_Debug_Flag) {
           SERIAL_ECHO_START();
-          SERIAL_ECHOPAIR(
-            STR_PID_DEBUG, ee,
-            STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius,
-            STR_PID_DEBUG_OUTPUT, pid_output
-          );
+          SERIAL_ECHOPAIR(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output);
           #if DISABLED(PID_OPENLOOP)
-          {
-            SERIAL_ECHOPAIR(
-              STR_PID_DEBUG_PTERM, work_pid[ee].Kp,
-              STR_PID_DEBUG_ITERM, work_pid[ee].Ki,
-              STR_PID_DEBUG_DTERM, work_pid[ee].Kd
+            SERIAL_ECHOPAIR( STR_PID_DEBUG_PTERM, work_pid[ee].Kp, STR_PID_DEBUG_ITERM, work_pid[ee].Ki, STR_PID_DEBUG_DTERM, work_pid[ee].Kd
               #if ENABLED(PID_EXTRUSION_SCALING)
                 , STR_PID_DEBUG_CTERM, work_pid[ee].Kc
               #endif
             );
-          }
           #endif
           SERIAL_EOL();
         }
@@ -1028,10 +1024,6 @@ void Temperature::manage_heater() {
     if (!inited) return watchdog_refresh();
   #endif
 
-  #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
-    static bool last_pause_state;
-  #endif
-
   #if ENABLED(EMERGENCY_PARSER)
     if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
   #endif
@@ -1123,16 +1115,21 @@ void Temperature::manage_heater() {
       }
     #endif // WATCH_BED
 
+    #define PAUSE_CHANGE_REQD BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+    #if PAUSE_CHANGE_REQD
+      static bool last_pause_state;
+    #endif
+
     do {
 
       #if DISABLED(PIDTEMPBED)
         if (PENDING(ms, next_bed_check_ms)
-          #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+          #if PAUSE_CHANGE_REQD
             && paused == last_pause_state
           #endif
         ) break;
         next_bed_check_ms = ms + BED_CHECK_INTERVAL;
-        #if BOTH(PROBING_HEATERS_OFF, BED_LIMIT_SWITCHING)
+        #if PAUSE_CHANGE_REQD
           last_pause_state = paused;
         #endif
       #endif
@@ -1232,8 +1229,8 @@ void Temperature::manage_heater() {
   UNUSED(ms);
 }
 
-#define TEMP_AD595(RAW)  ((RAW) * 5.0 * 100.0 / 1024.0 / (OVERSAMPLENR) * (TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET)
-#define TEMP_AD8495(RAW) ((RAW) * 6.6 * 100.0 / 1024.0 / (OVERSAMPLENR) * (TEMP_SENSOR_AD8495_GAIN) + TEMP_SENSOR_AD8495_OFFSET)
+#define TEMP_AD595(RAW)  ((RAW) * 5.0 * 100.0 / float(HAL_ADC_RANGE) / (OVERSAMPLENR) * (TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET)
+#define TEMP_AD8495(RAW) ((RAW) * 6.6 * 100.0 / float(HAL_ADC_RANGE) / (OVERSAMPLENR) * (TEMP_SENSOR_AD8495_GAIN) + TEMP_SENSOR_AD8495_OFFSET)
 
 /**
  * Bisect search for the range of the 'raw' value, then interpolate
@@ -1660,10 +1657,9 @@ void Temperature::init() {
   #endif
 
   #if MB(RUMBA)
+    // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
     #define _AD(N) ANY(HEATER_##N##_USES_AD595, HEATER_##N##_USES_AD8495)
-    #if  _AD(0) || _AD(1) || _AD(2) /* RUMBA has 3 E plugs // || _AD(3) || _AD(4) || _AD(5) || _AD(6) || _AD(7) */ \
-      || _AD(BED) || _AD(CHAMBER)
-      // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
+    #if  _AD(0) || _AD(1) || _AD(2) || _AD(BED) || _AD(CHAMBER)
       MCUCR = _BV(JTD);
       MCUCR = _BV(JTD);
     #endif
@@ -2001,7 +1997,7 @@ void Temperature::init() {
 
     /**
       SERIAL_ECHO_START();
-      SERIAL_ECHOPGM("Thermal Thermal Runaway Running. Heater ID: ");
+      SERIAL_ECHOPGM("Thermal Runaway Running. Heater ID: ");
       if (heater_id == H_CHAMBER) SERIAL_ECHOPGM("chamber");
       if (heater_id < 0) SERIAL_ECHOPGM("bed"); else SERIAL_ECHO(heater_id);
       SERIAL_ECHOPAIR(" ;  State:", sm.state, " ;  Timer:", sm.timer, " ;  Temperature:", current, " ;  Target Temp:", target);
@@ -2420,7 +2416,7 @@ void Temperature::readings_ready() {
       #endif // HOTENDS > 1
     };
 
-    for (uint8_t e = 0; e < COUNT(temp_dir); e++) {
+    LOOP_L_N(e, COUNT(temp_dir)) {
       const int8_t tdir = temp_dir[e];
       if (tdir) {
         const int16_t rawtemp = temp_hotend[e].raw * tdir; // normal direction, +rawtemp, else -rawtemp
@@ -3360,6 +3356,15 @@ void Temperature::tick() {
       return wait_for_heatup;
     }
 
+    void Temperature::wait_for_bed_heating() {
+      if (isHeatingBed()) {
+        SERIAL_ECHOLNPGM("Wait for bed heating...");
+        LCD_MESSAGEPGM(MSG_BED_HEATING);
+        wait_for_bed();
+        ui.reset_status();
+      }
+    }
+
   #endif // HAS_HEATED_BED
 
   #if HAS_HEATED_CHAMBER
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 66d6bd56e154..24e005449667 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -74,8 +74,6 @@ hotend_pid_t;
   typedef IF<(LPQ_MAX_LEN > 255), uint16_t, uint8_t>::type lpq_ptr_t;
 #endif
 
-#define DUMMY_PID_VALUE 3000.0f
-
 #if ENABLED(PIDTEMP)
   #define _PID_Kp(H) Temperature::temp_hotend[H].pid.Kp
   #define _PID_Ki(H) Temperature::temp_hotend[H].pid.Ki
@@ -92,9 +90,9 @@ hotend_pid_t;
     #define _PID_Kf(H) 0
   #endif
 #else
-  #define _PID_Kp(H) DUMMY_PID_VALUE
-  #define _PID_Ki(H) DUMMY_PID_VALUE
-  #define _PID_Kd(H) DUMMY_PID_VALUE
+  #define _PID_Kp(H) NAN
+  #define _PID_Ki(H) NAN
+  #define _PID_Kd(H) NAN
   #define _PID_Kc(H) 1
 #endif
 
@@ -701,6 +699,8 @@ class Temperature {
         #endif
       );
 
+      static void wait_for_bed_heating();
+
     #endif // HAS_HEATED_BED
 
     #if HAS_TEMP_PROBE
diff --git a/Marlin/src/module/thermistor/thermistor_202.h b/Marlin/src/module/thermistor/thermistor_202.h
new file mode 100644
index 000000000000..9da3d45f454c
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_202.h
@@ -0,0 +1,69 @@
+//
+// Unknown 200K thermistor on a Copymaster 3D hotend
+// Temptable sent from dealer technologyoutlet.co.uk
+//
+
+const short temptable_202[][2] PROGMEM = {
+  { OV(   1), 864 },
+  { OV(  35), 300 },
+  { OV(  38), 295 },
+  { OV(  41), 290 },
+  { OV(  44), 285 },
+  { OV(  47), 280 },
+  { OV(  51), 275 },
+  { OV(  55), 270 },
+  { OV(  60), 265 },
+  { OV(  65), 260 },
+  { OV(  70), 255 },
+  { OV(  76), 250 },
+  { OV(  83), 245 },
+  { OV(  90), 240 },
+  { OV(  98), 235 },
+  { OV( 107), 230 },
+  { OV( 116), 225 },
+  { OV( 127), 220 },
+  { OV( 138), 215 },
+  { OV( 151), 210 },
+  { OV( 164), 205 },
+  { OV( 179), 200 },
+  { OV( 195), 195 },
+  { OV( 213), 190 },
+  { OV( 232), 185 },
+  { OV( 253), 180 },
+  { OV( 275), 175 },
+  { OV( 299), 170 },
+  { OV( 325), 165 },
+  { OV( 352), 160 },
+  { OV( 381), 155 },
+  { OV( 411), 150 },
+  { OV( 443), 145 },
+  { OV( 476), 140 },
+  { OV( 511), 135 },
+  { OV( 546), 130 },
+  { OV( 581), 125 },
+  { OV( 617), 120 },
+  { OV( 652), 115 },
+  { OV( 687), 110 },
+  { OV( 720), 105 },
+  { OV( 753), 100 },
+  { OV( 783),  95 },
+  { OV( 812),  90 },
+  { OV( 839),  85 },
+  { OV( 864),  80 },
+  { OV( 886),  75 },
+  { OV( 906),  70 },
+  { OV( 924),  65 },
+  { OV( 940),  60 },
+  { OV( 954),  55 },
+  { OV( 966),  50 },
+  { OV( 976),  45 },
+  { OV( 985),  40 },
+  { OV( 992),  35 },
+  { OV( 998),  30 },
+  { OV(1003),  25 },
+  { OV(1007),  20 },
+  { OV(1011),  15 },
+  { OV(1014),  10 },
+  { OV(1016),   5 },
+  { OV(1018),   0 }
+};
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 2a1500eebe3a..8ac9f11a554b 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -151,6 +151,9 @@
 #if ANY_THERMISTOR_IS(201) // Pt100 with LMV324 Overlord
   #include "thermistor_201.h"
 #endif
+#if ANY_THERMISTOR_IS(202) // 200K thermistor in Copymaker3D hotend
+  #include "thermistor_202.h"
+#endif
 #if ANY_THERMISTOR_IS(331) // Like table 1, but with 3V3 as input voltage for MEGA
   #include "thermistor_331.h"
 #endif
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 021878c1eaf8..2471581c8c68 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -74,7 +74,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../feature/prusa_MMU2/mmu2.h"
+  #include "../feature/mmu2/mmu2.h"
 #endif
 
 #if HAS_LCD_MENU
@@ -251,7 +251,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
 #elif ENABLED(PARKING_EXTRUDER)
 
   void pe_solenoid_init() {
-    for (uint8_t n = 0; n <= 1; ++n)
+    LOOP_LE_N(n, 1)
       #if ENABLED(PARKING_EXTRUDER_SOLENOIDS_INVERT)
         pe_activate_solenoid(n);
       #else
@@ -368,11 +368,16 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
 
 #if ENABLED(SWITCHING_TOOLHEAD)
 
+  inline void swt_lock(const bool locked=true) {
+    const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
+    MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, swt_angles[locked ? 0 : 1]);
+  }
+
+  void swt_init() { swt_lock(); }
+
   inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     if (no_move) return;
 
-    constexpr uint16_t angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
-
     constexpr float toolheadposx[] = SWITCHING_TOOLHEAD_X_POS;
     const float placexpos = toolheadposx[active_extruder],
                 grabxpos = toolheadposx[new_tool];
@@ -406,7 +411,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
 
     planner.synchronize();
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("(2) Unlock and Place Toolhead");
-    MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, angles[1]);
+    swt_lock(false);
     safe_delay(500);
 
     current_position.y = SWITCHING_TOOLHEAD_Y_POS;
@@ -451,7 +456,7 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
     // Wait for move to finish, pause 0.2s, move servo, pause 0.5s
     planner.synchronize();
     safe_delay(200);
-    MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, angles[0]);
+    swt_lock();
     safe_delay(500);
 
     current_position.y -= SWITCHING_TOOLHEAD_Y_CLEAR;
@@ -851,7 +856,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         }
         else {
           #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            do_pause_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
+            unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
           #else
             current_position.e -= toolchange_settings.swap_length / planner.e_factor[old_tool];
             planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.retract_speed), old_tool);
@@ -986,8 +991,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
           if (should_swap && !too_cold) {
             #if ENABLED(ADVANCED_PAUSE_FEATURE)
-              do_pause_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed));
-              do_pause_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE);
+              unscaled_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed));
+              unscaled_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE);
             #else
               current_position.e += toolchange_settings.swap_length / planner.e_factor[new_tool];
               planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.prime_speed), new_tool);
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index 025d2997d1cc..17c173d0527d 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -97,6 +97,10 @@
   void est_init();
 #endif
 
+#if ENABLED(SWITCHING_TOOLHEAD)
+  void swt_init();
+#endif
+
 /**
  * Perform a tool-change, which may result in moving the
  * previous tool out of the way and the new tool into place.
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 409f38129712..829c391c4dfe 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -42,49 +42,49 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          34
-#define Y_MIN_PIN          35
-#define Z_MIN_PIN          16   // 15
+#define X_MIN_PIN                             34
+#define Y_MIN_PIN                             35
+#define Z_MIN_PIN                             16  // 15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         12   // 34//27
-#define X_DIR_PIN          13   // 35//26
-#define X_ENABLE_PIN       17   // 0//17//25 // used free pin
-//#define X_CS_PIN            0
+#define X_STEP_PIN                            12  // 34//27
+#define X_DIR_PIN                             13  // 35//26
+#define X_ENABLE_PIN                          17  // 0//17//25 // used free pin
+//#define X_CS_PIN                             0
 
-#define Y_STEP_PIN         32   // 33
-#define Y_DIR_PIN          33   // 32
-#define Y_ENABLE_PIN       X_ENABLE_PIN
-//#define Y_CS_PIN           13
+#define Y_STEP_PIN                            32  // 33
+#define Y_DIR_PIN                             33  // 32
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+//#define Y_CS_PIN                            13
 
-#define Z_STEP_PIN         25   // 14
-#define Z_DIR_PIN          26   // 12
-#define Z_ENABLE_PIN       X_ENABLE_PIN
-//#define Z_CS_PIN            5   // SS_PIN
+#define Z_STEP_PIN                            25  // 14
+#define Z_DIR_PIN                             26  // 12
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        27   // 16
-#define E0_DIR_PIN         14   // 17
-#define E0_ENABLE_PIN      X_ENABLE_PIN
-//#define E0_CS_PIN          21
+#define E0_STEP_PIN                           27  // 16
+#define E0_DIR_PIN                            14  // 17
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2   // 4//2//(D8)
-#define FAN_PIN             0   // 2//15//13 (D9)
-#define HEATER_BED_PIN     15   // 15//0 //(D10)
+#define HEATER_0_PIN                           2  // 4//2//(D8)
+#define FAN_PIN                                0  // 2//15//13 (D9)
+#define HEATER_BED_PIN                        15  // 15//0 //(D10)
 
 // SPI
-#define SDSS                 5
+#define SDSS                                   5
 #define I2S_STEPPER_STREAM
-#define I2S_WS              23
-#define I2S_BCK             22
-#define I2S_DATA            21
+#define I2S_WS                                23
+#define I2S_BCK                               22
+#define I2S_DATA                              21
diff --git a/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin/src/pins/esp32/pins_ESP32.h
index 99a5ea2f76df..e4da400528ed 100644
--- a/Marlin/src/pins/esp32/pins_ESP32.h
+++ b/Marlin/src/pins/esp32/pins_ESP32.h
@@ -35,52 +35,52 @@
 // I2S (steppers & other output-only pins)
 //
 #define I2S_STEPPER_STREAM
-#define I2S_WS              25
-#define I2S_BCK             26
-#define I2S_DATA            27
+#define I2S_WS                                25
+#define I2S_BCK                               26
+#define I2S_DATA                              27
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           34
-#define Y_MIN_PIN           35
-#define Z_MIN_PIN           15
+#define X_MIN_PIN                             34
+#define Y_MIN_PIN                             35
+#define Z_MIN_PIN                             15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         128
-#define X_DIR_PIN          129
-#define X_ENABLE_PIN       130
-//#define X_CS_PIN           0
+#define X_STEP_PIN                           128
+#define X_DIR_PIN                            129
+#define X_ENABLE_PIN                         130
+//#define X_CS_PIN                             0
 
-#define Y_STEP_PIN         131
-#define Y_DIR_PIN          132
-#define Y_ENABLE_PIN       133
-//#define Y_CS_PIN          13
+#define Y_STEP_PIN                           131
+#define Y_DIR_PIN                            132
+#define Y_ENABLE_PIN                         133
+//#define Y_CS_PIN                            13
 
-#define Z_STEP_PIN         134
-#define Z_DIR_PIN          135
-#define Z_ENABLE_PIN       136
-//#define Z_CS_PIN           5 // SS_PIN
+#define Z_STEP_PIN                           134
+#define Z_DIR_PIN                            135
+#define Z_ENABLE_PIN                         136
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        137
-#define E0_DIR_PIN         138
-#define E0_ENABLE_PIN      139
-//#define E0_CS_PIN         21
+#define E0_STEP_PIN                          137
+#define E0_DIR_PIN                           138
+#define E0_ENABLE_PIN                        139
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          36   // Analog Input
-#define TEMP_BED_PIN        39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN         2
-#define FAN_PIN             13
-#define HEATER_BED_PIN       4
+#define HEATER_0_PIN                           2
+#define FAN_PIN                               13
+#define HEATER_BED_PIN                         4
 
 // SPI
-#define SDSS                 5
+#define SDSS                                   5
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index a93f0f05c4aa..8a06f9a1693b 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -45,66 +45,66 @@
 #ifdef I2S_STEPPER_STREAM
   #undef I2S_STEPPER_STREAM
 #endif
-#define I2S_WS              -1
-#define I2S_BCK             -1
-#define I2S_DATA            -1
+#define I2S_WS                                -1
+#define I2S_BCK                               -1
+#define I2S_DATA                              -1
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         35
-#define Z_STOP_PIN         15
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            35
+#define Z_STOP_PIN                            15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         27
-#define X_DIR_PIN          26
-#define X_ENABLE_PIN       25
-//#define X_CS_PIN           21
+#define X_STEP_PIN                            27
+#define X_DIR_PIN                             26
+#define X_ENABLE_PIN                          25
+//#define X_CS_PIN                            21
 
-#define Y_STEP_PIN         33
-#define Y_DIR_PIN          32
-#define Y_ENABLE_PIN       X_ENABLE_PIN
-//#define Y_CS_PIN           22
+#define Y_STEP_PIN                            33
+#define Y_DIR_PIN                             32
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+//#define Y_CS_PIN                            22
 
-#define Z_STEP_PIN         14
-#define Z_DIR_PIN          12
-#define Z_ENABLE_PIN       X_ENABLE_PIN
-//#define Z_CS_PIN            5 // SS_PIN
+#define Z_STEP_PIN                            14
+#define Z_DIR_PIN                             12
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        16
-#define E0_DIR_PIN         17
-#define E0_ENABLE_PIN      X_ENABLE_PIN
-//#define E0_CS_PIN          21
+#define E0_STEP_PIN                           16
+#define E0_DIR_PIN                            17
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define FAN_PIN            13
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define FAN_PIN                               13
+#define HEATER_BED_PIN                         4
 
 //
 // MicroSD card
 //
-#define MOSI_PIN           23
-#define MISO_PIN           19
-#define SCK_PIN            18
-#define SDSS                5
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN                              23
+#define MISO_PIN                              19
+#define SCK_PIN                               18
+#define SDSS                                   5
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 // Hardware serial pins
 // Add the following to Configuration.h or Configuration_adv.h to assign
 // specific pins to hardware Serial1.
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
 // MRR ESPA does not have enough spare pins for such reassignment.
-//#define HARDWARE_SERIAL1_RX 21
-//#define HARDWARE_SERIAL1_TX 22
+//#define HARDWARE_SERIAL1_RX                 21
+//#define HARDWARE_SERIAL1_TX                 22
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index 0096027158e9..3dd50489df13 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -43,9 +43,9 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         35
-#define Y_STOP_PIN         32
-#define Z_STOP_PIN         33
+#define X_STOP_PIN                            35
+#define Y_STOP_PIN                            32
+#define Z_STOP_PIN                            33
 
 //
 // Enable I2S stepper stream
@@ -53,72 +53,72 @@
 #undef I2S_STEPPER_STREAM
 #define I2S_STEPPER_STREAM
 
-#undef LIN_ADVANCE  // Currently, I2S stream does not work with linear advance
+#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
 
-#define I2S_WS             26
-#define I2S_BCK            25
-#define I2S_DATA           27
+#define I2S_WS                                26
+#define I2S_BCK                               25
+#define I2S_DATA                              27
 
 //
 // Steppers
 //
-#define X_STEP_PIN        129
-#define X_DIR_PIN         130
-#define X_ENABLE_PIN      128
-//#define X_CS_PIN           21
-
-#define Y_STEP_PIN        132
-#define Y_DIR_PIN         133
-#define Y_ENABLE_PIN      131
-//#define Y_CS_PIN           22
-
-#define Z_STEP_PIN        135
-#define Z_DIR_PIN         136
-#define Z_ENABLE_PIN      134
-//#define Z_CS_PIN            5 // SS_PIN
-
-#define E0_STEP_PIN       138
-#define E0_DIR_PIN        139
-#define E0_ENABLE_PIN     137
-//#define E0_CS_PIN          21
-
-#define E1_STEP_PIN       141
-#define E1_DIR_PIN        142
-#define E1_ENABLE_PIN     140
-//#define E1_CS_PIN          22
-
-#define Z2_STEP_PIN       141
-#define Z2_DIR_PIN        142
-#define Z2_ENABLE_PIN     140
-//#define Z2_CS_PIN            5
+#define X_STEP_PIN                           129
+#define X_DIR_PIN                            130
+#define X_ENABLE_PIN                         128
+//#define X_CS_PIN                            21
+
+#define Y_STEP_PIN                           132
+#define Y_DIR_PIN                            133
+#define Y_ENABLE_PIN                         131
+//#define Y_CS_PIN                            22
+
+#define Z_STEP_PIN                           135
+#define Z_DIR_PIN                            136
+#define Z_ENABLE_PIN                         134
+//#define Z_CS_PIN                             5  // SS_PIN
+
+#define E0_STEP_PIN                          138
+#define E0_DIR_PIN                           139
+#define E0_ENABLE_PIN                        137
+//#define E0_CS_PIN                           21
+
+#define E1_STEP_PIN                          141
+#define E1_DIR_PIN                           142
+#define E1_ENABLE_PIN                        140
+//#define E1_CS_PIN                           22
+
+#define Z2_STEP_PIN                          141
+#define Z2_DIR_PIN                           142
+#define Z2_ENABLE_PIN                        140
+//#define Z2_CS_PIN                            5
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_1_PIN         34   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_1_PIN                            34  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN      145 // 2
-#define FAN_PIN           146 // 15
-#define HEATER_BED_PIN    144 // 4
+#define HEATER_0_PIN                         145  // 2
+#define FAN_PIN                              146  // 15
+#define HEATER_BED_PIN                       144  // 4
 
-#define CONTROLLER_FAN_PIN 147
-//#define E0_AUTO_FAN_PIN 148 // need to update Configuration_adv.h @section extruder
-//#define E1_AUTO_FAN_PIN 149 // need to update Configuration_adv.h @section extruder
-#define FAN1_PIN 149
+#define CONTROLLER_FAN_PIN                   147
+//#define E0_AUTO_FAN_PIN                    148  // need to update Configuration_adv.h @section extruder
+//#define E1_AUTO_FAN_PIN                    149  // need to update Configuration_adv.h @section extruder
+#define FAN1_PIN                             149
 
 //
 // MicroSD card
 //
-#define MOSI_PIN           23
-#define MISO_PIN           19
-#define SCK_PIN            18
-#define SDSS                5
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN                              23
+#define MISO_PIN                              19
+#define SCK_PIN                               18
+#define SDSS                                   5
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 //////////////////////////
 // LCDs and Controllers //
@@ -126,21 +126,21 @@
 
 #if HAS_GRAPHICAL_LCD
 
-  #define LCD_PINS_RS        13
-  #define LCD_PINS_ENABLE    17
-  #define LCD_PINS_D4        16
+  #define LCD_PINS_RS                         13
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         16
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN      151
+    #define BEEPER_PIN                       151
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define BEEPER_PIN      151
+    #define BEEPER_PIN                       151
 
-    //#define LCD_PINS_D5     150
-    //#define LCD_PINS_D6     152
-    //#define LCD_PINS_D7     153
+    //#define LCD_PINS_D5                    150
+    //#define LCD_PINS_D6                    152
+    //#define LCD_PINS_D7                    153
 
   #else
 
@@ -148,9 +148,9 @@
 
   #endif
 
-  #define BTN_EN1             0
-  #define BTN_EN2            12
-  #define BTN_ENC            14
+  #define BTN_EN1                              0
+  #define BTN_EN2                             12
+  #define BTN_ENC                             14
 
 #endif // HAS_GRAPHICAL_LCD
 
@@ -159,7 +159,7 @@
 // specific pins to hardware Serial1 and Serial2.
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
 // MRR ESPA does not have enough spare pins for such reassignment.
-//#define HARDWARE_SERIAL1_RX 21
-//#define HARDWARE_SERIAL1_TX 22
-//#define HARDWARE_SERIAL2_RX  2
-//#define HARDWARE_SERIAL2_TX  4
+//#define HARDWARE_SERIAL1_RX                 21
+//#define HARDWARE_SERIAL1_TX                 22
+//#define HARDWARE_SERIAL2_RX                  2
+//#define HARDWARE_SERIAL2_TX                  4
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index d206547ab8ba..0bfbaabdcd6a 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -49,7 +49,7 @@
   #define BOARD_INFO_NAME "RAMPS 1.4"
 #endif
 
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 #define IS_RAMPS_EFB
 
@@ -57,85 +57,85 @@
 // Servos
 //
 #ifdef IS_RAMPS_13
-  #define SERVO0_PIN        7   // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
+  #define SERVO0_PIN                           7  // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
 #else
-  #define SERVO0_PIN       11
+  #define SERVO0_PIN                          11
 #endif
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN        4
+  #define SERVO3_PIN                           4
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -159,72 +159,72 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                        -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN      8
+  #define RAMPS_D8_PIN                         8
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN      9
+  #define RAMPS_D9_PIN                         9
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    10
+  #define RAMPS_D10_PIN                       10
 #endif
 
-#define HEATER_0_PIN     RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN   RAMPS_D9_PIN
-  #define FAN_PIN        RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN   RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define FAN1_PIN       RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
-  #define FAN_PIN        RAMPS_D8_PIN
-#else                                          // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define FAN_PIN                   RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_SF)                        // Spindle, Fan
+  #define FAN_PIN                   RAMPS_D8_PIN
+#else                                             // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN     MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4   // IO pin. Buffer needed
+  #define FAN_PIN                              4  // IO pin. Buffer needed
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN    6   // Hardware PWM
-  #elif HAS_FREE_AUX2_PINS        // try to use AUX 2
-    #define CASE_LIGHT_PIN   44   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -232,14 +232,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
-  #elif HAS_FREE_AUX2_PINS                // try to use AUX 2
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
@@ -247,13 +247,13 @@
 // Průša i3 MK2 Multiplexer Support
 //
 #ifndef E_MUX0_PIN
-  #define E_MUX0_PIN 40   // Z_CS_PIN
+  #define E_MUX0_PIN                          40  // Z_CS_PIN
 #endif
 #ifndef E_MUX1_PIN
-  #define E_MUX1_PIN 42   // E0_CS_PIN
+  #define E_MUX1_PIN                          42  // E0_CS_PIN
 #endif
 #ifndef E_MUX2_PIN
-  #define E_MUX2_PIN 44   // E1_CS_PIN
+  #define E_MUX2_PIN                          44  // E1_CS_PIN
 #endif
 
 /**
@@ -261,17 +261,17 @@
  */
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    66
+    #define TMC_SW_MOSI                       66
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     64
+    #define TMC_SW_SCK                        64
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -295,91 +295,91 @@
    */
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  40
+    #define X_SERIAL_TX_PIN                   40
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  63
+    #define X_SERIAL_RX_PIN                   63
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  59
+    #define Y_SERIAL_TX_PIN                   59
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  64
+    #define Y_SERIAL_RX_PIN                   64
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  42
+    #define Z_SERIAL_TX_PIN                   42
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  65
+    #define Z_SERIAL_RX_PIN                   65
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN -1
+    #define Z2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN -1
+    #define Z2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 44
+    #define E0_SERIAL_TX_PIN                  44
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 66
+    #define E0_SERIAL_RX_PIN                  66
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
@@ -394,62 +394,62 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 
-    #define LCD_PINS_RS         40
-    #define LCD_PINS_ENABLE     42
-    #define LCD_PINS_D4         65
-    #define LCD_PINS_D5         66
-    #define LCD_PINS_D6         44
-    #define LCD_PINS_D7         64
+    #define LCD_PINS_RS                       40
+    #define LCD_PINS_ENABLE                   42
+    #define LCD_PINS_D4                       65
+    #define LCD_PINS_D5                       66
+    #define LCD_PINS_D6                       44
+    #define LCD_PINS_D7                       64
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS       27
-      #define LCD_PINS_ENABLE   29
-      #define LCD_PINS_D4       25
+      #define LCD_PINS_RS                     27
+      #define LCD_PINS_ENABLE                 29
+      #define LCD_PINS_D4                     25
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      37
+        #define BEEPER_PIN                    37
       #endif
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define LCD_PINS_RS       64
-      #define LCD_PINS_ENABLE   44
-      #define LCD_PINS_D4       63
-      #define LCD_PINS_D5       40
-      #define LCD_PINS_D6       42
-      #define LCD_PINS_D7       65
+      #define LCD_PINS_RS                     64
+      #define LCD_PINS_ENABLE                 44
+      #define LCD_PINS_D4                     63
+      #define LCD_PINS_D5                     40
+      #define LCD_PINS_D6                     42
+      #define LCD_PINS_D7                     65
 
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC     25   // Set as output on init
-        #define LCD_PINS_RS     27   // Pull low for 1s to init
+        #define LCD_PINS_DC                   25  // Set as output on init
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
         // DOGM SPI LCD Support
-        #define DOGLCD_CS       16
-        #define DOGLCD_MOSI     17
-        #define DOGLCD_SCK      23
-        #define DOGLCD_A0       LCD_PINS_DC
+        #define DOGLCD_CS                     16
+        #define DOGLCD_MOSI                   17
+        #define DOGLCD_SCK                    23
+        #define DOGLCD_A0            LCD_PINS_DC
       #else
-        #define LCD_PINS_RS     16
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4     23
-        #define LCD_PINS_D5     25
-        #define LCD_PINS_D6     27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7       29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -457,10 +457,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -472,85 +472,85 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1         17
-        #define BTN_EN2         23
+        #define BTN_EN1                       17
+        #define BTN_EN2                       23
       #else
-        #define BTN_EN1         31
-        #define BTN_EN2         33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC           35
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define BTN_ENC                         35
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1                         64
+      #define BTN_EN2                         59
+      #define BTN_ENC                         63
+      #define SD_DETECT_PIN                   42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          SDSS
-      #define KILL_PIN          41
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
+      #define LCD_SDSS                      SDSS
+      #define KILL_PIN                        41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-      #define BTN_ENC           -1
+      #define BTN_EN1                         22  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_ENC                         -1
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS         45
-      #define DOGLCD_A0         44
+      #define DOGLCD_CS                       45
+      #define DOGLCD_A0                       44
       #define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN        33
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define BEEPER_PIN                      33
+      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_BLUE_PIN               35
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1                         22
+      #define BTN_EN2                          7
+      #define BTN_ENC                         39
 
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
-      #define KILL_PIN          31
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display sd interface, 72 for easy adapter board
+      #define KILL_PIN                        31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
+      #define DOGLCD_CS                       29
+      #define DOGLCD_A0                       27
 
-      #define BEEPER_PIN        23
-      #define LCD_BACKLIGHT_PIN 33
+      #define BEEPER_PIN                      23
+      #define LCD_BACKLIGHT_PIN               33
 
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
+      #define BTN_EN1                         35
+      #define BTN_EN2                         37
+      #define BTN_ENC                         31
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
     #elif ENABLED(MKS_MINI_12864)
 
-      #define DOGLCD_A0         27
-      #define DOGLCD_CS         25
+      #define DOGLCD_A0                       27
+      #define DOGLCD_CS                       25
 
       // GLCD features
       // Uncomment screen orientation
@@ -558,25 +558,25 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1                         31
+      #define BTN_EN2                         33
+      #define BTN_ENC                         35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN                      42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
+      #define DOGLCD_A0                       44
+      #define DOGLCD_CS                       66
 
       // GLCD features
       // Uncomment screen orientation
@@ -584,16 +584,16 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1                         40
+      #define BTN_EN2                         63
+      #define BTN_ENC                         59
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define ADC_KEYPAD_PIN    12
+      #define ADC_KEYPAD_PIN                  12
 
     #elif ENABLED(AZSMZ_12864)
 
@@ -602,29 +602,29 @@
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
+        #define SHIFT_OUT                     40
+        #define SHIFT_CLK                     44
+        #define SHIFT_LD                      42
+        #define BTN_EN1                       64
+        #define BTN_EN2                       59
+        #define BTN_ENC                       63
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1                       59  // AUX2 PIN 3
+        #define BTN_EN2                       63  // AUX2 PIN 4
+        #define BTN_ENC                       49  // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1                       37
+        #define BTN_EN2                       35
+        #define BTN_ENC                       31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN                 49
+        #define KILL_PIN                      41
       #endif
 
     #endif
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 1f02f9299e35..1417fb7d9915 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -31,87 +31,93 @@
 
 #define BOARD_INFO_NAME "AZSMZ MINI"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define Y_MIN_PIN          P1_26
-#define Z_MIN_PIN          P1_28
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define Y_MIN_PIN                          P1_26
+#define Z_MIN_PIN                          P1_28
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (TH1)
-#define TEMP_BED_PIN        P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
+#define TEMP_0_PIN                      P0_23_A0  // A0 (TH1)
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 // EFB
-#define HEATER_0_PIN       P2_04
-#define HEATER_BED_PIN     P2_05
+#define HEATER_0_PIN                       P2_04
+#define HEATER_BED_PIN                     P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_07
+  #define FAN_PIN                          P2_07
 #endif
-#define FAN1_PIN           P0_26
+#define FAN1_PIN                           P0_26
 
-#define LCD_SDSS           P0_16   // LCD SD chip select
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define LCD_SDSS                           P0_16  // LCD SD chip select
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if ENABLED(AZSMZ_12864)
-  #define BEEPER_PIN       P1_30
-  #define DOGLCD_A0        P2_06
-  #define DOGLCD_CS        P1_22
-  #define BTN_EN1          P4_28
-  #define BTN_EN2          P1_27
-  #define BTN_ENC          P3_26
+  #define BEEPER_PIN                       P1_30
+  #define DOGLCD_A0                        P2_06
+  #define DOGLCD_CS                        P1_22
+  #define BTN_EN1                          P4_28
+  #define BTN_EN2                          P1_27
+  #define BTN_ENC                          P3_26
   #ifndef SDCARD_CONNECTION
-    #define SDCARD_CONNECTION LCD
+    #define SDCARD_CONNECTION                LCD
   #endif
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           LCD_SDSS
-  #define SD_DETECT_PIN    P3_25
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                        LCD_SDSS
+  #define SD_DETECT_PIN                    P3_25
 #elif SD_CONNECTION_IS(ONBOARD)
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -119,16 +125,16 @@
 //
 // Ethernet pins
 //
-#define ENET_MDIO          P1_17
-#define ENET_RX_ER         P1_14
-#define ENET_RXD1          P1_10
-#define ENET_MOC           P1_16
-#define REF_CLK            P1_15
-#define ENET_RXD0          P1_09
-#define ENET_CRS           P1_08
-#define ENET_TX_EN         P1_04
-#define ENET_TXD0          P1_00
-#define ENET_TXD1          P1_01
+#define ENET_MDIO                          P1_17
+#define ENET_RX_ER                         P1_14
+#define ENET_RXD1                          P1_10
+#define ENET_MOC                           P1_16
+#define REF_CLK                            P1_15
+#define ENET_RXD0                          P1_09
+#define ENET_CRS                           P1_08
+#define ENET_TX_EN                         P1_04
+#define ENET_TXD0                          P1_00
+#define ENET_TXD1                          P1_01
 
 /**
  *  PWMs
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
index 4ff4ebc73bde..d710138b956e 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -38,45 +38,51 @@
   #define BOARD_INFO_NAME "BIQU Thunder B300 V1.0"
 #endif
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_15   // ETH
+  #define X_CS_PIN                         P1_15  // ETH
 #endif
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_14   // ETH
+  #define Y_CS_PIN                         P1_14  // ETH
 #endif
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_16   // ETH
+  #define Z_CS_PIN                         P1_16  // ETH
 #endif
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_17   // ETH
+  #define E0_CS_PIN                        P1_17  // ETH
 #endif
 
 //
@@ -84,13 +90,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P0_18   // ETH
+    #define TMC_SW_MOSI                    P0_18  // ETH
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_17   // ETH
+    #define TMC_SW_MISO                    P0_17  // ETH
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_15   // ETH
+    #define TMC_SW_SCK                     P0_15  // ETH
   #endif
 #endif
 
@@ -98,23 +104,23 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_24_A1   // A0 (T0)
-#define TEMP_BED_PIN        P0_23_A0   // A1 (T1)
+#define TEMP_0_PIN                      P0_24_A1  // A0 (T0)
+#define TEMP_BED_PIN                    P0_23_A0  // A1 (T1)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       P2_07
-#define HEATER_BED_PIN     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_BED_PIN                     P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
 // Unused
 //
-//#define PIN_P2_10        P2_10   // IBOOT-1
-//#define PIN_P0_27        P0_27   // Onboard SD Detect
+//#define PIN_P2_10                        P2_10  // IBOOT-1
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
 
 /**
  * LCD / Controller
@@ -128,16 +134,16 @@
  */
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       P1_31   // EXP1-1
+  #define BEEPER_PIN                       P1_31  // EXP1-1
 
-  #define BTN_EN1          P3_26   // EXP2-3
-  #define BTN_EN2          P3_25   // EXP2-5
-  #define BTN_ENC          P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-3
+  #define BTN_EN2                          P3_25  // EXP2-5
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define SD_DETECT_PIN    P0_27   // EXP2-7
-  #define LCD_PINS_RS      P0_16   // EXP1-4
-  #define LCD_PINS_ENABLE  P0_18   // (MOSI) EXP1-3
-  #define LCD_PINS_D4      P0_15   // (SCK)  EXP1-5
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
@@ -156,11 +162,11 @@
  * Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board.
  */
 #if ENABLED(SDSUPPORT)
-  #define SCK_PIN          P0_15   // EXP1-5
-  #define MISO_PIN         P0_16   // EXP1-4
-  #define MOSI_PIN         P0_18   // EXP1-3
-  #define SS_PIN           P1_30   // EXP1-2
-  #define SDSS             SS_PIN
+  #define SCK_PIN                          P0_15  // EXP1-5
+  #define MISO_PIN                         P0_16  // EXP1-4
+  #define MOSI_PIN                         P0_18  // EXP1-3
+  #define SS_PIN                           P1_30  // EXP1-2
+  #define SDSS                            SS_PIN
 #endif
 
 /**
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
index 17a9b7d58da8..041235d49352 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -37,58 +37,61 @@
 #define BOARD_INFO_NAME "BIQU BQ111-A4"
 
 //
-// Limit Switches
+// EEPROM
 //
-#define X_MIN_PIN         P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN         P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN         P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN         P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN         P1_28   // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN         P1_29   // 10k pullup to 3.3V, 1K series
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
 
+//
+// Limit Switches
+//
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_0
-#define X_DIR_PIN          P0_5
-#define X_ENABLE_PIN       P0_4
+#define X_STEP_PIN                         P2_0
+#define X_DIR_PIN                          P0_5
+#define X_ENABLE_PIN                       P0_4
 
-#define Y_STEP_PIN         P2_1
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_1
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_2
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
-
-#define E0_STEP_PIN        P2_3
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define Z_STEP_PIN                         P2_2
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
+#define E0_STEP_PIN                        P2_3
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
 //
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0)
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1)
-
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0)
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       P2_7
-#define HEATER_BED_PIN     P2_5
+#define HEATER_0_PIN                       P2_7
+#define HEATER_BED_PIN                     P2_5
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_4
+  #define FAN_PIN                          P2_4
 #endif
 
 //
 // Unused
 //
-//#define PIN_P2_10         P2_10   // IBOOT-1
-//#define PIN_P0_27         P0_27   // Onboard SD Detect
+//#define PIN_P2_10                        P2_10  // IBOOT-1
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
 
 /**
  * LCD / Controller
@@ -102,16 +105,16 @@
  */
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN          P1_31   // EXP1-1
+  #define BEEPER_PIN                       P1_31  // EXP1-1
 
-  #define BTN_EN1             P3_26   // EXP2-3
-  #define BTN_EN2             P3_25   // EXP2-5
-  #define BTN_ENC             P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-3
+  #define BTN_EN2                          P3_25  // EXP2-5
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define SD_DETECT_PIN       P0_27   // EXP2-7
-  #define LCD_PINS_RS         P0_16   // EXP1-4
-  #define LCD_PINS_ENABLE     P0_18   // (MOSI) EXP1-3
-  #define LCD_PINS_D4         P0_15   // (SCK)  EXP1-5
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
@@ -123,7 +126,6 @@
 
 #endif // HAS_SPI_LCD
 
-
 /**
  * SD Card Reader
  *
@@ -132,15 +134,14 @@
  */
 #if ENABLED(SDSUPPORT)
 
-  #define SCK_PIN   P0_15   // EXP1-5
-  #define MISO_PIN  P0_16   // EXP1-4
-  #define MOSI_PIN  P0_18   // EXP1-3
-  #define SS_PIN    P1_30   // EXP1-2
-  #define SDSS      SS_PIN
+  #define SCK_PIN                          P0_15  // EXP1-5
+  #define MISO_PIN                         P0_16  // EXP1-4
+  #define MOSI_PIN                         P0_18  // EXP1-3
+  #define SS_PIN                           P1_30  // EXP1-2
+  #define SDSS                            SS_PIN
 
 #endif // SDSUPPORT
 
-
 /**
  *  PWMS
  *
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index 15b63494094b..4dae2dc5d630 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -23,35 +23,41 @@
 
 #define BOARD_INFO_NAME "BIGTREE SKR 1.1"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Limit Switches
 //
 
-#define X_MIN_PIN          P1_29
-#define X_MAX_PIN          P1_28
-#define Y_MIN_PIN          P1_27
-#define Y_MAX_PIN          P1_26
-#define Z_MIN_PIN          P1_25
-#define Z_MAX_PIN          P1_24
+#define X_MIN_PIN                          P1_29
+#define X_MAX_PIN                          P1_28
+#define Y_MIN_PIN                          P1_27
+#define Y_MAX_PIN                          P1_26
+#define Z_MIN_PIN                          P1_25
+#define Z_MAX_PIN                          P1_24
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P0_04
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P4_28
+#define X_STEP_PIN                         P0_04
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P4_28
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P2_02
-#define Y_ENABLE_PIN       P2_00
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P2_02
+#define Y_ENABLE_PIN                       P2_00
 
-#define Z_STEP_PIN         P0_20
-#define Z_DIR_PIN          P0_21
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P0_20
+#define Z_DIR_PIN                          P0_21
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P0_11
-#define E0_DIR_PIN         P2_13
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P0_11
+#define E0_DIR_PIN                         P2_13
+#define E0_ENABLE_PIN                      P2_12
 
 /**
  * LCD / Controller
@@ -67,19 +73,19 @@
  */
 
 #if HAS_SPI_LCD
-  #define BTN_EN1          P3_26
-  #define BTN_EN2          P3_25
-  #define BTN_ENC          P2_11
+  #define BTN_EN1                          P3_26
+  #define BTN_EN2                          P3_25
+  #define BTN_ENC                          P2_11
 
-  #define SD_DETECT_PIN    P1_31
-  #define LCD_SDSS         P1_23
-  #define LCD_PINS_RS      P0_16
-  #define LCD_PINS_ENABLE  P0_18
-  #define LCD_PINS_D4      P0_15
+  #define SD_DETECT_PIN                    P1_31
+  #define LCD_SDSS                         P1_23
+  #define LCD_PINS_RS                      P0_16
+  #define LCD_PINS_ENABLE                  P0_18
+  #define LCD_PINS_D4                      P0_15
 
   #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      P2_06
-    #define DOGLCD_A0      P0_16
+    #define DOGLCD_CS                      P2_06
+    #define DOGLCD_A0                      P0_16
   #endif
 #endif
 
@@ -91,19 +97,19 @@
 // https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
 #ifndef SDCARD_CONNECTION
   #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
-    #define SDCARD_CONNECTION LCD
+    #define SDCARD_CONNECTION                LCD
   #else
-    #define SDCARD_CONNECTION ONBOARD
+    #define SDCARD_CONNECTION            ONBOARD
   #endif
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P1_23
+  #define SS_PIN                           P1_23
 #endif
 
 // Trinamic driver support
 
-#if HAS_TRINAMIC
+#if HAS_TRINAMIC_CONFIG
   // Using TMC devices in intelligent mode requires extra connections to each device. Unfortunately
   // the SKR does not have many free pins (especially if a display is in use). The SPI-based devices
   // will require 3 connections (clock, mosi, miso), plus a chip select line (CS) for each driver.
@@ -131,49 +137,48 @@
   // When using any TMC SPI-based drivers, software SPI is used
   // because pins may be shared with the display or SD card.
   #define TMC_USE_SW_SPI
-  #define TMC_SW_MOSI       P0_18
-  #define TMC_SW_MISO       P0_17
+  #define TMC_SW_MOSI                      P0_18
+  #define TMC_SW_MISO                      P0_17
   // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
-  #define TMC_SW_SCK        P0_15
+  #define TMC_SW_SCK                       P0_15
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
-  //#define TMC_SW_SCK        P2_06
+  //#define TMC_SW_SCK                     P2_06
 
   #if ENABLED(SOFTWARE_DRIVER_ENABLE)
 
     // Software enable allows the enable pins to be repurposed as chip-select pins.
     // Note: Requires the driver modules to be modified to always be enabled with the enable pin removed.
     #if AXIS_DRIVER_TYPE_X(TMC2130)
-      #define X_CS_PIN         P4_28
-      #undef  X_ENABLE_PIN
-      #define X_ENABLE_PIN     -1
+      #define X_CS_PIN                     P4_28
+      #undef X_ENABLE_PIN
+      #define X_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_Y(TMC2130)
-      #define Y_CS_PIN         P2_00
-      #undef  Y_ENABLE_PIN
-      #define Y_ENABLE_PIN     -1
+      #define Y_CS_PIN                     P2_00
+      #undef Y_ENABLE_PIN
+      #define Y_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_Z(TMC2130)
-      #define Z_CS_PIN         P0_19
-      #undef  Z_ENABLE_PIN
-      #define Z_ENABLE_PIN     -1
+      #define Z_CS_PIN                     P0_19
+      #undef Z_ENABLE_PIN
+      #define Z_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_E0(TMC2130)
-      #define E0_CS_PIN        P2_12
-      #undef  E0_ENABLE_PIN
-      #define E0_ENABLE_PIN    -1
+      #define E0_CS_PIN                    P2_12
+      #undef E0_ENABLE_PIN
+      #define E0_ENABLE_PIN                -1
     #endif
 
-
     #if AXIS_DRIVER_TYPE_E1(TMC2130)
-      #define E1_CS_PIN        P0_10
-      #undef  E1_ENABLE_PIN
-      #define E1_ENABLE_PIN    -1
+      #define E1_CS_PIN                    P0_10
+      #undef E1_ENABLE_PIN
+      #define E1_ENABLE_PIN                -1
     #endif
 
-  #else // !SOFTWARE_DRIVER_ENABLE
+  #else                                           // !SOFTWARE_DRIVER_ENABLE
 
     // A chip-select pin is needed for each driver.
 
@@ -186,11 +191,11 @@
       #if SD_CONNECTION_IS(LCD)
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
       #endif
-      #define X_CS_PIN      P1_23
-      #define Y_CS_PIN      P3_26
-      #define Z_CS_PIN      P2_11
-      #define E0_CS_PIN     P3_25
-      #define E1_CS_PIN     P1_31
+      #define X_CS_PIN                     P1_23
+      #define Y_CS_PIN                     P3_26
+      #define Z_CS_PIN                     P2_11
+      #define E0_CS_PIN                    P3_25
+      #define E1_CS_PIN                    P1_31
     #endif
 
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -201,16 +206,16 @@
       #if SD_CONNECTION_IS(LCD)
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
       #endif
-      #define X_CS_PIN      P0_02
-      #define Y_CS_PIN      P0_03
-      #define Z_CS_PIN      P2_06
+      #define X_CS_PIN                     P0_02
+      #define Y_CS_PIN                     P0_03
+      #define Z_CS_PIN                     P2_06
       // We use SD_DETECT_PIN for E0
       #undef SD_DETECT_PIN
-      #define E0_CS_PIN     P1_31
+      #define E0_CS_PIN                    P1_31
       // We use LCD_SDSS pin for E1
-      #undef  LCD_SDSS
-      #define LCD_SDSS      -1
-      #define E1_CS_PIN     P1_23
+      #undef LCD_SDSS
+      #define LCD_SDSS                     -1
+      #define E1_CS_PIN                    P1_23
     #endif
 
     // Example 3: Use the driver enable pins for chip-select.
@@ -218,11 +223,11 @@
     //            advanced features (like driver monitoring) will not be available.
     //#define SKR_USE_ENABLE_CS
     #if ENABLED(SKR_USE_ENABLE_FOR_CS)
-      #define X_CS_PIN      X_ENABLE_PIN
-      #define Y_CS_PIN      Y_ENABLE_PIN
-      #define Z_CS_PIN      Z_ENABLE_PIN
-      #define E0_CS_PIN     E0_ENABLE_PIN
-      #define E1_CS_PIN     E1_ENABLE_PIN
+      #define X_CS_PIN              X_ENABLE_PIN
+      #define Y_CS_PIN              Y_ENABLE_PIN
+      #define Z_CS_PIN              Z_ENABLE_PIN
+      #define E0_CS_PIN            E0_ENABLE_PIN
+      #define E1_CS_PIN            E1_ENABLE_PIN
     #endif
 
   #endif // SOFTWARE_DRIVER_ENABLE
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index bd0ad468de0b..1d1ad60f2474 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -23,110 +23,116 @@
 
 #define BOARD_INFO_NAME "BIGTREE SKR 1.3"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 /**
  * Trinamic Stallguard pins
  */
-#define X_DIAG_PIN           P1_29   // X-
-#define Y_DIAG_PIN           P1_27   // Y-
-#define Z_DIAG_PIN           P1_25   // Z-
-#define E0_DIAG_PIN          P1_28   // X+
-#define E1_DIAG_PIN          P1_26   // Y+
+#define X_DIAG_PIN                         P1_29  // X-
+#define Y_DIAG_PIN                         P1_27  // Y-
+#define Z_DIAG_PIN                         P1_25  // Z-
+#define E0_DIAG_PIN                        P1_28  // X+
+#define E1_DIAG_PIN                        P1_26  // Y+
 
 /**
  * Limit Switches
  */
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN         X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN        P1_28   // X+
+    #define X_MAX_PIN                      P1_28  // X+
   #else
-    #define X_MIN_PIN        P1_28   // X+
+    #define X_MIN_PIN                      P1_28  // X+
   #endif
 #else
-  #define X_MIN_PIN          P1_29   // X-
-  #define X_MAX_PIN          P1_28   // X+
+  #define X_MIN_PIN                        P1_29  // X-
+  #define X_MAX_PIN                        P1_28  // X+
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN         Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN        P1_26   // Y+
+    #define Y_MAX_PIN                      P1_26  // Y+
   #else
-    #define Y_MIN_PIN        P1_26   // Y+
+    #define Y_MIN_PIN                      P1_26  // Y+
   #endif
 #else
-  #define Y_MIN_PIN          P1_27   // Y-
-  #define Y_MAX_PIN          P1_26   // Y+
+  #define Y_MIN_PIN                        P1_27  // Y-
+  #define Y_MAX_PIN                        P1_26  // Y+
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN         Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN        P1_24   // Z+
+    #define Z_MAX_PIN                      P1_24  // Z+
   #else
-    #define Z_MIN_PIN        P1_24   // Z+
+    #define Z_MIN_PIN                      P1_24  // Z+
   #endif
 #else
-  #define Z_MIN_PIN          P1_25   // Z-
-  #define Z_MAX_PIN          P1_24   // Z+
+  #define Z_MIN_PIN                        P1_25  // Z-
+  #define Z_MAX_PIN                        P1_24  // Z+
 #endif
 
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
 
 //
 // Servos
 //
 #ifndef SERVO0_PIN
-  #define SERVO0_PIN       P2_00
+  #define SERVO0_PIN                       P2_00
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_24
+  #define Z_MIN_PROBE_PIN                  P1_24
 #endif
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_28
+  #define FIL_RUNOUT_PIN                   P1_28
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_06
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_06
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_17
+  #define X_CS_PIN                         P1_17
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_15
+  #define Y_CS_PIN                         P1_15
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10
+  #define Z_CS_PIN                         P1_10
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_08
+  #define E0_CS_PIN                        P1_08
 #endif
 
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01
+  #define E1_CS_PIN                        P1_01
 #endif
 
 //
@@ -134,17 +140,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P4_28
+    #define TMC_SW_MOSI                    P4_28
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -166,20 +172,20 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P4_29
-  #define X_SERIAL_RX_PIN  P1_17
+  #define X_SERIAL_TX_PIN                  P4_29
+  #define X_SERIAL_RX_PIN                  P1_17
 
-  #define Y_SERIAL_TX_PIN  P1_16
-  #define Y_SERIAL_RX_PIN  P1_15
+  #define Y_SERIAL_TX_PIN                  P1_16
+  #define Y_SERIAL_RX_PIN                  P1_15
 
-  #define Z_SERIAL_TX_PIN  P1_14
-  #define Z_SERIAL_RX_PIN  P1_10
+  #define Z_SERIAL_TX_PIN                  P1_14
+  #define Z_SERIAL_RX_PIN                  P1_10
 
-  #define E0_SERIAL_TX_PIN P1_09
-  #define E0_SERIAL_RX_PIN P1_08
+  #define E0_SERIAL_TX_PIN                 P1_09
+  #define E0_SERIAL_RX_PIN                 P1_08
 
-  #define E1_SERIAL_TX_PIN P1_04
-  #define E1_SERIAL_RX_PIN P1_01
+  #define E1_SERIAL_TX_PIN                 P1_04
+  #define E1_SERIAL_RX_PIN                 P1_01
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -196,23 +202,23 @@
  *               EXP2                                               EXP1
  */
 
-#define EXPA1_03_PIN        P1_23
-#define EXPA1_04_PIN        P1_22
-#define EXPA1_05_PIN        P1_21
-#define EXPA1_06_PIN        P1_20
-#define EXPA1_07_PIN        P1_19
-#define EXPA1_08_PIN        P1_18
-#define EXPA1_09_PIN        P0_28
-#define EXPA1_10_PIN        P1_30
-
-#define EXPA2_03_PIN        -1
-#define EXPA2_04_PIN        P1_31
-#define EXPA2_05_PIN        P0_18
-#define EXPA2_06_PIN        P3_25
-#define EXPA2_07_PIN        P0_16
-#define EXPA2_08_PIN        P3_26
-#define EXPA2_09_PIN        P0_15
-#define EXPA2_10_PIN        P0_17
+#define EXPA1_03_PIN                       P1_23
+#define EXPA1_04_PIN                       P1_22
+#define EXPA1_05_PIN                       P1_21
+#define EXPA1_06_PIN                       P1_20
+#define EXPA1_07_PIN                       P1_19
+#define EXPA1_08_PIN                       P1_18
+#define EXPA1_09_PIN                       P0_28
+#define EXPA1_10_PIN                       P1_30
+
+#define EXPA2_03_PIN                       -1
+#define EXPA2_04_PIN                       P1_31
+#define EXPA2_05_PIN                       P0_18
+#define EXPA2_06_PIN                       P3_25
+#define EXPA2_07_PIN                       P0_16
+#define EXPA2_08_PIN                       P3_26
+#define EXPA2_09_PIN                       P0_15
+#define EXPA2_10_PIN                       P0_17
 
 #if HAS_SPI_LCD
 
@@ -241,75 +247,75 @@
     *                   LCD                             LCD
     */
 
-    #define LCD_PINS_RS    EXPA1_03_PIN
+    #define LCD_PINS_RS             EXPA1_03_PIN
 
-    #define BTN_EN1        EXPA1_06_PIN
-    #define BTN_EN2        EXPA1_04_PIN
-    #define BTN_ENC        EXPA1_08_PIN
+    #define BTN_EN1                 EXPA1_06_PIN
+    #define BTN_EN2                 EXPA1_04_PIN
+    #define BTN_ENC                 EXPA1_08_PIN
 
-    #define LCD_PINS_ENABLE EXPA1_05_PIN
-    #define LCD_PINS_D4    EXPA1_07_PIN
+    #define LCD_PINS_ENABLE         EXPA1_05_PIN
+    #define LCD_PINS_D4             EXPA1_07_PIN
 
   #elif ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    EXPA1_04_PIN
+    #define LCD_PINS_RS             EXPA1_04_PIN
 
-    #define BTN_EN1        EXPA1_08_PIN
-    #define BTN_EN2        EXPA1_06_PIN
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
+    #define BTN_EN1                 EXPA1_08_PIN
+    #define BTN_EN2                 EXPA1_06_PIN
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
-    #define LCD_PINS_D4    EXPA1_05_PIN
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
+    #define LCD_PINS_D4             EXPA1_05_PIN
 
-  #else // !CR10_STOCKDISPLAY
+  #else                                           // !CR10_STOCKDISPLAY
 
-    #define LCD_PINS_RS    EXPA1_07_PIN
+    #define LCD_PINS_RS             EXPA1_07_PIN
 
-    #define BTN_EN1        EXPA2_08_PIN   // (31) J3-2 & AUX-4
-    #define BTN_EN2        EXPA2_06_PIN   // (33) J3-4 & AUX-4
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
+    #define BTN_EN1                 EXPA2_08_PIN  // (31) J3-2 & AUX-4
+    #define BTN_EN2                 EXPA2_06_PIN  // (33) J3-4 & AUX-4
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXPA1_08_PIN
-    #define LCD_PINS_D4    EXPA1_06_PIN
+    #define LCD_PINS_ENABLE         EXPA1_08_PIN
+    #define LCD_PINS_D4             EXPA1_06_PIN
 
-    #define LCD_SDSS       EXPA2_07_PIN   // (16) J3-7 & AUX-4
-    #define SD_DETECT_PIN  EXPA2_04_PIN   // (49) (NOT 5V tolerant)
+    #define LCD_SDSS                EXPA2_07_PIN  // (16) J3-7 & AUX-4
+    #define SD_DETECT_PIN           EXPA2_04_PIN  // (49) (NOT 5V tolerant)
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    EXPA1_08_PIN
-      #define DOGLCD_A0    EXPA1_07_PIN
-      #define DOGLCD_SCK   EXPA2_09_PIN
-      #define DOGLCD_MOSI  EXPA2_05_PIN
+      #define DOGLCD_CS             EXPA1_08_PIN
+      #define DOGLCD_A0             EXPA1_07_PIN
+      #define DOGLCD_SCK            EXPA2_09_PIN
+      #define DOGLCD_MOSI           EXPA2_05_PIN
 
-      #define LCD_BACKLIGHT_PIN -1
+      #define LCD_BACKLIGHT_PIN            -1
 
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN EXPA1_06_PIN   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN EXPA1_05_PIN
+          #define RGB_LED_R_PIN     EXPA1_05_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN EXPA1_04_PIN
+          #define RGB_LED_G_PIN     EXPA1_04_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN EXPA1_03_PIN
+          #define RGB_LED_B_PIN     EXPA1_03_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    EXPA1_05_PIN
+        #define NEOPIXEL_PIN        EXPA1_05_PIN
       #endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
 
-        #define DOGLCD_CS    EXPA1_05_PIN
-        #define DOGLCD_A0    EXPA1_04_PIN
-        #define DOGLCD_SCK   EXPA2_09_PIN
-        #define DOGLCD_MOSI  EXPA2_05_PIN
+        #define DOGLCD_CS           EXPA1_05_PIN
+        #define DOGLCD_A0           EXPA1_04_PIN
+        #define DOGLCD_SCK          EXPA2_09_PIN
+        #define DOGLCD_MOSI         EXPA2_05_PIN
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 
@@ -325,21 +331,21 @@
          *                    EXP1
          */
 
-        #define BTN_EN1      EXPA1_08_PIN
-        #define BTN_EN2      EXPA1_06_PIN
-        #define BTN_ENC      EXPA1_09_PIN
-        #define DOGLCD_CS    EXPA1_04_PIN
-        #define DOGLCD_A0    EXPA1_05_PIN
-        #define DOGLCD_SCK   EXPA1_10_PIN
-        #define DOGLCD_MOSI  EXPA1_03_PIN
+        #define BTN_EN1             EXPA1_08_PIN
+        #define BTN_EN2             EXPA1_06_PIN
+        #define BTN_ENC             EXPA1_09_PIN
+        #define DOGLCD_CS           EXPA1_04_PIN
+        #define DOGLCD_A0           EXPA1_05_PIN
+        #define DOGLCD_SCK          EXPA1_10_PIN
+        #define DOGLCD_MOSI         EXPA1_03_PIN
         #define FORCE_SOFT_SPI
-        #define LCD_BACKLIGHT_PIN -1
+        #define LCD_BACKLIGHT_PIN          -1
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 EXPA1_05_PIN
-        #define LCD_PINS_D6 EXPA1_04_PIN
-        #define LCD_PINS_D7 EXPA1_03_PIN
+        #define LCD_PINS_D5         EXPA1_05_PIN
+        #define LCD_PINS_D6         EXPA1_04_PIN
+        #define LCD_PINS_D7         EXPA1_03_PIN
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -353,11 +359,11 @@
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           EXPA2_07_PIN
+  #define SS_PIN                    EXPA2_07_PIN
 #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 316049d6b127..7e722ea45f86 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -25,147 +25,157 @@
   #define BOARD_INFO_NAME "BIGTREE SKR 1.4"
 #endif
 
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
 //
 // SD Connection
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 //
 // Servos
 //
-#define SERVO0_PIN         P2_00
+#define SERVO0_PIN                         P2_00
 
 //
 // TMC StallGuard DIAG pins
 //
-#define X_DIAG_PIN         P1_29   // X-STOP
-#define Y_DIAG_PIN         P1_28   // Y-STOP
-#define Z_DIAG_PIN         P1_27   // Z-STOP
-#define E0_DIAG_PIN        P1_26   // E0DET
-#define E1_DIAG_PIN        P1_25   // E1DET
+#define X_DIAG_PIN                         P1_29  // X-STOP
+#define Y_DIAG_PIN                         P1_28  // Y-STOP
+#define Z_DIAG_PIN                         P1_27  // Z-STOP
+#define E0_DIAG_PIN                        P1_26  // E0DET
+#define E1_DIAG_PIN                        P1_25  // E1DET
 
 //
 // Limit Switches
 //
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN       X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN      P1_26   // E0DET
+    #define X_MAX_PIN                      P1_26  // E0DET
   #else
-    #define X_MIN_PIN      P1_26   // E0DET
+    #define X_MIN_PIN                      P1_26  // E0DET
   #endif
 #else
-  #define X_STOP_PIN       P1_29   // X-STOP
+  #define X_STOP_PIN                       P1_29  // X-STOP
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN      P1_25   // E1DET
+    #define Y_MAX_PIN                      P1_25  // E1DET
   #else
-    #define Y_MIN_PIN      P1_25   // E1DET
+    #define Y_MIN_PIN                      P1_25  // E1DET
   #endif
 #else
-  #define Y_STOP_PIN       P1_28   // Y-STOP
+  #define Y_STOP_PIN                       P1_28  // Y-STOP
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN       Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN      P1_00   // PWRDET
+    #define Z_MAX_PIN                      P1_00  // PWRDET
   #else
-    #define Z_MIN_PIN      P1_00   // PWRDET
+    #define Z_MIN_PIN                      P1_00  // PWRDET
   #endif
 #else
-  #define Z_STOP_PIN       P1_27   // Z-STOP
+  #ifndef Z_STOP_PIN
+    #define Z_STOP_PIN                     P1_27  // Z-STOP
+  #endif
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P0_10
+  #define Z_MIN_PROBE_PIN                  P0_10
 #endif
 
 //
 // Filament Runout Sensor
 //
-#define FIL_RUNOUT_PIN     P1_26   // E0DET
-#define FIL_RUNOUT2_PIN    P1_25   // E1DET
+#define FIL_RUNOUT_PIN                     P1_26  // E0DET
+#define FIL_RUNOUT2_PIN                    P1_25  // E1DET
 
 //
 // Power Supply Control
 //
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        P1_00   // PWRDET
+  #define PS_ON_PIN                        P1_00  // PWRDET
 #endif
 
 //
 // Power Loss Detection
 //
 #ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN   P1_00   // PWRDET
+  #define POWER_LOSS_PIN                   P1_00  // PWRDET
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_06
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_06
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_10
+  #define X_CS_PIN                         P1_10
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_09
+  #define Y_CS_PIN                         P1_09
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_08
+  #define Z_CS_PIN                         P1_08
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_04
+  #define E0_CS_PIN                        P1_04
 #endif
 
-#define E1_STEP_PIN        P1_15
-#define E1_DIR_PIN         P1_14
-#define E1_ENABLE_PIN      P1_16
+#define E1_STEP_PIN                        P1_15
+#define E1_DIR_PIN                         P1_14
+#define E1_ENABLE_PIN                      P1_16
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01
+  #define E1_CS_PIN                        P1_01
 #endif
 
-#define TEMP_1_PIN         P0_23_A0   // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_BED_PIN       P0_25_A2   // A0 (T0) - (67) - TEMP_BED_PIN
+#define TEMP_1_PIN                      P0_23_A0  // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_BED_PIN                    P0_25_A2  // A0 (T0) - (67) - TEMP_BED_PIN
 
 //
 // Software SPI pins for TMC2130 stepper drivers
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_17
+    #define TMC_SW_MOSI                    P1_17
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -187,23 +197,23 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P1_10
-  #define X_SERIAL_RX_PIN  P1_10
+  #define X_SERIAL_TX_PIN                  P1_10
+  #define X_SERIAL_RX_PIN                  P1_10
 
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_09
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_09
 
-  #define Z_SERIAL_TX_PIN  P1_08
-  #define Z_SERIAL_RX_PIN  P1_08
+  #define Z_SERIAL_TX_PIN                  P1_08
+  #define Z_SERIAL_RX_PIN                  P1_08
 
-  #define E0_SERIAL_TX_PIN P1_04
-  #define E0_SERIAL_RX_PIN P1_04
+  #define E0_SERIAL_TX_PIN                 P1_04
+  #define E0_SERIAL_RX_PIN                 P1_04
 
-  #define E1_SERIAL_TX_PIN P1_01
-  #define E1_SERIAL_RX_PIN P1_01
+  #define E1_SERIAL_TX_PIN                 P1_01
+  #define E1_SERIAL_RX_PIN                 P1_01
 
-  #define Z2_SERIAL_TX_PIN P1_01
-  #define Z2_SERIAL_RX_PIN P1_01
+  #define Z2_SERIAL_TX_PIN                 P1_01
+  #define Z2_SERIAL_RX_PIN                 P1_01
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -213,7 +223,7 @@
 // SD Connection
 //
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P0_16
+  #define SS_PIN                           P0_16
 #endif
 
 /**
@@ -229,82 +239,82 @@
 #if HAS_SPI_LCD
   #if ENABLED(ANET_FULL_GRAPHICS_LCD)
 
-    #define LCD_PINS_RS    P1_23
+    #define LCD_PINS_RS                    P1_23
 
-    #define BTN_EN1        P1_20
-    #define BTN_EN2        P1_22
-    #define BTN_ENC        P1_18
+    #define BTN_EN1                        P1_20
+    #define BTN_EN2                        P1_22
+    #define BTN_ENC                        P1_18
 
-    #define LCD_PINS_ENABLE P1_21
-    #define LCD_PINS_D4    P1_19
+    #define LCD_PINS_ENABLE                P1_21
+    #define LCD_PINS_D4                    P1_19
 
   #elif ENABLED(CR10_STOCKDISPLAY)
-    #define BTN_ENC        P0_28   // (58) open-drain
-    #define LCD_PINS_RS    P1_22
+    #define BTN_ENC                        P0_28  // (58) open-drain
+    #define LCD_PINS_RS                    P1_22
 
-    #define BTN_EN1        P1_18
-    #define BTN_EN2        P1_20
+    #define BTN_EN1                        P1_18
+    #define BTN_EN2                        P1_20
 
-    #define LCD_PINS_ENABLE P1_23
-    #define LCD_PINS_D4    P1_21
+    #define LCD_PINS_ENABLE                P1_23
+    #define LCD_PINS_D4                    P1_21
 
   #else
-    #define BTN_ENC        P0_28   // (58) open-drain
-    #define LCD_PINS_RS    P1_19
+    #define BTN_ENC                        P0_28  // (58) open-drain
+    #define LCD_PINS_RS                    P1_19
 
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
 
-    #define LCD_PINS_ENABLE P1_18
-    #define LCD_PINS_D4    P1_20
+    #define LCD_PINS_ENABLE                P1_18
+    #define LCD_PINS_D4                    P1_20
 
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
 
     #if SD_CONNECTION_IS(LCD)
-      #define SD_DETECT_PIN P1_31  // (49) (NOT 5V tolerant)
+      #define SD_DETECT_PIN                P1_31  // (49) (NOT 5V tolerant)
     #endif
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    P1_18
-      #define DOGLCD_A0    P1_19
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define DOGLCD_CS                    P1_18
+      #define DOGLCD_A0                    P1_19
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_BACKLIGHT_PIN -1
+      #define LCD_BACKLIGHT_PIN            -1
 
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                P1_20  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN P1_21
+          #define RGB_LED_R_PIN            P1_21
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN P1_22
+          #define RGB_LED_G_PIN            P1_22
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN P1_23
+          #define RGB_LED_B_PIN            P1_23
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    P1_21
+        #define NEOPIXEL_PIN               P1_21
       #endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
-        #define DOGLCD_CS   P1_21
-        #define DOGLCD_A0   P1_22
-        #define DOGLCD_SCK  P0_15
-        #define DOGLCD_MOSI P0_18
+        #define DOGLCD_CS                  P1_21
+        #define DOGLCD_A0                  P1_22
+        #define DOGLCD_SCK                 P0_15
+        #define DOGLCD_MOSI                P0_18
         #define FORCE_SOFT_SPI
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 P1_21
-        #define LCD_PINS_D6 P1_22
-        #define LCD_PINS_D7 P1_23
+        #define LCD_PINS_D5                P1_21
+        #define LCD_PINS_D6                P1_22
+        #define LCD_PINS_D7                P1_23
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -317,7 +327,7 @@
 // Neopixel LED
 //
 #ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN      P1_24
+  #define NEOPIXEL_PIN                     P1_24
 #endif
 
 /**
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index fc08a60b91d6..63e160d8a076 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -32,17 +32,21 @@
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
 
+#if DISABLED(SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+#endif
+
 //
 // Steppers
 //
 #ifndef E1_STEP_PIN
-  #define E1_STEP_PIN      P0_01
+  #define E1_STEP_PIN                      P0_01
 #endif
 #ifndef E1_DIR_PIN
-  #define E1_DIR_PIN       P0_00
+  #define E1_DIR_PIN                       P0_00
 #endif
 #ifndef E1_ENABLE_PIN
-  #define E1_ENABLE_PIN    P0_10
+  #define E1_ENABLE_PIN                    P0_10
 #endif
 
 //
@@ -50,63 +54,64 @@
 //  3.3V max when defined as an analog input
 //
 #ifndef TEMP_0_PIN
-  #define TEMP_0_PIN       P0_24_A1   // A1 (T1) - (68) - TEMP_0_PIN
+  #define TEMP_0_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_0_PIN
 #endif
 #ifndef TEMP_1_PIN
-  #define TEMP_1_PIN       P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
+  #define TEMP_1_PIN                    P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
 #endif
 #ifndef TEMP_BED_PIN
-  #define TEMP_BED_PIN     P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
+  #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
 #endif
+
 #if HOTENDS == 1 && TEMP_SENSOR_PROBE
-  #define TEMP_PROBE_PIN   P0_25_A2   // TEMP_1_PIN
+  #define TEMP_PROBE_PIN              TEMP_1_PIN
 #endif
 
 //
 // Heaters / Fans
 //
 #ifndef HEATER_0_PIN
-  #define HEATER_0_PIN     P2_07
+  #define HEATER_0_PIN                     P2_07
 #endif
 #if HOTENDS == 1
   #ifndef FAN1_PIN
-    #define FAN1_PIN       P2_04
+    #define FAN1_PIN                       P2_04
   #endif
 #else
   #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN   P2_04
+    #define HEATER_1_PIN                   P2_04
   #endif
 #endif
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_03
+  #define FAN_PIN                          P2_03
 #endif
 #ifndef HEATER_BED_PIN
-  #define HEATER_BED_PIN   P2_05
+  #define HEATER_BED_PIN                   P2_05
 #endif
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_30   // (37) not 5V tolerant
+  #define BEEPER_PIN                       P1_30  // (37) not 5V tolerant
 #endif
 
 //
 // SD Support
 //
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 28445962ac7b..32de7bb74082 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -30,6 +30,12 @@
 // Ignore temp readings during develpment.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Enable 12MHz clock output on P1.27 pin to sync TMC2208 chip clocks
 //
@@ -38,63 +44,63 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_26   // PWM1[6]
-#define SERVO1_PIN         P1_18   // PWM1[1]
+#define SERVO0_PIN                         P1_26  // PWM1[6]
+#define SERVO1_PIN                         P1_18  // PWM1[1]
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P0_00
-#define X_MAX_PIN          P0_01
-#define Y_MIN_PIN          P0_10
-#define Y_MAX_PIN          P0_21
-#define Z_MIN_PIN          P2_13
-#define Z_MAX_PIN          P2_22
+#define X_MIN_PIN                          P0_00
+#define X_MAX_PIN                          P0_01
+#define Y_MIN_PIN                          P0_10
+#define Y_MAX_PIN                          P0_21
+#define Z_MIN_PIN                          P2_13
+#define Z_MAX_PIN                          P2_22
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         P1_01
-#define X_DIR_PIN          P1_04
-#define X_ENABLE_PIN       P0_26
+#define X_STEP_PIN                         P1_01
+#define X_DIR_PIN                          P1_04
+#define X_ENABLE_PIN                       P0_26
 
-#define Y_STEP_PIN         P1_10
-#define Y_DIR_PIN          P1_14
-#define Y_ENABLE_PIN       P1_08
+#define Y_STEP_PIN                         P1_10
+#define Y_DIR_PIN                          P1_14
+#define Y_ENABLE_PIN                       P1_08
 
-#define Z_STEP_PIN         P1_17
-#define Z_DIR_PIN          P4_29
-#define Z_ENABLE_PIN       P1_15
+#define Z_STEP_PIN                         P1_17
+#define Z_DIR_PIN                          P4_29
+#define Z_ENABLE_PIN                       P1_15
 
-#define E0_STEP_PIN        P0_05
-#define E0_DIR_PIN         P2_00
-#define E0_ENABLE_PIN      P4_28
+#define E0_STEP_PIN                        P0_05
+#define E0_DIR_PIN                         P2_00
+#define E0_ENABLE_PIN                      P4_28
 
-#define E1_STEP_PIN        P2_03
-#define E1_DIR_PIN         P2_04
-#define E1_ENABLE_PIN      P2_01
+#define E1_STEP_PIN                        P2_03
+#define E1_DIR_PIN                         P2_04
+#define E1_ENABLE_PIN                      P2_01
 
-#define E2_STEP_PIN        P2_07
-#define E2_DIR_PIN         P2_08
-#define E2_ENABLE_PIN      P2_05
+#define E2_STEP_PIN                        P2_07
+#define E2_DIR_PIN                         P2_08
+#define E2_ENABLE_PIN                      P2_05
 
 //
 // TMC2208 UART pins
 //
 #if HAS_TMC_UART
-  #define X_SERIAL_TX_PIN  P1_00
-  #define X_SERIAL_RX_PIN  P1_00
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_09
-  #define Z_SERIAL_TX_PIN  P1_16
-  #define Z_SERIAL_RX_PIN  P1_16
-  #define E0_SERIAL_TX_PIN P0_04
-  #define E0_SERIAL_RX_PIN P0_04
-  #define E1_SERIAL_TX_PIN P2_02
-  #define E1_SERIAL_RX_PIN P2_02
-  #define E2_SERIAL_TX_PIN P2_06
-  #define E2_SERIAL_RX_PIN P2_06
+  #define X_SERIAL_TX_PIN                  P1_00
+  #define X_SERIAL_RX_PIN                  P1_00
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_09
+  #define Z_SERIAL_TX_PIN                  P1_16
+  #define Z_SERIAL_RX_PIN                  P1_16
+  #define E0_SERIAL_TX_PIN                 P0_04
+  #define E0_SERIAL_RX_PIN                 P0_04
+  #define E1_SERIAL_TX_PIN                 P2_02
+  #define E1_SERIAL_RX_PIN                 P2_02
+  #define E2_SERIAL_TX_PIN                 P2_06
+  #define E2_SERIAL_RX_PIN                 P2_06
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -106,36 +112,36 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_24_A1   // AD0[0] on P0_23
-#define TEMP_BED_PIN        P0_23_A0   // AD0[1] on P0_24
+#define TEMP_0_PIN                      P0_24_A1  // AD0[0] on P0_23
+#define TEMP_BED_PIN                    P0_23_A0  // AD0[1] on P0_24
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P1_19 // Not a PWM pin, software PWM required
-#define HEATER_0_PIN       P3_26 // PWM1[3]
-#define FAN_PIN            P3_25 // Part cooling fan - connected to PWM1[2]
-#define E0_AUTO_FAN_PIN    P0_27 // Extruder cooling fan
+#define HEATER_BED_PIN                     P1_19  // Not a PWM pin, software PWM required
+#define HEATER_0_PIN                       P3_26  // PWM1[3]
+#define FAN_PIN                            P3_25  // Part cooling fan - connected to PWM1[2]
+#define E0_AUTO_FAN_PIN                    P0_27  // Extruder cooling fan
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P1_31
+#define LED_PIN                            P1_31
 
 //
 // LCD
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-  #define BEEPER_PIN       P0_19
-  #define BTN_EN1          P1_23
-  #define BTN_EN2          P1_24
-  #define BTN_ENC          P1_25
-  #define LCD_PINS_RS      P0_20
-  #define LCD_PINS_ENABLE  P0_21
-  #define LCD_PINS_D4      P2_11
-  #define LCD_PINS_D5      P0_22
-  #define LCD_PINS_D6      P1_29
-  #define LCD_PINS_D7      P1_28
+  #define BEEPER_PIN                       P0_19
+  #define BTN_EN1                          P1_23
+  #define BTN_EN2                          P1_24
+  #define BTN_ENC                          P1_25
+  #define LCD_PINS_RS                      P0_20
+  #define LCD_PINS_ENABLE                  P0_21
+  #define LCD_PINS_D4                      P2_11
+  #define LCD_PINS_D5                      P0_22
+  #define LCD_PINS_D6                      P1_29
+  #define LCD_PINS_D7                      P1_28
 #endif
 
 //
@@ -143,21 +149,21 @@
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           P0_16
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                           P0_16
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index b3dba6794c9a..0cd10ebc0500 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -38,73 +38,81 @@
   #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SBASE"
 #endif
 
-#define LED_PIN            P1_18   // Used as a status indicator
-#define LED2_PIN           P1_19
-#define LED3_PIN           P1_20
-#define LED4_PIN           P1_21
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
+#define LED_PIN                            P1_18  // Used as a status indicator
+#define LED2_PIN                           P1_19
+#define LED3_PIN                           P1_20
+#define LED4_PIN                           P1_21
 
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23   // J8-3 (low jitter)
-#define SERVO1_PIN         P2_12   // J8-4
-#define SERVO2_PIN         P2_11   // J8-5
-#define SERVO3_PIN         P4_28   // J8-6
+#define SERVO0_PIN                         P1_23  // J8-3 (low jitter)
+#define SERVO1_PIN                         P2_12  // J8-4
+#define SERVO2_PIN                         P2_11  // J8-5
+#define SERVO3_PIN                         P4_28  // J8-6
 
 //
 // Limit Switches - Not Interrupt Capable
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_28   // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P4_28   // Connector J8
+  #define Z_MIN_PROBE_PIN                  P4_28  // Connector J8
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-#define TEMP_2_PIN          P0_26_A3   // A3 (TH4)
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
+#define TEMP_2_PIN                      P0_26_A3  // A3 (TH4)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P2_06
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P2_06
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
@@ -116,56 +124,56 @@
 // 5V
 // NC
 // GND
-#define PIN_P0_17          P0_17
-#define PIN_P0_16          P0_16
-#define PIN_P0_15          P0_15
+#define PIN_P0_17                          P0_17
+#define PIN_P0_16                          P0_16
+#define PIN_P0_15                          P0_15
 
 //
 // Connector J8
 //
 
 // GND
-#define PIN_P1_22          P1_22
-#define PIN_P1_23          P1_23   // PWM Capable
-#define PIN_P2_12          P2_12   // Interrupt Capable
-#define PIN_P2_11          P2_11   // Interrupt Capable
+#define PIN_P1_22                          P1_22
+#define PIN_P1_23                          P1_23  // PWM Capable
+#define PIN_P2_12                          P2_12  // Interrupt Capable
+#define PIN_P2_11                          P2_11  // Interrupt Capable
 
 //
 // Průša i3 MK2 Multi Material Multiplexer Support
 //
 #if ENABLED(MK2_MULTIPLEXER)
-  #define E_MUX0_PIN       P1_23   // J8-3
-  #define E_MUX1_PIN       P2_12   // J8-4
-  #define E_MUX2_PIN       P2_11   // J8-5
+  #define E_MUX0_PIN                       P1_23  // J8-3
+  #define E_MUX1_PIN                       P2_12  // J8-4
+  #define E_MUX2_PIN                       P2_11  // J8-5
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          P0_25   // TH3 Connector
+#define PS_ON_PIN                          P0_25  // TH3 Connector
 
 //
 // Ethernet pins
 //
 #ifndef ULTIPANEL
-  #define ENET_MDIO        P1_17   // J12-4
-  #define ENET_RX_ER       P1_14   // J12-6
-  #define ENET_RXD1        P1_10   // J12-8
+  #define ENET_MDIO                        P1_17  // J12-4
+  #define ENET_RX_ER                       P1_14  // J12-6
+  #define ENET_RXD1                        P1_10  // J12-8
 #endif
 
-#define ENET_MOC           P1_16   // J12-3
-#define REF_CLK            P1_15   // J12-5
-#define ENET_RXD0          P1_09   // J12-7
-#define ENET_CRS           P1_08   // J12-9
-#define ENET_TX_EN         P1_04   // J12-10
-#define ENET_TXD0          P1_00   // J12-11
-#define ENET_TXD1          P1_01   // J12-12
+#define ENET_MOC                           P1_16  // J12-3
+#define REF_CLK                            P1_15  // J12-5
+#define ENET_RXD0                          P1_09  // J12-7
+#define ENET_CRS                           P1_08  // J12-9
+#define ENET_TX_EN                         P1_04  // J12-10
+#define ENET_TXD0                          P1_00  // J12-11
+#define ENET_TXD1                          P1_01  // J12-12
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
 
@@ -181,27 +189,27 @@
    * If you can't find a pin to use for the LCD's SD_DETECT then comment out
    * SD_DETECT_PIN entirely and remove that wire from the the custom cable.
    */
-  #define SD_DETECT_PIN    P2_11   // J8-5 (moved from EXP2 P0.27)
-  #define SCK_PIN          P1_22   // J8-2 (moved from EXP2 P0.7)
-  #define MISO_PIN         P1_23   // J8-3 (moved from EXP2 P0.8)
-  #define MOSI_PIN         P2_12   // J8-4 (moved from EXP2 P0.9)
-  #define SS_PIN           P0_28
-  #define LPC_SOFTWARE_SPI  // With a custom cable we need software SPI because the
-                            // selected pins are not on a hardware SPI controller
+  #define SD_DETECT_PIN                    P2_11  // J8-5 (moved from EXP2 P0.27)
+  #define SCK_PIN                          P1_22  // J8-2 (moved from EXP2 P0.7)
+  #define MISO_PIN                         P1_23  // J8-3 (moved from EXP2 P0.8)
+  #define MOSI_PIN                         P2_12  // J8-4 (moved from EXP2 P0.9)
+  #define SS_PIN                           P0_28
+  #define LPC_SOFTWARE_SPI                        // With a custom cable we need software SPI because the
+                                                  // selected pins are not on a hardware SPI controller
 #elif SD_CONNECTION_IS(LCD)
   // use standard cable and header, SPI and SD detect sre shared with on-board SD card
   // hardware SPI is used for both SD cards. The detect pin is shred between the
   // LCD and onboard SD readers so we disable it.
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           P0_28
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN                           P0_28
 #elif SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #endif
 
 /**
@@ -218,17 +226,17 @@
  */
 
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_31   // EXP1.1
-  #define BTN_ENC          P1_30   // EXP1.2
-  #define BTN_EN1          P3_26   // EXP2.5
-  #define BTN_EN2          P3_25   // EXP2.3
-  #define LCD_PINS_RS      P0_16   // EXP1.4
-  #define LCD_SDSS         P0_28   // EXP2.4
-  #define LCD_PINS_ENABLE  P0_18   // EXP1.3
-  #define LCD_PINS_D4      P0_15   // EXP1.5
+  #define BEEPER_PIN                       P1_31  // EXP1.1
+  #define BTN_ENC                          P1_30  // EXP1.2
+  #define BTN_EN1                          P3_26  // EXP2.5
+  #define BTN_EN2                          P3_25  // EXP2.3
+  #define LCD_PINS_RS                      P0_16  // EXP1.4
+  #define LCD_SDSS                         P0_28  // EXP2.4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1.3
+  #define LCD_PINS_D4                      P0_15  // EXP1.5
   #if ANY(VIKI2, miniVIKI)
-    #define DOGLCD_SCK     SCK_PIN
-    #define DOGLCD_MOSI    MOSI_PIN
+    #define DOGLCD_SCK                   SCK_PIN
+    #define DOGLCD_MOSI                 MOSI_PIN
   #endif
 
   #if ENABLED(FYSETC_MINI_12864)
@@ -243,26 +251,26 @@
      * Pins 6, 7 & 8 on EXP2 are no connects. That means a second special
      * cable will be needed if the RGB LEDs are to be active.
      */
-    #define DOGLCD_CS      LCD_PINS_ENABLE // EXP1.3  (LCD_EN on FYSETC schematic)
-    #define DOGLCD_A0      LCD_PINS_RS     // EXP1.4  (LCD_A0 on FYSETC schematic)
-    #define DOGLCD_SCK     P2_11           // J8-5  (SCK on FYSETC schematic)
-    #define DOGLCD_MOSI    P4_28           // J8-6  (MOSI on FYSETC schematic)
+    #define DOGLCD_CS            LCD_PINS_ENABLE  // EXP1.3  (LCD_EN on FYSETC schematic)
+    #define DOGLCD_A0                LCD_PINS_RS  // EXP1.4  (LCD_A0 on FYSETC schematic)
+    #define DOGLCD_SCK                     P2_11  // J8-5  (SCK on FYSETC schematic)
+    #define DOGLCD_MOSI                    P4_28  // J8-6  (MOSI on FYSETC schematic)
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN P2_12        // J8-4  (LCD_D6 on FYSETC schematic)
+        #define RGB_LED_R_PIN              P2_12  // J8-4  (LCD_D6 on FYSETC schematic)
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN P1_23        // J8-3  (LCD_D5 on FYSETC schematic)
+        #define RGB_LED_G_PIN              P1_23  // J8-3  (LCD_D5 on FYSETC schematic)
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN P1_22        // J8-2  (LCD_D7 on FYSETC schematic)
+        #define RGB_LED_B_PIN              P1_22  // J8-2  (LCD_D7 on FYSETC schematic)
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN P2_12
+      #define NEOPIXEL_PIN                 P2_12
     #endif
 
   #elif ENABLED(MINIPANEL)
@@ -283,29 +291,29 @@
 
 #if HAS_DRIVER(TMC2130)
   // J8
-  #define X_CS_PIN         P1_22
-  #define Y_CS_PIN         P1_23
-  #define Z_CS_PIN         P2_12
-  #define E0_CS_PIN        P2_11
-  #define E1_CS_PIN        P4_28
+  #define X_CS_PIN                         P1_22
+  #define Y_CS_PIN                         P1_23
+  #define Z_CS_PIN                         P2_12
+  #define E0_CS_PIN                        P2_11
+  #define E1_CS_PIN                        P4_28
 
 // Hardware SPI is on EXP2. See if you can make it work:
 // https://github.com/makerbase-mks/MKS-SBASE/issues/25
 #define TMC_USE_SW_SPI
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P0_03   // AUX1
+    #define TMC_SW_MOSI                    P0_03  // AUX1
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_02   // AUX1
+    #define TMC_SW_MISO                    P0_02  // AUX1
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_26   // TH4
+    #define TMC_SW_SCK                     P0_26  // TH4
   #endif
  #endif
 #endif
 
-#if MB(MKS_SBASE) && HAS_TMC220x
+#if MB(MKS_SBASE) && HAS_TMC_UART
 
   /**
    * TMC2208/TMC2209 stepper drivers
@@ -314,24 +322,24 @@
    * Worst case you may have to give up the LCD
    * RX pins need to be interrupt capable
    */
-  #define X_SERIAL_TX_PIN  P1_22   // J8-2
-  #define X_SERIAL_RX_PIN  P2_12   // J8-4 Interrupt Capable
-  #define Y_SERIAL_TX_PIN  P1_23   // J8-3
-  #define Y_SERIAL_RX_PIN  P2_11   // J8-5 Interrupt Capable
-  #define Z_SERIAL_TX_PIN  P2_12   // J8-4
-  #define Z_SERIAL_RX_PIN  P0_25   // TH3
-  #define E0_SERIAL_TX_PIN P4_28   // J8-6
-  #define E0_SERIAL_RX_PIN P0_26   // TH4
+  #define X_SERIAL_TX_PIN                  P1_22  // J8-2
+  #define X_SERIAL_RX_PIN                  P2_12  // J8-4 Interrupt Capable
+  #define Y_SERIAL_TX_PIN                  P1_23  // J8-3
+  #define Y_SERIAL_RX_PIN                  P2_11  // J8-5 Interrupt Capable
+  #define Z_SERIAL_TX_PIN                  P2_12  // J8-4
+  #define Z_SERIAL_RX_PIN                  P0_25  // TH3
+  #define E0_SERIAL_TX_PIN                 P4_28  // J8-6
+  #define E0_SERIAL_RX_PIN                 P0_26  // TH4
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
 #endif
 
 // UNUSED
-#define PIN_P0_27          P0_27   // EXP2/Onboard SD
-#define PIN_P0_28          P0_28   // EXP2
-#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_27                          P0_27  // EXP2/Onboard SD
+#define PIN_P0_28                          P0_28  // EXP2
+#define PIN_P0_02                          P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_03                          P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
 
 /**
  *  PWMs
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 58f9eb549337..afbe6d556498 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -32,103 +32,109 @@
 #define BOARD_INFO_NAME   "MKS SGen-L"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23   // SERVO P1.23
-#define SERVO1_PIN         P2_00   // SERVO P2.0
+#define SERVO0_PIN                         P1_23  // SERVO P1.23
+#define SERVO1_PIN                         P2_00  // SERVO P2.0
 
 //
 // Trinamic Stallguard pins
 //
-#define X_DIAG_PIN         P1_29   // X-
-#define Y_DIAG_PIN         P1_27   // Y-
-#define Z_DIAG_PIN         P1_25   // Z-
-#define E0_DIAG_PIN        P1_28   // X+
-#define E1_DIAG_PIN        P1_26   // Y+
+#define X_DIAG_PIN                         P1_29  // X-
+#define Y_DIAG_PIN                         P1_27  // Y-
+#define Z_DIAG_PIN                         P1_25  // Z-
+#define E0_DIAG_PIN                        P1_28  // X+
+#define E1_DIAG_PIN                        P1_26  // Y+
 
 //
 // Limit Switches
 //
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN       X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN      P1_28   // X+
+    #define X_MAX_PIN                      P1_28  // X+
   #else
-    #define X_MIN_PIN      P1_28   // X+
+    #define X_MIN_PIN                      P1_28  // X+
   #endif
 #else
-  #define X_MIN_PIN        P1_29   // X-
-  #define X_MAX_PIN        P1_28   // X+
+  #define X_MIN_PIN                        P1_29  // X-
+  #define X_MAX_PIN                        P1_28  // X+
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN      P1_26   // Y+
+    #define Y_MAX_PIN                      P1_26  // Y+
   #else
-    #define Y_MIN_PIN      P1_26   // Y+
+    #define Y_MIN_PIN                      P1_26  // Y+
   #endif
 #else
-  #define Y_MIN_PIN        P1_27   // Y-
-  #define Y_MAX_PIN        P1_26   // Y+
+  #define Y_MIN_PIN                        P1_27  // Y-
+  #define Y_MAX_PIN                        P1_26  // Y+
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN       Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN      P1_24   // Z+
+    #define Z_MAX_PIN                      P1_24  // Z+
   #else
-    #define Z_MIN_PIN      P1_24   // Z+
+    #define Z_MIN_PIN                      P1_24  // Z+
   #endif
 #else
-  #define Z_MIN_PIN        P1_25   // Z-
-  #define Z_MAX_PIN        P1_24   // Z+
+  #define Z_MIN_PIN                        P1_25  // Z-
+  #define Z_MAX_PIN                        P1_24  // Z+
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_24
+  #define Z_MIN_PROBE_PIN                  P1_24
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_03
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_03
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_01
+  #define X_CS_PIN                         P1_01
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_08
+  #define Y_CS_PIN                         P1_08
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10
+  #define Z_CS_PIN                         P1_10
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_15
+  #define E0_CS_PIN                        P1_15
 #endif
 
-#define E1_STEP_PIN        P0_01
-#define E1_DIR_PIN         P0_00
-#define E1_ENABLE_PIN      P0_10
+#define E1_STEP_PIN                        P0_01
+#define E1_DIR_PIN                         P0_00
+#define E1_ENABLE_PIN                      P0_10
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_17
+  #define E1_CS_PIN                        P1_17
 #endif
 
 //
@@ -136,17 +142,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P4_28
+    #define TMC_SW_MOSI                    P4_28
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -169,23 +175,23 @@
   // Software serial
   //
 
-  #define X_SERIAL_TX_PIN  P1_04
-  #define X_SERIAL_RX_PIN  P1_01
+  #define X_SERIAL_TX_PIN                  P1_04
+  #define X_SERIAL_RX_PIN                  P1_01
 
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_08
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_08
 
-  #define Z_SERIAL_TX_PIN  P1_14
-  #define Z_SERIAL_RX_PIN  P1_10
+  #define Z_SERIAL_TX_PIN                  P1_14
+  #define Z_SERIAL_RX_PIN                  P1_10
 
-  #define E0_SERIAL_TX_PIN P1_16
-  #define E0_SERIAL_RX_PIN P1_15
+  #define E0_SERIAL_TX_PIN                 P1_16
+  #define E0_SERIAL_RX_PIN                 P1_15
 
-  #define E1_SERIAL_TX_PIN P4_29
-  #define E1_SERIAL_RX_PIN P1_17
+  #define E1_SERIAL_TX_PIN                 P4_29
+  #define E1_SERIAL_RX_PIN                 P1_17
 
-  #define Z2_SERIAL_TX_PIN P4_29
-  #define Z2_SERIAL_RX_PIN P1_17
+  #define Z2_SERIAL_TX_PIN                 P4_29
+  #define Z2_SERIAL_RX_PIN                 P1_17
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -195,35 +201,35 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN         P0_23_A0   // Analog Input A0 (TH1)
-#define TEMP_BED_PIN       P0_24_A1   // Analog Input A1 (TB)
-#define TEMP_1_PIN         P0_25_A2   // Analog Input A2 (TH2)
+#define TEMP_0_PIN                      P0_23_A0  // Analog Input A0 (TH1)
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input A1 (TB)
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input A2 (TH2)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
 #if HOTENDS == 1
   #ifndef FAN1_PIN
-    #define FAN1_PIN       P2_06
+    #define FAN1_PIN                       P2_06
   #endif
 #else
   #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN   P2_06
+    #define HEATER_1_PIN                   P2_06
   #endif
 #endif
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P1_18   // Used as a status indicator
-#define LED2_PIN           P1_19
-#define LED3_PIN           P1_20
-#define LED4_PIN           P1_21
+#define LED_PIN                            P1_18  // Used as a status indicator
+#define LED2_PIN                           P1_19
+#define LED3_PIN                           P1_20
+#define LED4_PIN                           P1_21
 
 /**
  *                _____                                            _____
@@ -236,83 +242,83 @@
  *                EXP1                                             EXP2
  */
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_31
-  #define BTN_ENC          P1_30
+  #define BEEPER_PIN                       P1_31
+  #define BTN_ENC                          P1_30
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    P1_00
+    #define LCD_PINS_RS                    P1_00
 
-    #define BTN_EN1        P0_18
-    #define BTN_EN2        P0_15
+    #define BTN_EN1                        P0_18
+    #define BTN_EN2                        P0_15
 
-    #define LCD_PINS_ENABLE P1_22
-    #define LCD_PINS_D4    P0_17
+    #define LCD_PINS_ENABLE                P1_22
+    #define LCD_PINS_D4                    P0_17
 
   #else
 
-    #define BTN_EN1        P3_25
-    #define BTN_EN2        P3_26
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
 
-    #define LCD_SDSS       P0_28
+    #define LCD_SDSS                       P0_28
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC  P0_17
-      #define DOGLCD_CS    P0_16
-      #define DOGLCD_A0    LCD_PINS_DC
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define LCD_PINS_DC                  P0_17
+      #define DOGLCD_CS                    P0_16
+      #define DOGLCD_A0              LCD_PINS_DC
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_PINS_RS  P1_00
-      #define LCD_PINS_D7  P1_22
-      #define KILL_PIN     -1 // NC
+      #define LCD_PINS_RS                  P1_00
+      #define LCD_PINS_D7                  P1_22
+      #define KILL_PIN                     -1     // NC
 
-    #else // !MKS_12864OLED_SSD1306
+    #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS  P0_16
+      #define LCD_PINS_RS                  P0_16
 
-      #define LCD_PINS_ENABLE P0_18
-      #define LCD_PINS_D4  P0_15
+      #define LCD_PINS_ENABLE              P0_18
+      #define LCD_PINS_D4                  P0_15
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS  P0_18
-        #define DOGLCD_A0  P0_16
-        #define DOGLCD_SCK P0_07
-        #define DOGLCD_MOSI P1_20
+        #define DOGLCD_CS                  P0_18
+        #define DOGLCD_A0                  P0_16
+        #define DOGLCD_SCK                 P0_07
+        #define DOGLCD_MOSI                P1_20
 
-        #define LCD_BACKLIGHT_PIN -1
+        #define LCD_BACKLIGHT_PIN          -1
 
-        #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+        #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-        #define LCD_RESET_PIN P0_15   // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN              P0_15  // Must be high or open for LCD to operate normally.
 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
           #ifndef RGB_LED_R_PIN
-            #define RGB_LED_R_PIN P0_17
+            #define RGB_LED_R_PIN          P0_17
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN P1_00
+            #define RGB_LED_G_PIN          P1_00
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN P1_22
+            #define RGB_LED_B_PIN          P1_22
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN    P0_17
+          #define NEOPIXEL_PIN             P0_17
         #endif
 
-      #else // !FYSETC_MINI_12864
+      #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS  P0_17
-          #define DOGLCD_A0  P1_00
+          #define DOGLCD_CS                P0_17
+          #define DOGLCD_A0                P1_00
         #endif
 
         #if ENABLED(ULTIPANEL)
-          #define LCD_PINS_D5 P0_17
-          #define LCD_PINS_D6 P1_00
-          #define LCD_PINS_D7 P1_22
+          #define LCD_PINS_D5              P0_17
+          #define LCD_PINS_D6              P1_00
+          #define LCD_PINS_D7              P1_22
         #endif
 
       #endif // !FYSETC_MINI_12864
@@ -324,20 +330,20 @@
 #endif // HAS_SPI_LCD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
   #if SD_CONNECTION_IS(ONBOARD)
-    #define SS_PIN         ONBOARD_SD_CS_PIN
+    #define SS_PIN             ONBOARD_SD_CS_PIN
   #else
-    #define SS_PIN         P0_28
+    #define SS_PIN                         P0_28
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
@@ -346,6 +352,6 @@
 //
 // Other Pins
 //
-//#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PS_ON_PIN          P1_23   // SERVO P1.23
+//#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PS_ON_PIN                        P1_23  // SERVO P1.23
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index bf989798fd1d..b8b04a348c80 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -42,61 +42,67 @@
 
 #define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P1_20   // (11)
-#define SERVO1_PIN         P1_21   // ( 6) also on J5-1
-#define SERVO2_PIN         P1_19   // ( 5)
-#define SERVO3_PIN         P1_18   // ( 4) 5V output
+#define SERVO0_PIN                         P1_20  // (11)
+#define SERVO1_PIN                         P1_21  // ( 6) also on J5-1
+#define SERVO2_PIN                         P1_19  // ( 5)
+#define SERVO3_PIN                         P1_18  // ( 4) 5V output
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // ( 3) 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // ( 2) 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // (14) 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // (15) 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_29   // (18) 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN          P1_28   // (19) 10k pullup to 3.3V, 1K series
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
+#define X_MIN_PIN                          P1_24  // ( 3) 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // ( 2) 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // (14) 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // (15) 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_29  // (18) 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_28  // (19) 10k pullup to 3.3V, 1K series
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01   // (54)
-#define X_DIR_PIN          P0_11   // (55)
-#define X_ENABLE_PIN       P0_10   // (38)
+#define X_STEP_PIN                         P2_01  // (54)
+#define X_DIR_PIN                          P0_11  // (55)
+#define X_ENABLE_PIN                       P0_10  // (38)
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_01   // ETH
+  #define X_CS_PIN                         P1_01  // ETH
 #endif
 
-#define Y_STEP_PIN         P2_02   // (60)
-#define Y_DIR_PIN          P0_20   // (61)
-#define Y_ENABLE_PIN       P0_19   // (56)
+#define Y_STEP_PIN                         P2_02  // (60)
+#define Y_DIR_PIN                          P0_20  // (61)
+#define Y_ENABLE_PIN                       P0_19  // (56)
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_04   // ETH
+  #define Y_CS_PIN                         P1_04  // ETH
 #endif
 
-#define Z_STEP_PIN         P2_03   // (46)
-#define Z_DIR_PIN          P0_22   // (48)
-#define Z_ENABLE_PIN       P0_21   // (62)
+#define Z_STEP_PIN                         P2_03  // (46)
+#define Z_DIR_PIN                          P0_22  // (48)
+#define Z_ENABLE_PIN                       P0_21  // (62)
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10   // ETH
+  #define Z_CS_PIN                         P1_10  // ETH
 #endif
 
-#define E0_STEP_PIN        P2_00   // (26)
-#define E0_DIR_PIN         P0_05   // (28)
-#define E0_ENABLE_PIN      P0_04   // (24)
+#define E0_STEP_PIN                        P2_00  // (26)
+#define E0_DIR_PIN                         P0_05  // (28)
+#define E0_ENABLE_PIN                      P0_04  // (24)
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_14   // ETH
+  #define E0_CS_PIN                        P1_14  // ETH
 #endif
 
-#define E1_STEP_PIN        P2_08   // (36)
-#define E1_DIR_PIN         P2_13   // (34)
-#define E1_ENABLE_PIN      P4_29   // (30)
+#define E1_STEP_PIN                        P2_08  // (36)
+#define E1_DIR_PIN                         P2_13  // (34)
+#define E1_ENABLE_PIN                      P4_29  // (30)
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                        -1
 #endif
 
 //
@@ -104,17 +110,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_00   // ETH
+    #define TMC_SW_MOSI                    P1_00  // ETH
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_08   // ETH
+    #define TMC_SW_MISO                    P1_08  // ETH
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_09   // ETH
+    #define TMC_SW_SCK                     P1_09  // ETH
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -130,31 +136,31 @@
   // P2_13 E1-Dir
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  P0_01
+    #define X_SERIAL_TX_PIN                P0_01
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  P0_01
+    #define X_SERIAL_RX_PIN                P0_01
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  P0_00
+    #define Y_SERIAL_TX_PIN                P0_00
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  P0_00
+    #define Y_SERIAL_RX_PIN                P0_00
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  P2_13
+    #define Z_SERIAL_TX_PIN                P2_13
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  P2_13
+    #define Z_SERIAL_RX_PIN                P2_13
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN P2_08
+    #define E0_SERIAL_TX_PIN               P2_08
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN P2_08
+    #define E0_SERIAL_RX_PIN               P2_08
   #endif
 
   // Reduce baud rate to improve software serial reliability
@@ -165,14 +171,14 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0) - (67) - TEMP_0_PIN
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1) - (68) - TEMP_BED_PIN
-#define TEMP_1_PIN          P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_2_PIN          P0_26_A3   // A3 - (63) - J5-3 & AUX-2
-#define TEMP_3_PIN          P1_30_A4   // A4 - (37) - BUZZER_PIN
-//#define TEMP_4_PIN          P1_31_A5   // A5 - (49) - SD_DETECT_PIN
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0) - (67) - TEMP_0_PIN
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_BED_PIN
+#define TEMP_1_PIN                      P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_2_PIN                      P0_26_A3  // A3 - (63) - J5-3 & AUX-2
+#define TEMP_3_PIN                      P1_30_A4  // A4 - (37) - BUZZER_PIN
+//#define TEMP_4_PIN                    P1_31_A5  // A5 - (49) - SD_DETECT_PIN
 //#define ??                  P0_03_A6   // A6 - ( 0)  - RXD0 - J4-4 & AUX-1
-#define FILWIDTH_PIN        P0_02_A7   // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
+#define FILWIDTH_PIN                    P0_02_A7  // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
 
 //
 // Augmentation for auto-assigning RAMPS plugs
@@ -195,69 +201,69 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                     -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN     P2_07   // (8)
+  #define RAMPS_D8_PIN                     P2_07  // (8)
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN     P2_04   // (9)
+  #define RAMPS_D9_PIN                     P2_04  // (9)
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    P2_05   // (10)
+  #define RAMPS_D10_PIN                    P2_05  // (10)
 #endif
 
-#define HEATER_0_PIN       RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN1_PIN         RAMPS_D8_PIN
-#elif DISABLED(IS_RAMPS_SF)                    // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN       MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN   MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF)          // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D9_PIN
   #elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF)         // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        RAMPS_D8_PIN
-  #elif ENABLED(IS_RAMPS_EEB)                  // Hotend, Hotend, Bed
-    #define FAN_PIN        P1_18               // (4) IO pin. Buffer needed
-  #else                                        // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D8_PIN
+  #elif ENABLED(IS_RAMPS_EEB)                     // Hotend, Hotend, Bed
+    #define FAN_PIN                        P1_18  // (4) IO pin. Buffer needed
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+    #define FAN_PIN                 RAMPS_D9_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // (13)
+#define LED_PIN                            P4_28  // (13)
 
 // define digital pin 5 for the filament runout sensor. Use the RAMPS 1.4 digital input 5 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_19   // (5)
+  #define FIL_RUNOUT_PIN                   P1_19  // (5)
 #endif
 
-#define PS_ON_PIN          P2_12   // (12)
+#define PS_ON_PIN                          P2_12  // (12)
 
 #if !defined(MAX6675_SS_PIN) && DISABLED(USE_ZMAX_PLUG)
-  #define MAX6675_SS_PIN   P1_28
+  #define MAX6675_SS_PIN                   P1_28
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4   // Try to use servo connector
-    #define CASE_LIGHT_PIN P1_18   // (4) MUST BE HARDWARE PWM
+  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4      // Try to use servo connector
+    #define CASE_LIGHT_PIN                 P1_18  // (4) MUST BE HARDWARE PWM
   #endif
 #endif
 
@@ -273,19 +279,19 @@
       #error "LASER_FEATURE requires 3 free servo pins."
     #endif
   #endif
-  #define SPINDLE_LASER_ENA_PIN SERVO1_PIN   // (6) Pin should have a pullup/pulldown!
-  #define SPINDLE_LASER_PWM_PIN SERVO3_PIN   // (4) MUST BE HARDWARE PWM
-  #define SPINDLE_DIR_PIN       SERVO2_PIN   // (5)
+  #define SPINDLE_LASER_ENA_PIN       SERVO1_PIN  // (6) Pin should have a pullup/pulldown!
+  #define SPINDLE_LASER_PWM_PIN       SERVO3_PIN  // (4) MUST BE HARDWARE PWM
+  #define SPINDLE_DIR_PIN             SERVO2_PIN  // (5)
 #endif
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
 #if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
-  #define E_MUX0_PIN       P0_03   // ( 0) Z_CS_PIN
-  #define E_MUX1_PIN       P0_02   // ( 1) E0_CS_PIN
+  #define E_MUX0_PIN                       P0_03  // ( 0) Z_CS_PIN
+  #define E_MUX1_PIN                       P0_02  // ( 1) E0_CS_PIN
 #endif
-#define E_MUX2_PIN         P0_26   // (63) E1_CS_PIN
+#define E_MUX2_PIN                         P0_26  // (63) E1_CS_PIN
 
 /**
  * LCD / Controller
@@ -316,101 +322,101 @@
   // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
   // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
 
-  #define BEEPER_PIN       P2_11   // J3-3 & AUX-4
+  #define BEEPER_PIN                       P2_11  // J3-3 & AUX-4
 
-  #define BTN_EN1          P0_16   // J3-7 & AUX-4
-  #define BTN_EN2          P1_23   // J3-5 & AUX-4
-  #define BTN_ENC          P3_25   // J3-4 & AUX-4
+  #define BTN_EN1                          P0_16  // J3-7 & AUX-4
+  #define BTN_EN2                          P1_23  // J3-5 & AUX-4
+  #define BTN_ENC                          P3_25  // J3-4 & AUX-4
 
-  #define LCD_PINS_RS      P0_15   // J3-9 & AUX-4 (CS)
-  #define LCD_PINS_ENABLE  P0_18   // J3-10 & AUX-3 (SID, MOSI)
-  #define LCD_PINS_D4      P2_06   // J3-8 & AUX-3 (SCK, CLK)
+  #define LCD_PINS_RS                      P0_15  // J3-9 & AUX-4 (CS)
+  #define LCD_PINS_ENABLE                  P0_18  // J3-10 & AUX-3 (SID, MOSI)
+  #define LCD_PINS_D4                      P2_06  // J3-8 & AUX-3 (SCK, CLK)
 
 #elif HAS_SPI_LCD
 
-  //#define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
-  //#define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
-  //#define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
-  //#define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
+  //#define SCK_PIN                        P0_15  // (52)  system defined J3-9 & AUX-3
+  //#define MISO_PIN                       P0_17  // (50)  system defined J3-10 & AUX-3
+  //#define MOSI_PIN                       P0_18  // (51)  system defined J3-10 & AUX-3
+  //#define SS_PIN                         P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
 
   #if ENABLED(FYSETC_MINI_12864)
-    #define BEEPER_PIN     P1_01
-    #define BTN_ENC        P1_04
+    #define BEEPER_PIN                     P1_01
+    #define BTN_ENC                        P1_04
   #else
-    #define BEEPER_PIN     P1_30   // (37) not 5V tolerant
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
+    #define BEEPER_PIN                     P1_30  // (37) not 5V tolerant
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
   #endif
 
-  #define BTN_EN1          P3_26   // (31) J3-2 & AUX-4
-  #define BTN_EN2          P3_25   // (33) J3-4 & AUX-4
+  #define BTN_EN1                          P3_26  // (31) J3-2 & AUX-4
+  #define BTN_EN2                          P3_25  // (33) J3-4 & AUX-4
 
-  #define SD_DETECT_PIN    P1_31   // (49) J3-1 & AUX-3 (NOT 5V tolerant)
-  #define KILL_PIN         P1_22   // (41) J5-4 & AUX-4
-  #define LCD_PINS_RS      P0_16   // (16) J3-7 & AUX-4
-  #define LCD_SDSS         P0_16   // (16) J3-7 & AUX-4
+  #define SD_DETECT_PIN                    P1_31  // (49) J3-1 & AUX-3 (NOT 5V tolerant)
+  #define KILL_PIN                         P1_22  // (41) J5-4 & AUX-4
+  #define LCD_PINS_RS                      P0_16  // (16) J3-7 & AUX-4
+  #define LCD_SDSS                         P0_16  // (16) J3-7 & AUX-4
 
   #if ENABLED(NEWPANEL)
     #if ENABLED(REPRAPWORLD_KEYPAD)
-      #define SHIFT_OUT    P0_18   // (51) (MOSI) J3-10 & AUX-3
-      #define SHIFT_CLK    P0_15   // (52) (SCK)  J3-9 & AUX-3
-      #define SHIFT_LD     P1_31   // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
+      #define SHIFT_OUT                    P0_18  // (51) (MOSI) J3-10 & AUX-3
+      #define SHIFT_CLK                    P0_15  // (52) (SCK)  J3-9 & AUX-3
+      #define SHIFT_LD                     P1_31  // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
     #endif
   #else
-    //#define SHIFT_CLK      P3_26   // (31)  J3-2 & AUX-4
-    //#define SHIFT_LD       P3_25   // (33)  J3-4 & AUX-4
-    //#define SHIFT_OUT      P2_11   // (35)  J3-3 & AUX-4
-    //#define SHIFT_EN       P1_22   // (41)  J5-4 & AUX-4
+    //#define SHIFT_CLK                    P3_26  // (31)  J3-2 & AUX-4
+    //#define SHIFT_LD                     P3_25  // (33)  J3-4 & AUX-4
+    //#define SHIFT_OUT                    P2_11  // (35)  J3-3 & AUX-4
+    //#define SHIFT_EN                     P1_22  // (41)  J5-4 & AUX-4
   #endif
 
   #if ANY(VIKI2, miniVIKI)
     // #define LCD_SCREEN_ROT_180
 
-    #define DOGLCD_CS      P0_16   // (16)
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
-    #define DOGLCD_SCK     SCK_PIN
-    #define DOGLCD_MOSI    MOSI_PIN
+    #define DOGLCD_CS                      P0_16  // (16)
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
+    #define DOGLCD_SCK                   SCK_PIN
+    #define DOGLCD_MOSI                 MOSI_PIN
 
-    #define STAT_LED_BLUE_PIN P0_26 //(63)  may change if cable changes
-    #define STAT_LED_RED_PIN P1_21 // ( 6)  may change if cable changes
+    #define STAT_LED_BLUE_PIN              P0_26  //(63)  may change if cable changes
+    #define STAT_LED_RED_PIN               P1_21  // ( 6)  may change if cable changes
   #else
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
       // EXP1 on LCD adapter is not usable - using Ethernet connector instead
-      #define DOGLCD_CS    P1_09
-      #define DOGLCD_A0    P1_14
-      //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define DOGLCD_CS                    P1_09
+      #define DOGLCD_A0                    P1_14
+      //#define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN P0_16   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                P0_16  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN P1_00
+          #define RGB_LED_R_PIN            P1_00
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN P1_01
+          #define RGB_LED_G_PIN            P1_01
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN P1_08
+          #define RGB_LED_B_PIN            P1_08
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN P1_00
+        #define NEOPIXEL_PIN               P1_00
       #endif
     #else
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
-      #define DOGLCD_A0    P2_06   // (59) J3-8 & AUX-2
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
+      #define DOGLCD_A0                    P2_06  // (59) J3-8 & AUX-2
     #endif
 
-    #define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
+    #define LCD_BACKLIGHT_PIN              P0_16  //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  P1_17   // (71) ENET_MDIO
-      #define LCD_PINS_D6  P1_14   // (73) ENET_RX_ER
-      #define LCD_PINS_D7  P1_10   // (75) ENET_RXD1
+      #define LCD_PINS_D5                  P1_17  // (71) ENET_MDIO
+      #define LCD_PINS_D6                  P1_14  // (73) ENET_RX_ER
+      #define LCD_PINS_D7                  P1_10  // (75) ENET_RXD1
     #endif
   #endif
 
@@ -428,38 +434,38 @@
 // Ethernet pins
 //
 #if DISABLED(ULTIPANEL)
-  #define ENET_MDIO        P1_17   // (71)  J12-4
-  #define ENET_RX_ER       P1_14   // (73)  J12-6
-  #define ENET_RXD1        P1_10   // (75)  J12-8
+  #define ENET_MDIO                        P1_17  // (71)  J12-4
+  #define ENET_RX_ER                       P1_14  // (73)  J12-6
+  #define ENET_RXD1                        P1_10  // (75)  J12-8
 #endif
-#define ENET_MOC           P1_16   // (70)  J12-3
-#define REF_CLK            P1_15   // (72)  J12-5
-#define ENET_RXD0          P1_09   // (74)  J12-7
-#define ENET_CRS           P1_08   // (76)  J12-9
-#define ENET_TX_EN         P1_04   // (77)  J12-10
-#define ENET_TXD0          P1_00   // (78)  J12-11
-#define ENET_TXD1          P1_01   // (79)  J12-12
+#define ENET_MOC                           P1_16  // (70)  J12-3
+#define REF_CLK                            P1_15  // (72)  J12-5
+#define ENET_RXD0                          P1_09  // (74)  J12-7
+#define ENET_CRS                           P1_08  // (76)  J12-9
+#define ENET_TX_EN                         P1_04  // (77)  J12-10
+#define ENET_TXD0                          P1_00  // (78)  J12-11
+#define ENET_TXD1                          P1_01  // (79)  J12-12
 
 //
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
-  #define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
-  #define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+  #define SCK_PIN                          P0_15  // (52)  system defined J3-9 & AUX-3
+  #define MISO_PIN                         P0_17  // (50)  system defined J3-10 & AUX-3
+  #define MOSI_PIN                         P0_18  // (51)  system defined J3-10 & AUX-3
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 1a8e997eb2c7..6f84f87bba88 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -32,83 +32,88 @@
 #define BOARD_INFO_NAME   "Selena Compact"
 #define BOARD_WEBSITE_URL "github.com/Ales2-k/Selena"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN        P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_28
-#define X_MAX_PIN          P1_25
-#define Y_MIN_PIN          P2_11
-#define Y_MAX_PIN          -1
-#define Z_MIN_PIN          P1_27
-#define Z_MAX_PIN          -1
-#define Z_PROBE            P1_22
+#define X_MIN_PIN                          P1_28
+#define X_MAX_PIN                          P1_25
+#define Y_MIN_PIN                          P2_11
+#define Y_MAX_PIN                          -1
+#define Z_MIN_PIN                          P1_27
+#define Z_MAX_PIN                          -1
+#define Z_PROBE                            P1_22
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_BED_PIN     P2_05
-#define HEATER_BED2_PIN    P2_04
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P2_06
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_BED2_PIN                    P2_04
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P2_06
 #ifndef FAN_PIN
-  #define FAN_PIN          P1_24
+  #define FAN_PIN                          P1_24
 #endif
-#define FAN1_PIN           P1_26
+#define FAN1_PIN                           P1_26
 
 //
 // Display
 //
 
 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define LCD_PINS_RS         P0_16
-    #define LCD_PINS_ENABLE     P0_18
-    #define LCD_PINS_D4         P0_15
-    #define LCD_PINS_D5         P1_00
-    #define LCD_PINS_D6         P1_01
-    #define LCD_PINS_D7         P1_04
-    #define BEEPER_PIN          P1_31
-
-    #define BTN_EN1             P3_25
-    #define BTN_EN2             P3_26
-    #define BTN_ENC             P1_30
-
-    #define SD_DETECT_PIN       -1
+    #define LCD_PINS_RS                    P0_16
+    #define LCD_PINS_ENABLE                P0_18
+    #define LCD_PINS_D4                    P0_15
+    #define LCD_PINS_D5                    P1_00
+    #define LCD_PINS_D6                    P1_01
+    #define LCD_PINS_D7                    P1_04
+    #define BEEPER_PIN                     P1_31
+
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
+    #define BTN_ENC                        P1_30
+
+    #define SD_DETECT_PIN                  -1
 #endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
index 5ee0e5856621..95cbd2163e26 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -32,97 +32,101 @@
 #define BOARD_INFO_NAME   "Azteeg X5 GT"
 #define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define X_MAX_PIN          P1_27
-#define Y_MIN_PIN          P1_25
-#define Y_MAX_PIN          P1_28
-#define Z_MIN_PIN          P1_26
-#define Z_MAX_PIN          P1_29
-
+#define X_MIN_PIN                          P1_24
+#define X_MAX_PIN                          P1_27
+#define Y_MIN_PIN                          P1_25
+#define Y_MAX_PIN                          P1_28
+#define Z_MIN_PIN                          P1_26
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01
-#define X_DIR_PIN          P0_11
-#define X_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_01
+#define X_DIR_PIN                          P0_11
+#define X_ENABLE_PIN                       P0_10
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P0_10 // BSD2660 default
+  #define X_CS_PIN                         P0_10  // BSD2660 default
 #endif
 
-#define Y_STEP_PIN         P2_02
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_02
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P0_19
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P0_19 // BSD2660 default
+  #define Y_CS_PIN                         P0_19  // BSD2660 default
 #endif
 
-#define Z_STEP_PIN         P2_03
-#define Z_DIR_PIN          P0_22
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P2_03
+#define Z_DIR_PIN                          P0_22
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P0_21 // BSD2660 default
+  #define Z_CS_PIN                         P0_21  // BSD2660 default
 #endif
 
-#define E0_STEP_PIN        P2_00
-#define E0_DIR_PIN         P0_05
-#define E0_ENABLE_PIN      P0_04
+#define E0_STEP_PIN                        P2_00
+#define E0_DIR_PIN                         P0_05
+#define E0_ENABLE_PIN                      P0_04
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P0_04 // BSD2660 default
+  #define E0_CS_PIN                        P0_04  // BSD2660 default
 #endif
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P4_29 // BSD2660 default
+  #define E1_CS_PIN                        P4_29  // BSD2660 default
 #endif
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_BED_PIN     P2_07
-#define HEATER_0_PIN       P2_04
-#define HEATER_1_PIN       P2_05
+#define HEATER_BED_PIN                     P2_07
+#define HEATER_0_PIN                       P2_04
+#define HEATER_1_PIN                       P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P0_26
+  #define FAN_PIN                          P0_26
 #endif
-#define FAN1_PIN           P1_22
+#define FAN1_PIN                           P1_22
 
 //
 // Display
 //
 
 #if ANY(VIKI2, miniVIKI)
-  #define BEEPER_PIN       P1_31
-  #define DOGLCD_A0        P2_06
-  #define DOGLCD_CS        P0_16
+  #define BEEPER_PIN                       P1_31
+  #define DOGLCD_A0                        P2_06
+  #define DOGLCD_CS                        P0_16
 
-  #define BTN_EN1          P3_25
-  #define BTN_EN2          P3_26
-  #define BTN_ENC          P2_11
+  #define BTN_EN1                          P3_25
+  #define BTN_EN2                          P3_26
+  #define BTN_ENC                          P2_11
 
-  #define SD_DETECT_PIN    P1_18
-  #define SDSS             P1_21
+  #define SD_DETECT_PIN                    P1_18
+  #define SDSS                             P1_21
 
-  #define STAT_LED_RED_PIN P1_19
-  #define STAT_LED_BLUE_PIN P1_20
+  #define STAT_LED_RED_PIN                 P1_19
+  #define STAT_LED_BLUE_PIN                P1_20
 #endif
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index 2c54bd603527..ba1351e6f40d 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -37,74 +37,74 @@
 //
 // LED
 //
-#define LED_PIN            P1_18
+#define LED_PIN                            P1_18
 
 //
 // Servos
 //
-#define SERVO0_PIN         P1_29
+#define SERVO0_PIN                         P1_29
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         P1_24
-#define Y_STOP_PIN         P1_26
-#define Z_STOP_PIN         P1_28
+#define X_STOP_PIN                         P1_24
+#define Y_STOP_PIN                         P1_26
+#define Z_STOP_PIN                         P1_28
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P2_04
+  #define FIL_RUNOUT_PIN                   P2_04
 #endif
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN         P0_25_A2   // Analog Input (P0_25)
+  #define FILWIDTH_PIN                  P0_25_A2  // Analog Input (P0_25)
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01
-#define X_DIR_PIN          P0_11
-#define X_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_01
+#define X_DIR_PIN                          P0_11
+#define X_ENABLE_PIN                       P0_10
 
-#define Y_STEP_PIN         P2_02
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_02
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P0_19
 
-#define Z_STEP_PIN         P2_03
-#define Z_DIR_PIN          P0_22
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P2_03
+#define Z_DIR_PIN                          P0_22
+#define Z_ENABLE_PIN                       P0_21
 
-#define E0_STEP_PIN        P2_00
-#define E0_DIR_PIN         P0_05
-#define E0_ENABLE_PIN      P0_04
+#define E0_STEP_PIN                        P2_00
+#define E0_DIR_PIN                         P0_05
+#define E0_ENABLE_PIN                      P0_04
 
 //
 // DIGIPOT slave addresses
 //
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for first DIGIPOT
 #endif
 
 #ifndef DIGIPOT_I2C_ADDRESS_B
-  #define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT
+  #define DIGIPOT_I2C_ADDRESS_B 0x2E              // unshifted slave address for second DIGIPOT
 #endif
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_07
-#define HEATER_0_PIN       P2_05
+#define HEATER_BED_PIN                     P2_07
+#define HEATER_0_PIN                       P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P0_26
+  #define FAN_PIN                          P0_26
 #endif
-#define FAN1_PIN           P1_25
+#define FAN1_PIN                           P1_25
 
 //
 // Display
@@ -118,61 +118,61 @@
     // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
     // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
 
-    #define BEEPER_PIN     P2_11   // J3-3 & AUX-4
+    #define BEEPER_PIN                     P2_11  // J3-3 & AUX-4
 
-    #define BTN_EN1        P0_16   // J3-7 & AUX-4
-    #define BTN_EN2        P1_23   // J3-5 & AUX-4
-    #define BTN_ENC        P3_25   // J3-4 & AUX-4
+    #define BTN_EN1                        P0_16  // J3-7 & AUX-4
+    #define BTN_EN2                        P1_23  // J3-5 & AUX-4
+    #define BTN_ENC                        P3_25  // J3-4 & AUX-4
 
-    #define LCD_PINS_RS    P0_15   // J3-9 & AUX-4 (CS)
-    #define LCD_PINS_ENABLE P0_18  // J3-10 & AUX-3 (SID, MOSI)
-    #define LCD_PINS_D4    P2_06   // J3-8 & AUX-3 (SCK, CLK)
+    #define LCD_PINS_RS                    P0_15  // J3-9 & AUX-4 (CS)
+    #define LCD_PINS_ENABLE                P0_18  // J3-10 & AUX-3 (SID, MOSI)
+    #define LCD_PINS_D4                    P2_06  // J3-8 & AUX-3 (SCK, CLK)
 
   #else
 
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
 
-    #define SD_DETECT_PIN  P1_31   // (49) not 5V tolerant   J3-1 & AUX-3
-    #define KILL_PIN       P1_22   // (41) J5-4 & AUX-4
-    #define LCD_PINS_RS    P0_16   // (16) J3-7 & AUX-4
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
-    #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
+    #define SD_DETECT_PIN                  P1_31  // (49) not 5V tolerant   J3-1 & AUX-3
+    #define KILL_PIN                       P1_22  // (41) J5-4 & AUX-4
+    #define LCD_PINS_RS                    P0_16  // (16) J3-7 & AUX-4
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
+    #define LCD_BACKLIGHT_PIN              P0_16  // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
 
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
 
     #if ENABLED(REPRAPWORLD_KEYPAD)
-      #define SHIFT_OUT    P0_18   // (51)  (MOSI) J3-10 & AUX-3
-      #define SHIFT_CLK    P0_15   // (52)  (SCK)  J3-9 & AUX-3
-      #define SHIFT_LD     P1_31   // (49)  not 5V tolerant   J3-1 & AUX-3
+      #define SHIFT_OUT                    P0_18  // (51)  (MOSI) J3-10 & AUX-3
+      #define SHIFT_CLK                    P0_15  // (52)  (SCK)  J3-9 & AUX-3
+      #define SHIFT_LD                     P1_31  // (49)  not 5V tolerant   J3-1 & AUX-3
     #elif DISABLED(NEWPANEL)
-      //#define SHIFT_OUT  P2_11   // (35)  J3-3 & AUX-4
-      //#define SHIFT_CLK  P3_26   // (31)  J3-2 & AUX-4
-      //#define SHIFT_LD   P3_25   // (33)  J3-4 & AUX-4
-      //#define SHIFT_EN   P1_22   // (41)  J5-4 & AUX-4
+      //#define SHIFT_OUT                  P2_11  // (35)  J3-3 & AUX-4
+      //#define SHIFT_CLK                  P3_26  // (31)  J3-2 & AUX-4
+      //#define SHIFT_LD                   P3_25  // (33)  J3-4 & AUX-4
+      //#define SHIFT_EN                   P1_22  // (41)  J5-4 & AUX-4
     #endif
 
     #if ANY(VIKI2, miniVIKI)
       //#define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN   P1_30   // (37) may change if cable changes
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
-      #define DOGLCD_SCK   SCK_PIN
-      #define DOGLCD_MOSI  MOSI_PIN
+      #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
+      #define DOGLCD_SCK                 SCK_PIN
+      #define DOGLCD_MOSI               MOSI_PIN
 
-      #define STAT_LED_BLUE_PIN P0_26   // (63)  may change if cable changes
-      #define STAT_LED_RED_PIN  P1_21   // ( 6)  may change if cable changes
+      #define STAT_LED_BLUE_PIN            P0_26  // (63)  may change if cable changes
+      #define STAT_LED_RED_PIN             P1_21  // ( 6)  may change if cable changes
     #else
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 P1_17   // (71) ENET_MDIO
-        #define LCD_PINS_D6 P1_14   // (73) ENET_RX_ER
-        #define LCD_PINS_D7 P1_10   // (75) ENET_RXD1
+        #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
+        #define LCD_PINS_D6                P1_14  // (73) ENET_RX_ER
+        #define LCD_PINS_D7                P1_10  // (75) ENET_RXD1
       #endif
-      #define BEEPER_PIN   P1_30   // (37) not 5V tolerant
-      #define DOGLCD_CS    P0_16   // (16)
+      #define BEEPER_PIN                   P1_30  // (37) not 5V tolerant
+      #define DOGLCD_CS                    P0_16  // (16)
     #endif
 
     #if ENABLED(MINIPANEL)
@@ -187,26 +187,34 @@
 
 #endif // HAS_SPI_LCD
 
+//
+// EEPROM
+//
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
 //
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           P1_23
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                           P1_23
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
index 4b731ae9d343..1e5d2f3a2c11 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
@@ -31,6 +31,12 @@
 
 #define BOARD_INFO_NAME "Azteeg X5 MINI WIFI"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // DIGIPOT slave addresses
 //
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
index 937ba56bb729..a8649b6f8ddc 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
@@ -24,6 +24,12 @@
 #define BOARD_INFO_NAME "BIGTREE SKR 1.4 TURBO"
 #define SKR_HAS_LPC1769
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Include SKR 1.4 pins
 //
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
index 739603e2b644..87d3cb459c30 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -31,56 +31,62 @@
 
 #define BOARD_INFO_NAME "Cohesion3D Mini"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
 
 //
 // Default pins for TMC software SPI
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
   #endif
 #endif
 
@@ -88,42 +94,42 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // P0_23
-#define TEMP_BED_PIN        P0_24_A1   // P0_24
+#define TEMP_0_PIN                      P0_23_A0  // P0_23
+#define TEMP_BED_PIN                    P0_24_A1  // P0_24
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07   // FET 1
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07  // FET 1
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06   // FET 3
+  #define FAN_PIN                          P2_06  // FET 3
 #endif
 
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN       P2_04   // FET 4
+#define AUTO_FAN_PIN                       P2_04  // FET 4
 
-#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // Play LED
+#define LED_PIN                            P4_28  // Play LED
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
   #undef HEATER_0_PIN
-  #define SPINDLE_LASER_ENA_PIN     P2_07   // FET 1
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
   #undef HEATER_BED_PIN
-  #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
   #undef FAN_PIN
-  #define SPINDLE_DIR_PIN           P2_06   // FET 3
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 3
 #endif
 
 //
@@ -138,18 +144,18 @@
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       P0_27   // EXP2-7 - open drain
+  #define BEEPER_PIN                       P0_27  // EXP2-7 - open drain
 
-  #define BTN_EN1          P3_26   // EXP2-5
-  #define BTN_EN2          P3_25   // EXP2-3
-  #define BTN_ENC          P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-5
+  #define BTN_EN2                          P3_25  // EXP2-3
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define LCD_PINS_RS      P0_16   // EXP1-4
-  #define LCD_SDSS         P0_28   // EXP2-4
-  #define LCD_PINS_ENABLE  P0_18   // EXP1-3
-  #define LCD_PINS_D4      P0_15   // EXP1-5
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_SDSS                         P0_28  // EXP2-4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
 
-  #define KILL_PIN         P2_11   // EXP2-10
+  #define KILL_PIN                         P2_11  // EXP2-10
 
   #if ENABLED(SDSUPPORT)
     #error "SDSUPPORT is not currently supported by the Cohesion3D boards"
@@ -160,13 +166,13 @@
 //
 // Ethernet pins
 //
-#define ENET_MDIO          P1_17
-#define ENET_RX_ER         P1_14
-#define ENET_RXD1          P1_10
-#define ENET_MOC           P1_16
-#define REF_CLK            P1_15
-#define ENET_RXD0          P1_09
-#define ENET_CRS           P1_08
-#define ENET_TX_EN         P1_04
-#define ENET_TXD0          P1_00
-#define ENET_TXD1          P1_01
+#define ENET_MDIO                          P1_17
+#define ENET_RX_ER                         P1_14
+#define ENET_RXD1                          P1_10
+#define ENET_MOC                           P1_16
+#define REF_CLK                            P1_15
+#define ENET_RXD0                          P1_09
+#define ENET_CRS                           P1_08
+#define ENET_TX_EN                         P1_04
+#define ENET_TXD0                          P1_00
+#define ENET_TXD1                          P1_01
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index ea40c01c08f0..fa55a8adae04 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -31,66 +31,79 @@
 
 #define BOARD_INFO_NAME "Cohesion3D ReMix"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P2_04
+#define SERVO0_PIN                         P2_04
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                  P1_29
+#endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
-
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
-
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
-
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
-
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
-#define E1_CS_PIN          P1_01   // Ethernet Expansion - Pin 14
-
-#define E2_STEP_PIN        P1_20
-#define E2_DIR_PIN         P1_19
-#define E2_ENABLE_PIN      P1_21
-#define E2_CS_PIN          P1_18   // FET 6
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
+
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
+
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
+
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
+
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
+#define E1_CS_PIN                          P1_01  // Ethernet Expansion - Pin 14
+
+#define E2_STEP_PIN                        P1_20
+#define E2_DIR_PIN                         P1_19
+#define E2_ENABLE_PIN                      P1_21
+#define E2_CS_PIN                          P1_18  // FET 6
 
 //
 // Default pins for TMC software SPI
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
   #endif
 #endif
 
@@ -98,42 +111,42 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0
-#define TEMP_BED_PIN        P0_24_A1
-#define TEMP_1_PIN          P0_25_A2
+#define TEMP_0_PIN                      P0_23_A0
+#define TEMP_BED_PIN                    P0_24_A1
+#define TEMP_1_PIN                      P0_25_A2
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      P0_26_A3
+  #define FILWIDTH_PIN                  P0_26_A3
 #else
-  #define TEMP_2_PIN        P0_26_A3
+  #define TEMP_2_PIN                    P0_26_A3
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07   // FET 1
-#define HEATER_1_PIN       P1_23   // FET 2
-#define HEATER_2_PIN       P1_22   // FET 3
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07  // FET 1
+#define HEATER_1_PIN                       P1_23  // FET 2
+#define HEATER_2_PIN                       P1_22  // FET 3
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06   // FET 4
+  #define FAN_PIN                          P2_06  // FET 4
 #endif
 
 //
 // Auto fans
 //
 #if HOTENDS == 3
-  #define AUTO_FAN_PIN     P1_18   // FET 6
+  #define AUTO_FAN_PIN                     P1_18  // FET 6
 #else
-  #define AUTO_FAN_PIN     P1_22   // FET 3
+  #define AUTO_FAN_PIN                     P1_22  // FET 3
 #endif
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // Play LED
+#define LED_PIN                            P4_28  // Play LED
 
 //
 // M3/M4/M5 - Spindle/Laser Control
@@ -142,9 +155,9 @@
   #undef HEATER_0_PIN
   #undef HEATER_BED_PIN
   #undef FAN_PIN
-  #define SPINDLE_LASER_ENA_PIN P2_07   // FET 1
-  #define SPINDLE_LASER_PWM_PIN P2_05   // Bed FET
-  #define SPINDLE_DIR_PIN       P2_06   // FET 4
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 4
 #endif
 
 //
@@ -160,54 +173,54 @@
 
 #if ENABLED(FYSETC_MINI_12864)
 
-  #define FORCE_SOFT_SPI    // REQUIRED - results in LCD soft SPI mode 3
+  #define FORCE_SOFT_SPI                          // REQUIRED - results in LCD soft SPI mode 3
 
-  #define BEEPER_PIN      P1_31   // EXP1-1
-  #define BTN_ENC         P1_30   // EXP1-2
-  #define DOGLCD_CS       P0_18   // EXP1-3
-  #define DOGLCD_A0       P0_16   // EXP1-4
-  #define LCD_RESET_PIN   P0_15   // EXP1-5
+  #define BEEPER_PIN                       P1_31  // EXP1-1
+  #define BTN_ENC                          P1_30  // EXP1-2
+  #define DOGLCD_CS                        P0_18  // EXP1-3
+  #define DOGLCD_A0                        P0_16  // EXP1-4
+  #define LCD_RESET_PIN                    P0_15  // EXP1-5
 
   // A custom cable is REQUIRED for EXP2 cable because the SCK & MOSI on the card's EXP2 are dedicated
   // to the onboard SD card.  All required EXP2 signals come from the Ethernet connector.  Pin 1 of this
   // connector is the one nearest the motor power connector.
-  #define DOGLCD_SCK      P1_17   // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
-  #define BTN_EN2         P1_09   // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
-  #define BTN_EN1         P1_04   // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
-  #define DOGLCD_MOSI     P1_01   // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
+  #define DOGLCD_SCK                       P1_17  // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
+  #define BTN_EN2                          P1_09  // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
+  #define BTN_EN1                          P1_04  // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
+  #define DOGLCD_MOSI                      P1_01  // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
 
   // A custom EXP1 cable is required colored LEDs. Pins 1-5, 9, 10 of the cable go to pins 1-5, 9, 10
   // on the board's EXP1 connector. Pins 6, 7, and 8 of the EXP1 cable go to the Ethernet connector.
   // Rev 1.2 displays do NOT require the RGB LEDs. 2.0 and 2.1 displays do require RGB.
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN P1_16 // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
+      #define RGB_LED_R_PIN                P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN P1_10 // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
+      #define RGB_LED_G_PIN                P1_10  // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN P1_00 // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
+      #define RGB_LED_B_PIN                P1_00  // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN  P1_16   // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
+    #define NEOPIXEL_PIN                   P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
   #endif
 
 #elif HAS_SPI_LCD
 
-  #define BEEPER_PIN      P1_31   // EXP1-1
-  //#define SD_DETECT_PIN P0_27   // EXP2-7
+  #define BEEPER_PIN                       P1_31  // EXP1-1
+  //#define SD_DETECT_PIN                  P0_27  // EXP2-7
 
-  #define BTN_EN1         P3_26   // EXP2-5
-  #define BTN_EN2         P3_25   // EXP2-3
-  #define BTN_ENC         P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-5
+  #define BTN_EN2                          P3_25  // EXP2-3
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define LCD_PINS_RS     P0_16   // EXP1-4
-  #define LCD_SDSS        P0_28   // EXP2-4
-  #define LCD_PINS_ENABLE P0_18   // EXP1-3
-  #define LCD_PINS_D4     P0_15   // EXP1-5
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_SDSS                         P0_28  // EXP2-4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
 
-  #define KILL_PIN        P2_11   // EXP2-10
+  #define KILL_PIN                         P2_11  // EXP2-10
 
 #endif // HAS_SPI_LCD
 
@@ -215,22 +228,22 @@
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_07   // (52)  system defined J3-9 & AUX-3
-  #define MISO_PIN         P0_08   // (50)  system defined J3-10 & AUX-3
-  #define MOSI_PIN         P0_09   // (51)  system defined J3-10 & AUX-3
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+  #define SCK_PIN                          P0_07  // (52)  system defined J3-9 & AUX-3
+  #define MISO_PIN                         P0_08  // (50)  system defined J3-10 & AUX-3
+  #define MOSI_PIN                         P0_09  // (51)  system defined J3-10 & AUX-3
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -238,16 +251,16 @@
 //
 // Ethernet pins
 //
-//#define ENET_MDIO          P1_17   // Ethernet pin  5 (bottom, 3 from left)
-//#define ENET_RX_ER         P1_14
-//#define ENET_RXD1          P1_10   // Ethernet pin 10 (top row, 5 from left)
-//#define ENET_MOC           P1_16   // Ethernet pin  6 (top row, 3 from left)
-//#define REF_CLK            P1_15
-//#define ENET_RXD0          P1_09   // Ethernet pin  9 (bottom, 5 from left)
-//#define ENET_CRS           P1_08   // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
-//#define ENET_TX_EN         P1_04   // Ethernet pin 11 (bottom, 6 from left)
-//#define ENET_TXD0          P1_00   // Ethernet pin 12 (top row, 6 from left)
-//#define ENET_TXD1          P1_01   // Ethernet pin 13 (bottom, 7 from left)
+//#define ENET_MDIO                        P1_17  // Ethernet pin  5 (bottom, 3 from left)
+//#define ENET_RX_ER                       P1_14
+//#define ENET_RXD1                        P1_10  // Ethernet pin 10 (top row, 5 from left)
+//#define ENET_MOC                         P1_16  // Ethernet pin  6 (top row, 3 from left)
+//#define REF_CLK                          P1_15
+//#define ENET_RXD0                        P1_09  // Ethernet pin  9 (bottom, 5 from left)
+//#define ENET_CRS                         P1_08  // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
+//#define ENET_TX_EN                       P1_04  // Ethernet pin 11 (bottom, 6 from left)
+//#define ENET_TXD0                        P1_00  // Ethernet pin 12 (top row, 6 from left)
+//#define ENET_TXD1                        P1_01  // Ethernet pin 13 (bottom, 7 from left)
 
 /**
  *  EXP1 pins
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index a5a91f6207b9..fd98b5ef1309 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -31,8 +31,14 @@
 
 #define BOARD_INFO_NAME   "MKS SGen"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN"
-#define MKS_HAS_LPC1769
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
+#define MKS_HAS_LPC1769
 #include "../lpc1768/pins_MKS_SBASE.h"
 
 #undef E1_STEP_PIN
@@ -41,10 +47,10 @@
 
 //#undef BTN_EN1
 //#undef BTN_EN2
-//#define BTN_EN1            P1_23   // EXP2.5
-//#define BTN_EN2            P1_22   // EXP2.3
+//#define BTN_EN1                          P1_23  // EXP2.5
+//#define BTN_EN2                          P1_22  // EXP2.3
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -52,16 +58,16 @@
    * In the worst case you may have to give up the LCD.
    * RX pins must be interrupt-capable.
    */
-  #define X_SERIAL_TX_PIN  P4_29   // J8-2
-  #define X_SERIAL_RX_PIN  P4_29   // J8-2
+  #define X_SERIAL_TX_PIN                  P4_29  // J8-2
+  #define X_SERIAL_RX_PIN                  P4_29  // J8-2
 
-  #define Y_SERIAL_TX_PIN  P2_08   // J8-3
-  #define Y_SERIAL_RX_PIN  P2_08   // J8-3
+  #define Y_SERIAL_TX_PIN                  P2_08  // J8-3
+  #define Y_SERIAL_RX_PIN                  P2_08  // J8-3
 
-  #define Z_SERIAL_TX_PIN  P2_11   // J8-4
-  #define Z_SERIAL_RX_PIN  P2_11   // J8-4
-  #define E0_SERIAL_TX_PIN P2_13   // J8-5
-  #define E0_SERIAL_RX_PIN P2_13   // J8-5
+  #define Z_SERIAL_TX_PIN                  P2_11  // J8-4
+  #define Z_SERIAL_RX_PIN                  P2_11  // J8-4
+  #define E0_SERIAL_TX_PIN                 P2_13  // J8-5
+  #define E0_SERIAL_RX_PIN                 P2_13  // J8-5
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index 5bf64e9d02fa..43db07ea5e08 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -32,82 +32,88 @@
 #define BOARD_INFO_NAME   "Smoothieboard"
 #define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define X_MAX_PIN          P1_25
-#define Y_MIN_PIN          P1_26
-#define Y_MAX_PIN          P1_27
-#define Z_MIN_PIN          P1_28
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define X_MAX_PIN                          P1_25
+#define Y_MIN_PIN                          P1_26
+#define Y_MAX_PIN                          P1_27
+#define Z_MIN_PIN                          P1_28
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // (T1)
-#define TEMP_BED_PIN        P0_24_A1   // (T2)
-#define TEMP_1_PIN          P0_25_A2   // (T3)
-#define TEMP_2_PIN          P0_26_A3   // (T4)
+#define TEMP_0_PIN                      P0_23_A0  // (T1)
+#define TEMP_BED_PIN                    P0_24_A1  // (T2)
+#define TEMP_1_PIN                      P0_25_A2  // (T3)
+#define TEMP_2_PIN                      P0_26_A3  // (T4)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P1_23
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P1_23
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06
+  #define FAN_PIN                          P2_06
 #endif
-#define FAN1_PIN           P2_04
+#define FAN1_PIN                           P2_04
 
 //
 // LCD / Controller
 //
 #if ANY(VIKI2, miniVIKI)
 
-  #define BEEPER_PIN       P1_31
-  #define DOGLCD_A0        P2_11
-  #define DOGLCD_CS        P0_16
+  #define BEEPER_PIN                       P1_31
+  #define DOGLCD_A0                        P2_11
+  #define DOGLCD_CS                        P0_16
 
-  #define BTN_EN1          P3_25
-  #define BTN_EN2          P3_26
-  #define BTN_ENC          P1_30
+  #define BTN_EN1                          P3_25
+  #define BTN_EN2                          P3_26
+  #define BTN_ENC                          P1_30
 
-  #define SD_DETECT_PIN    P1_18
-  #define SDSS             P1_21
+  #define SD_DETECT_PIN                    P1_18
+  #define SDSS                             P1_21
 
-  #define STAT_LED_RED_PIN  P1_19
-  #define STAT_LED_BLUE_PIN P1_20
+  #define STAT_LED_RED_PIN                 P1_19
+  #define STAT_LED_BLUE_PIN                P1_20
 
 #elif HAS_SPI_LCD
 
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index 8f7d00bb3bdd..d4030ed7900c 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -32,61 +32,67 @@
 #define BOARD_INFO_NAME   "TH3D EZBoard"
 #define BOARD_WEBSITE_URL "th3dstudio.com"
 
+//
+// EEPROM
+//
+#define FLASH_EEPROM_EMULATION
+//#define SDCARD_EEPROM_EMULATION
+
 //
 // Servos
 //
-#define SERVO0_PIN         P2_04
+#define SERVO0_PIN                         P2_04
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         P1_24
-#define Y_STOP_PIN         P1_25
-#define Z_STOP_PIN         P1_26
+#define X_STOP_PIN                         P1_24
+#define Y_STOP_PIN                         P1_25
+#define Z_STOP_PIN                         P1_26
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_27
+  #define FIL_RUNOUT_PIN                   P1_27
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P1_16
-#define X_ENABLE_PIN       P1_17
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P1_16
+#define X_ENABLE_PIN                       P1_17
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P1_10
-#define Y_ENABLE_PIN       P1_09
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P1_10
+#define Y_ENABLE_PIN                       P1_09
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P1_15
-#define Z_ENABLE_PIN       P1_14
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P1_15
+#define Z_ENABLE_PIN                       P1_14
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P1_04
-#define E0_ENABLE_PIN      P1_08
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P1_04
+#define E0_ENABLE_PIN                      P1_08
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 #if HAS_TMC_UART
   //
   // TMC220x stepper drivers
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P0_04
-  #define X_SERIAL_RX_PIN  P0_05
-  #define Y_SERIAL_TX_PIN  P0_10
-  #define Y_SERIAL_RX_PIN  P0_11
-  #define Z_SERIAL_TX_PIN  P0_19
-  #define Z_SERIAL_RX_PIN  P0_20
-  #define E0_SERIAL_TX_PIN P0_22
-  #define E0_SERIAL_RX_PIN P0_21
+  #define X_SERIAL_TX_PIN                  P0_04
+  #define X_SERIAL_RX_PIN                  P0_05
+  #define Y_SERIAL_TX_PIN                  P0_10
+  #define Y_SERIAL_RX_PIN                  P0_11
+  #define Z_SERIAL_TX_PIN                  P0_19
+  #define Z_SERIAL_RX_PIN                  P0_20
+  #define E0_SERIAL_TX_PIN                 P0_22
+  #define E0_SERIAL_RX_PIN                 P0_21
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -96,50 +102,50 @@
 // Temp Sensors
 //  3.3V max when defined as an Analog Input!
 //
-#if TEMP_SENSOR_0 == 20         // PT100 Adapter
-  #define TEMP_0_PIN        P0_02_A7   // Analog Input
+#if TEMP_SENSOR_0 == 20                           // PT100 Adapter
+  #define TEMP_0_PIN                    P0_02_A7  // Analog Input
 #else
-  #define TEMP_0_PIN        P0_23_A0   // Analog Input P0_23
+  #define TEMP_0_PIN                    P0_23_A0  // Analog Input P0_23
 #endif
 
-#define TEMP_BED_PIN        P0_24_A1   // Analog Input P0_24
-#define TEMP_1_PIN          P0_25_A2   // Analog Input P0_25
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input P0_24
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input P0_25
 
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      P0_26_A3   // Analog Input P0_26
+  #define FILWIDTH_PIN                  P0_26_A3  // Analog Input P0_26
 #else
-  #define TEMP_2_PIN        P0_26_A3   // Analog Input P0_26
+  #define TEMP_2_PIN                    P0_26_A3  // Analog Input P0_26
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06
+  #define FAN_PIN                          P2_06
 #endif
-#define FAN1_PIN           P1_22
+#define FAN1_PIN                           P1_22
 
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN       P1_22   // FET 3
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
+#define AUTO_FAN_PIN                       P1_22  // FET 3
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // SD Card
 //
 
-#define SDCARD_CONNECTION ONBOARD
+#define SDCARD_CONNECTION                ONBOARD
 
-#define SCK_PIN            P0_07
-#define MISO_PIN           P0_08
-#define MOSI_PIN           P0_09
-#define ONBOARD_SD_CS_PIN  P0_06
-#define SS_PIN             ONBOARD_SD_CS_PIN
+#define SCK_PIN                            P0_07
+#define MISO_PIN                           P0_08
+#define MOSI_PIN                           P0_09
+#define ONBOARD_SD_CS_PIN                  P0_06
+#define SS_PIN                 ONBOARD_SD_CS_PIN
 
 //
 // LCD / Controller
@@ -164,14 +170,14 @@
  */
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define BEEPER_PIN       P1_31
-  #define BTN_EN1          P3_26
-  #define BTN_EN2          P3_25
-  #define BTN_ENC          P1_30
-  #define LCD_PINS_RS      P0_16
-  #define LCD_PINS_ENABLE  P0_18
-  #define LCD_PINS_D4      P0_15
-  #define KILL_PIN         P2_11
+  #define BEEPER_PIN                       P1_31
+  #define BTN_EN1                          P3_26
+  #define BTN_EN2                          P3_25
+  #define BTN_ENC                          P1_30
+  #define LCD_PINS_RS                      P0_16
+  #define LCD_PINS_ENABLE                  P0_18
+  #define LCD_PINS_D4                      P0_15
+  #define KILL_PIN                         P2_11
 #elif HAS_SPI_LCD
   #error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
 #endif
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
index de064559af70..7b0c0010a3b0 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
@@ -33,46 +33,46 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN          2
-#define Z_STOP_PIN          5
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                             2
+#define Z_STOP_PIN                             5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          15
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             15
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         35
-#define Y_DIR_PIN          36
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            35
+#define Y_DIR_PIN                             36
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         40
-#define Z_DIR_PIN          41
-#define Z_ENABLE_PIN       37
+#define Z_STEP_PIN                            40
+#define Z_DIR_PIN                             41
+#define Z_ENABLE_PIN                          37
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      25
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         25
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature sensors
 //
-#define TEMP_0_PIN         15   // Analog Input
-#define TEMP_1_PIN         14   // Analog Input
-#define TEMP_BED_PIN       13   // Analog Input
+#define TEMP_0_PIN                            15  // Analog Input
+#define TEMP_1_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          13  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       19   // EXTRUDER 1
-#define HEATER_1_PIN       23   // EXTRUDER 2
-#define HEATER_BED_PIN     22
+#define HEATER_0_PIN                          19  // EXTRUDER 1
+#define HEATER_1_PIN                          23  // EXTRUDER 2
+#define HEATER_BED_PIN                        22
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
index 5fd5bfdef13f..d56d08c9e0f4 100644
--- a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
+++ b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
@@ -36,101 +36,101 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          30
-#define X_MAX_PIN          31
-#define Y_MIN_PIN          32
-#define Y_MAX_PIN          33
-#define Z_MIN_PIN          34
-#define Z_MAX_PIN          35
+#define X_MIN_PIN                             30
+#define X_MAX_PIN                             31
+#define Y_MIN_PIN                             32
+#define Y_MAX_PIN                             33
+#define Z_MIN_PIN                             34
+#define Z_MAX_PIN                             35
 
 //
 // Steppers
 //
-#define X_STEP_PIN         17
-#define X_DIR_PIN          16
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            17
+#define X_DIR_PIN                             16
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         54
-#define Y_DIR_PIN          47
-#define Y_ENABLE_PIN       55
+#define Y_STEP_PIN                            54
+#define Y_DIR_PIN                             47
+#define Y_ENABLE_PIN                          55
 
-#define Z_STEP_PIN         57
-#define Z_DIR_PIN          56
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            57
+#define Z_DIR_PIN                             56
+#define Z_ENABLE_PIN                          62
 
-#define E0_STEP_PIN        23
-#define E0_DIR_PIN         22
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           23
+#define E0_DIR_PIN                            22
+#define E0_ENABLE_PIN                         24
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         25
-#define E1_ENABLE_PIN      27
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            25
+#define E1_ENABLE_PIN                         27
 
-#define E2_STEP_PIN        29
-#define E2_DIR_PIN         28
-#define E2_ENABLE_PIN      39
+#define E2_STEP_PIN                           29
+#define E2_DIR_PIN                            28
+#define E2_ENABLE_PIN                         39
 
 //
 // Temperature sensors
 //
-#define TEMP_0_PIN         15
-#define TEMP_1_PIN         13
-#define TEMP_2_PIN         14
-#define TEMP_3_PIN         11   // should be used for chamber temperature control
-#define TEMP_BED_PIN       12
+#define TEMP_0_PIN                            15
+#define TEMP_1_PIN                            13
+#define TEMP_2_PIN                            14
+#define TEMP_3_PIN                            11  // should be used for chamber temperature control
+#define TEMP_BED_PIN                          12
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        6
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN        8
-#define HEATER_BED_PIN      9
+#define HEATER_0_PIN                           6
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                           8
+#define HEATER_BED_PIN                         9
 #ifndef FAN_PIN
-  #define FAN_PIN           3
+  #define FAN_PIN                              3
 #endif
-#define FAN2_PIN           58   // additional fan or light control output
+#define FAN2_PIN                              58  // additional fan or light control output
 
 //
 // Other board specific pins
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   37   // board input labeled as F-DET
+  #define FIL_RUNOUT_PIN                      37  // board input labeled as F-DET
 #endif
-#define Z_MIN_PROBE_PIN    36   // additional external board input labeled as E-SENS (should be used for Z-probe)
-#define LED_PIN            13
-#define SPINDLE_ENABLE_PIN  4   // additional PWM pin 1 at JP1 connector - should be used for laser control too
-#define EXT_2               5   // additional PWM pin 2 at JP1 connector
-#define EXT_3               2   // additional PWM pin 3 at JP1 connector
-#define PS_ON_PIN          45
-#define KILL_PIN           46
+#define Z_MIN_PROBE_PIN                       36  // additional external board input labeled as E-SENS (should be used for Z-probe)
+#define LED_PIN                               13
+#define SPINDLE_ENABLE_PIN                     4  // additional PWM pin 1 at JP1 connector - should be used for laser control too
+#define EXT_2                                  5  // additional PWM pin 2 at JP1 connector
+#define EXT_3                                  2  // additional PWM pin 3 at JP1 connector
+#define PS_ON_PIN                             45
+#define KILL_PIN                              46
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN     11   // shared with TEMP_3 analog input
+  #define FILWIDTH_PIN                        11  // shared with TEMP_3 analog input
 #endif
 
 //
 // LCD / Controller
 //
-#define LCD_PINS_RS        19
-#define LCD_PINS_ENABLE    42
-#define LCD_PINS_D4        18
-#define LCD_PINS_D5        38
-#define LCD_PINS_D6        41
-#define LCD_PINS_D7        40
+#define LCD_PINS_RS                           19
+#define LCD_PINS_ENABLE                       42
+#define LCD_PINS_D4                           18
+#define LCD_PINS_D5                           38
+#define LCD_PINS_D6                           41
+#define LCD_PINS_D7                           40
 
 //
 // Beeper, SD Card, Encoder
 //
-#define BEEPER_PIN         44
+#define BEEPER_PIN                            44
 
 #if ENABLED(SDSUPPORT)
-  #define SDSS             53
-  #define SD_DETECT_PIN    49
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       49
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          11
-  #define BTN_EN2          12
-  #define BTN_ENC          43
+  #define BTN_EN1                             11
+  #define BTN_EN2                             12
+  #define BTN_ENC                             43
 #endif
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
index 047dc8ef5afa..833499fe0f85 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
@@ -34,115 +34,115 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         43
-#define Y_STOP_PIN         45
-#define Z_STOP_PIN         42
+#define X_STOP_PIN                            43
+#define Y_STOP_PIN                            45
+#define Z_STOP_PIN                            42
 
 //
 // Steppers
 //
-#define X_STEP_PIN         34
-#define X_DIR_PIN          36
-#define X_ENABLE_PIN       35
+#define X_STEP_PIN                            34
+#define X_DIR_PIN                             36
+#define X_ENABLE_PIN                          35
 
-#define Y_STEP_PIN         37
-#define Y_DIR_PIN          39
-#define Y_ENABLE_PIN       38
+#define Y_STEP_PIN                            37
+#define Y_DIR_PIN                             39
+#define Y_ENABLE_PIN                          38
 
-#define Z_STEP_PIN         40
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       41
+#define Z_STEP_PIN                            40
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          41
 
-#define E0_STEP_PIN        29
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN       3
+#define E0_STEP_PIN                           29
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                          3
 
-#define E1_STEP_PIN        61
-#define E1_DIR_PIN         62
-#define E1_ENABLE_PIN      60
+#define E1_STEP_PIN                           61
+#define E1_DIR_PIN                            62
+#define E1_ENABLE_PIN                         60
 
-#define E2_STEP_PIN        15
-#define E2_DIR_PIN         14
-#define E2_ENABLE_PIN      16
+#define E2_STEP_PIN                           15
+#define E2_DIR_PIN                            14
+#define E2_ENABLE_PIN                         16
 
-#define E3_STEP_PIN        44
-#define E3_DIR_PIN         49
-#define E3_ENABLE_PIN      47
+#define E3_STEP_PIN                           44
+#define E3_DIR_PIN                            49
+#define E3_ENABLE_PIN                         47
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          3   // Analog Input.  3 for tool2 -> 2 for chambertemp
-#define TEMP_2_PIN          2   // Analog Input.  9 for tool3 -> 2 for chambertemp
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 2 for chambertemp
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             3  // Analog Input.  3 for tool2 -> 2 for chambertemp
+#define TEMP_2_PIN                             2  // Analog Input.  9 for tool3 -> 2 for chambertemp
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 2 for chambertemp
+#define TEMP_BED_PIN                           1  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 2  // Analog Input
+  //#define TEMP_CHAMBER_PIN                   2  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        5
-#define HEATER_1_PIN       58
-#define HEATER_2_PIN       64
-#define HEATER_3_PIN       46
-#define HEATER_BED_PIN      2
+#define HEATER_0_PIN                           5
+#define HEATER_1_PIN                          58
+#define HEATER_2_PIN                          64
+#define HEATER_3_PIN                          46
+#define HEATER_BED_PIN                         2
 
 #ifndef FAN_PIN
-  //#define FAN_PIN         7   // common PWM pin for all tools
+  //#define FAN_PIN                            7  // common PWM pin for all tools
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                   7
+#define ORIG_E1_AUTO_FAN_PIN                   7
+#define ORIG_E2_AUTO_FAN_PIN                   7
+#define ORIG_E3_AUTO_FAN_PIN                   7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      13
+#define SDSS                                  53
+#define SD_DETECT_PIN                         13
 
 // Tools
 
-//#define TOOL_0_PIN           4
-//#define TOOL_1_PIN          59
-//#define TOOL_2_PIN           8
-//#define TOOL_3_PIN          30
-//#define TOOL_PWM_PIN         7   // common PWM pin for all tools
+//#define TOOL_0_PIN                           4
+//#define TOOL_1_PIN                          59
+//#define TOOL_2_PIN                           8
+//#define TOOL_3_PIN                          30
+//#define TOOL_PWM_PIN                         7  // common PWM pin for all tools
 
 // Common I/O
 
-//#define FIL_RUNOUT_PIN      -1
-//#define PWM_1_PIN           11
-//#define PWM_2_PIN           10
-//#define SPARE_IO            12
+//#define FIL_RUNOUT_PIN                      -1
+//#define PWM_1_PIN                           11
+//#define PWM_2_PIN                           10
+//#define SPARE_IO                            12
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN          6
+#define BEEPER_PIN                             6
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0          26
-#define DOGLCD_CS          24
-#define DOGLCD_MOSI        -1
-#define DOGLCD_SCK         -1
+#define DOGLCD_A0                             26
+#define DOGLCD_CS                             24
+#define DOGLCD_MOSI                           -1
+#define DOGLCD_SCK                            -1
 
-#define BTN_EN1            23
-#define BTN_EN2            25
-#define BTN_ENC            27
+#define BTN_EN1                               23
+#define BTN_EN2                               25
+#define BTN_ENC                               27
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT          19
-#define SHIFT_LD           18
-#define SHIFT_CLK          17
+#define SHIFT_OUT                             19
+#define SHIFT_LD                              18
+#define SHIFT_CLK                             17
 
-//#define UI1                31
-//#define UI2                22
+//#define UI1                                 31
+//#define UI2                                 22
 
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   31
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      31
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
index 246a5964f063..680a5c9a9943 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -34,122 +34,122 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         19
-#define Y_STOP_PIN         22
-#define Z_STOP_PIN         23
+#define X_STOP_PIN                            19
+#define Y_STOP_PIN                            22
+#define Z_STOP_PIN                            23
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          27
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             27
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         28
-#define Y_DIR_PIN          30
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            28
+#define Y_DIR_PIN                             30
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         31
-#define Z_DIR_PIN          33
-#define Z_ENABLE_PIN       32
+#define Z_STEP_PIN                            31
+#define Z_DIR_PIN                             33
+#define Z_ENABLE_PIN                          32
 
-#define E0_STEP_PIN        57
-#define E0_DIR_PIN         55
-#define E0_ENABLE_PIN      58
+#define E0_STEP_PIN                           57
+#define E0_DIR_PIN                            55
+#define E0_ENABLE_PIN                         58
 
-#define E1_STEP_PIN        61
-#define E1_DIR_PIN         62
-#define E1_ENABLE_PIN      60
+#define E1_STEP_PIN                           61
+#define E1_DIR_PIN                            62
+#define E1_ENABLE_PIN                         60
 
-#define E2_STEP_PIN        46
-#define E2_DIR_PIN         66
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           46
+#define E2_DIR_PIN                            66
+#define E2_ENABLE_PIN                         44
 
-#define E3_STEP_PIN        45
-#define E3_DIR_PIN         69
-#define E3_ENABLE_PIN      47
+#define E3_STEP_PIN                           45
+#define E3_DIR_PIN                            69
+#define E3_ENABLE_PIN                         47
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input.  9 for tool2 -> 13 for chambertemp
-#define TEMP_2_PIN         13   // Analog Input. 10 for tool3 -> 13 for chambertemp
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 13 for chambertemp
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input.  9 for tool2 -> 13 for chambertemp
+#define TEMP_2_PIN                            13  // Analog Input. 10 for tool3 -> 13 for chambertemp
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 13 for chambertemp
+#define TEMP_BED_PIN                          14  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 13 // Analog Input
+  //#define TEMP_CHAMBER_PIN                  13  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       11
-#define HEATER_1_PIN        9
-#define HEATER_2_PIN        6
-#define HEATER_3_PIN        3
-#define HEATER_BED_PIN     24
+#define HEATER_0_PIN                          11
+#define HEATER_1_PIN                           9
+#define HEATER_2_PIN                           6
+#define HEATER_3_PIN                           3
+#define HEATER_BED_PIN                        24
 
 #ifndef FAN_PIN
-  #define FAN_PIN           5   // 5 is PWMtool3 -> 7 is common PWM pin for all tools
+  #define FAN_PIN                              5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                   7
+#define ORIG_E1_AUTO_FAN_PIN                   7
+#define ORIG_E2_AUTO_FAN_PIN                   7
+#define ORIG_E3_AUTO_FAN_PIN                   7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      15
+#define SDSS                                  53
+#define SD_DETECT_PIN                         15
 
 // Tools
 
-//#define TOOL_0_PIN         56
-//#define TOOL_0_PWM_PIN     10   // red warning led at dual extruder
-//#define TOOL_1_PIN         59
-//#define TOOL_1_PWM_PIN      8   // lights at dual extruder
-//#define TOOL_2_PIN          4
-//#define TOOL_2_PWM_PIN      5
-//#define TOOL_3_PIN         14
-//#define TOOL_3_PWM_PIN      2
+//#define TOOL_0_PIN                          56
+//#define TOOL_0_PWM_PIN                      10  // red warning led at dual extruder
+//#define TOOL_1_PIN                          59
+//#define TOOL_1_PWM_PIN                       8  // lights at dual extruder
+//#define TOOL_2_PIN                           4
+//#define TOOL_2_PWM_PIN                       5
+//#define TOOL_3_PIN                          14
+//#define TOOL_3_PWM_PIN                       2
 
 // Common I/O
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   18
+  #define FIL_RUNOUT_PIN                      18
 #endif
-//#define PWM_1_PIN          12
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
+//#define PWM_1_PIN                           12
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         16
+#define BEEPER_PIN                            16
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0          39
-#define DOGLCD_CS          35
-#define DOGLCD_MOSI        48
-#define DOGLCD_SCK         49
+#define DOGLCD_A0                             39
+#define DOGLCD_CS                             35
+#define DOGLCD_MOSI                           48
+#define DOGLCD_SCK                            49
 #define LCD_SCREEN_ROT_180
 
 // The encoder and click button
-#define BTN_EN1            36
-#define BTN_EN2            34
-#define BTN_ENC            38
+#define BTN_EN1                               36
+#define BTN_EN2                               34
+#define BTN_ENC                               38
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT          42
-#define SHIFT_LD           41
-#define SHIFT_CLK          40
+#define SHIFT_OUT                             42
+#define SHIFT_LD                              41
+#define SHIFT_CLK                             40
 
-//#define UI1              43
-//#define UI2              37
+//#define UI1                                 43
+//#define UI2                                 37
 
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   10   // TOOL_0_PWM_PIN
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      10  // TOOL_0_PWM_PIN
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
index bf7d65f7e7b0..b4aa8ab815f4 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
@@ -34,79 +34,79 @@
 //
 // Servos
 //
-#define SERVO0_PIN          6
+#define SERVO0_PIN                             6
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         39
-#define Z_STOP_PIN         62
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            39
+#define Z_STOP_PIN                            62
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          25
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             25
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN          12
-#define Y_ENABLE_PIN       15
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                             12
+#define Y_ENABLE_PIN                          15
 
-#define Z_STEP_PIN         24
-#define Z_DIR_PIN          27
-#define Z_ENABLE_PIN       28
+#define Z_STEP_PIN                            24
+#define Z_DIR_PIN                             27
+#define Z_ENABLE_PIN                          28
 
-#define E0_STEP_PIN        64
-#define E0_DIR_PIN         65
-#define E0_ENABLE_PIN      63
+#define E0_STEP_PIN                           64
+#define E0_DIR_PIN                            65
+#define E0_ENABLE_PIN                         63
 
 //
 // Temperature Sensors
 // Analog Inputs
 //
-#define TEMP_0_PIN          2   // Analog Input
-#define TEMP_BED_PIN        4   // Analog Input
+#define TEMP_0_PIN                             2  // Analog Input
+#define TEMP_BED_PIN                           4  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN  5   // Analog Input
+  #define TEMP_CHAMBER_PIN                     5  // Analog Input
 #endif
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN     32
-#define HEATER_CHAMBER_PIN 33
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                        32
+#define HEATER_CHAMBER_PIN                    33
 
 //
 // Fans
 //
-#define FAN_PIN               8
-#define ORIG_E0_AUTO_FAN_PIN 30
-#define ORIG_E1_AUTO_FAN_PIN 30
-#define ORIG_E2_AUTO_FAN_PIN 30
-#define ORIG_E3_AUTO_FAN_PIN 30
-//#define ORIG_CHAMBER_AUTO_FAN_PIN 10
+#define FAN_PIN                                8
+#define ORIG_E0_AUTO_FAN_PIN                  30
+#define ORIG_E1_AUTO_FAN_PIN                  30
+#define ORIG_E2_AUTO_FAN_PIN                  30
+#define ORIG_E3_AUTO_FAN_PIN                  30
+//#define ORIG_CHAMBER_AUTO_FAN_PIN           10
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      40
+#define SDSS                                  53
+#define SD_DETECT_PIN                         40
 
 // Common I/O
 
-#define FIL_RUNOUT_PIN      9
-//#define FIL_RUNOUT_PIN     29  // encoder sensor
-//#define PWM_1_PIN          12
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
-#define BEEPER_PIN         13
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   10 // 31
+#define FIL_RUNOUT_PIN                         9
+//#define FIL_RUNOUT_PIN                      29  // encoder sensor
+//#define PWM_1_PIN                           12
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
+#define BEEPER_PIN                            13
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      10  // 31
diff --git a/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin/src/pins/mega/pins_EINSTART-S.h
index 45b500363e92..8bb8f081f57e 100644
--- a/Marlin/src/pins/mega/pins_EINSTART-S.h
+++ b/Marlin/src/pins/mega/pins_EINSTART-S.h
@@ -35,48 +35,48 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         44
-#define Y_STOP_PIN         43
-#define Z_STOP_PIN         42
+#define X_STOP_PIN                            44
+#define Y_STOP_PIN                            43
+#define Z_STOP_PIN                            42
 
 //
 // Steppers
 //
-#define X_STEP_PIN         76
-#define X_DIR_PIN          75
-#define X_ENABLE_PIN       73
+#define X_STEP_PIN                            76
+#define X_DIR_PIN                             75
+#define X_ENABLE_PIN                          73
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          32
-#define Y_ENABLE_PIN       72
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             32
+#define Y_ENABLE_PIN                          72
 
-#define Z_STEP_PIN         34
-#define Z_DIR_PIN          35
-#define Z_ENABLE_PIN       33
+#define Z_STEP_PIN                            34
+#define Z_DIR_PIN                             35
+#define Z_ENABLE_PIN                          33
 
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         37
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            37
+#define E0_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       83
-#define HEATER_BED_PIN     38
+#define HEATER_0_PIN                          83
+#define HEATER_BED_PIN                        38
 
-#define FAN_PIN            82
+#define FAN_PIN                               82
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN             4
+#define SDSS                                  53
+#define LED_PIN                                4
 
 //////////////////////////
 // LCDs and Controllers //
@@ -90,24 +90,24 @@
 // u8glib constructor
 // U8GLIB_SH1106_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, LCD_PINS_DC, LCD_PINS_RS);
 
-#define LCD_PINS_DC        78
-#define LCD_PINS_RS        79
+#define LCD_PINS_DC                           78
+#define LCD_PINS_RS                           79
 // DOGM SPI LCD Support
-#define DOGLCD_CS           3
-#define DOGLCD_MOSI         2
-#define DOGLCD_SCK          5
-#define DOGLCD_A0           2
+#define DOGLCD_CS                              3
+#define DOGLCD_MOSI                            2
+#define DOGLCD_SCK                             5
+#define DOGLCD_A0                              2
 
 //
 // LCD Display input pins
 //
-#define BTN_UP             25
-#define BTN_DWN            26
-#define BTN_LFT            27
-#define BTN_RT             28
+#define BTN_UP                                25
+#define BTN_DWN                               26
+#define BTN_LFT                               27
+#define BTN_RT                                28
 
 // 'OK' button
-#define BTN_ENC            29
+#define BTN_ENC                               29
 
 // Set Kill to right arrow, same as RIGID_PANEL
-#define KILL_PIN           28
+#define KILL_PIN                              28
diff --git a/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin/src/pins/mega/pins_ELEFU_3.h
index 30b4ab40af04..3d35a72b1939 100644
--- a/Marlin/src/pins/mega/pins_ELEFU_3.h
+++ b/Marlin/src/pins/mega/pins_ELEFU_3.h
@@ -34,115 +34,115 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          35
-#define X_MAX_PIN          34
-#define Y_MIN_PIN          33
-#define Y_MAX_PIN          32
-#define Z_MIN_PIN          31
-#define Z_MAX_PIN          30
+#define X_MIN_PIN                             35
+#define X_MAX_PIN                             34
+#define Y_MIN_PIN                             33
+#define Y_MAX_PIN                             32
+#define Z_MIN_PIN                             31
+#define Z_MAX_PIN                             30
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  30
+  #define Z_MIN_PROBE_PIN                     30
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         49
-#define X_DIR_PIN          13
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            49
+#define X_DIR_PIN                             13
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN           9
-#define Y_ENABLE_PIN       12
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                              9
+#define Y_ENABLE_PIN                          12
 
-#define Z_STEP_PIN          7
-#define Z_DIR_PIN           6
-#define Z_ENABLE_PIN        8
+#define Z_STEP_PIN                             7
+#define Z_DIR_PIN                              6
+#define Z_ENABLE_PIN                           8
 
-#define E0_STEP_PIN        40
-#define E0_DIR_PIN         41
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           40
+#define E0_DIR_PIN                            41
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        18
-#define E1_DIR_PIN         19
-#define E1_ENABLE_PIN      38
+#define E1_STEP_PIN                           18
+#define E1_DIR_PIN                            19
+#define E1_ENABLE_PIN                         38
 
-#define E2_STEP_PIN        43
-#define E2_DIR_PIN         47
-#define E2_ENABLE_PIN      42
+#define E2_STEP_PIN                           43
+#define E2_DIR_PIN                            47
+#define E2_ENABLE_PIN                         42
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          3   // Analog Input
-#define TEMP_1_PIN          2   // Analog Input
-#define TEMP_2_PIN          1   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             3  // Analog Input
+#define TEMP_1_PIN                             2  // Analog Input
+#define TEMP_2_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       45   // 12V PWM1
-#define HEATER_1_PIN       46   // 12V PWM2
-#define HEATER_2_PIN       17   // 12V PWM3
-#define HEATER_BED_PIN     44   // DOUBLE 12V PWM
+#define HEATER_0_PIN                          45  // 12V PWM1
+#define HEATER_1_PIN                          46  // 12V PWM2
+#define HEATER_2_PIN                          17  // 12V PWM3
+#define HEATER_BED_PIN                        44  // DOUBLE 12V PWM
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // 5V PWM
+  #define FAN_PIN                             16  // 5V PWM
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          10   // Set to -1 if using a manual switch on the PWRSW Connector
-#define SLEEP_WAKE_PIN     26   // This feature still needs work
-#define PHOTOGRAPH_PIN     29
+#define PS_ON_PIN                             10  // Set to -1 if using a manual switch on the PWRSW Connector
+#define SLEEP_WAKE_PIN                        26  // This feature still needs work
+#define PHOTOGRAPH_PIN                        29
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         36
+#define BEEPER_PIN                            36
 
 #if ENABLED(RA_CONTROL_PANEL)
 
-  #define SDSS             53
-  #define SD_DETECT_PIN    28
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       28
 
-  #define BTN_EN1          14
-  #define BTN_EN2          39
-  #define BTN_ENC          15
+  #define BTN_EN1                             14
+  #define BTN_EN2                             39
+  #define BTN_ENC                             15
 
 #endif // RA_CONTROL_PANEL
 
 #if ENABLED(RA_DISCO)
   // variables for which pins the TLC5947 is using
-  #define TLC_CLOCK_PIN    25
-  #define TLC_BLANK_PIN    23
-  #define TLC_XLAT_PIN     22
-  #define TLC_DATA_PIN     24
+  #define TLC_CLOCK_PIN                       25
+  #define TLC_BLANK_PIN                       23
+  #define TLC_XLAT_PIN                        22
+  #define TLC_DATA_PIN                        24
 
   // We also need to define pin to port number mapping for the 2560 to match the pins listed above.
   // If you change the TLC pins, update this as well per the 2560 datasheet! This currently only works with the RA Board.
-  #define TLC_CLOCK_BIT     3
+  #define TLC_CLOCK_BIT                        3
   #define TLC_CLOCK_PORT    &PORTA
 
-  #define TLC_BLANK_BIT     1
+  #define TLC_BLANK_BIT                        1
   #define TLC_BLANK_PORT    &PORTA
 
-  #define TLC_DATA_BIT      2
+  #define TLC_DATA_BIT                         2
   #define TLC_DATA_PORT     &PORTA
 
-  #define TLC_XLAT_BIT      0
+  #define TLC_XLAT_BIT                         0
   #define TLC_XLAT_PORT     &PORTA
 
   // Change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
   // Leave it at at least 1 if you have enabled RA_LIGHTING
   // The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
-  #define NUM_TLCS          2
+  #define NUM_TLCS                             2
 
   // These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
   // Modify them according to your specific situation.
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index 6590f06d6cb3..e111f2ce4485 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -39,102 +39,102 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          32
+#define X_MIN_PIN                             22
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             26
+#define Y_MAX_PIN                             28
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             32
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8
-#define TEMP_1_PIN          9
-#define TEMP_BED_PIN       10
+#define TEMP_0_PIN                             8
+#define TEMP_1_PIN                             9
+#define TEMP_BED_PIN                          10
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // Must be enabled at startup to keep power flowing
-#define KILL_PIN           -1
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // Must be enabled at startup to keep power flowing
+#define KILL_PIN                              -1
 
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
     #if ENABLED(MKS_MINI_12864)
-      #define DOGLCD_A0     5
-      #define DOGLCD_CS    21
-      #define BTN_EN1      40
-      #define BTN_EN2      42
+      #define DOGLCD_A0                        5
+      #define DOGLCD_CS                       21
+      #define BTN_EN1                         40
+      #define BTN_EN2                         42
     #else
-      #define LCD_PINS_RS  20
-      #define LCD_PINS_ENABLE 17
-      #define LCD_PINS_D4  16
-      #define LCD_PINS_D5  21
-      #define LCD_PINS_D6   5
-      #define LCD_PINS_D7   6
-      #define BTN_EN1      42
-      #define BTN_EN2      40
+      #define LCD_PINS_RS                     20
+      #define LCD_PINS_ENABLE                 17
+      #define LCD_PINS_D4                     16
+      #define LCD_PINS_D5                     21
+      #define LCD_PINS_D6                      5
+      #define LCD_PINS_D7                      6
+      #define BTN_EN1                         42
+      #define BTN_EN2                         40
     #endif
 
-    #define BTN_ENC        19
-    #define SD_DETECT_PIN  38
+    #define BTN_ENC                           19
+    #define SD_DETECT_PIN                     38
 
-  #else // !NEWPANEL
+  #else                                           // !NEWPANEL
 
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
 
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
-    #define SD_DETECT_PIN  -1
+    #define SD_DETECT_PIN                     -1
 
   #endif // !NEWPANEL
 
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
index 4d6cee56f42b..08f9018a29d1 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * GT2560 V3.0 pin assignment
+ * GT2560 RevB + GT2560 V3.0 + GT2560 V3.1 + GT2560 V4.0 pin assignment
  */
 
 #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
@@ -36,33 +36,33 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11   //13 untested  3Dtouch
+#define SERVO0_PIN                            11  //13 untested  3Dtouch
 
 //
 // Limit Switches
 //
 #ifndef X_STOP_PIN
   #ifndef X_MIN_PIN
-    #define X_MIN_PIN      24
+    #define X_MIN_PIN                         24
   #endif
   #ifndef X_MAX_PIN
-    #define X_MAX_PIN      22
+    #define X_MAX_PIN                         22
   #endif
 #endif
 #ifndef Y_STOP_PIN
   #ifndef Y_MIN_PIN
-    #define Y_MIN_PIN      28
+    #define Y_MIN_PIN                         28
   #endif
   #ifndef Y_MAX_PIN
-    #define Y_MAX_PIN      26
+    #define Y_MAX_PIN                         26
   #endif
 #endif
 #ifndef Z_STOP_PIN
   #ifndef Z_MIN_PIN
-    #define Z_MIN_PIN      30
+    #define Z_MIN_PIN                         30
   #endif
   #ifndef Z_MAX_PIN
-    #define Z_MAX_PIN      32
+    #define Z_MAX_PIN                         32
   #endif
 #endif
 
@@ -70,116 +70,116 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   66
+  #define FIL_RUNOUT_PIN                      66
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  67
+  #define FIL_RUNOUT2_PIN                     67
 #endif
 
 //
 // Power Recovery
 //
-#define POWER_LOSS_PIN     69   // Pin to detect power loss
-#define POWER_LOSS_STATE   LOW
+#define POWER_LOSS_PIN                        69  // Pin to detect power loss
+#define POWER_LOSS_STATE                     LOW
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          39
-#define X_ENABLE_PIN       35
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             39
+#define X_ENABLE_PIN                          35
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         25
-#define Z_DIR_PIN          23
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            25
+#define Z_DIR_PIN                             23
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        46
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      12
+#define E0_STEP_PIN                           46
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         12
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define E2_STEP_PIN        43
-#define E2_DIR_PIN         45
-#define E2_ENABLE_PIN      41
+#define E2_STEP_PIN                           43
+#define E2_DIR_PIN                            45
+#define E2_ENABLE_PIN                         41
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         11   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_2_PIN          1   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                            11  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_2_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        3
-#define HEATER_2_PIN        1
-#define HEATER_BED_PIN      4
-#define FAN_PIN             9
-#define FAN1_PIN            8
-#define FAN2_PIN            7
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           3
+#define HEATER_2_PIN                           1
+#define HEATER_BED_PIN                         4
+#define FAN_PIN                                9
+#define FAN1_PIN                               8
+#define FAN2_PIN                               7
 
 //
 // Misc. Functions
 //
-#define SD_DETECT_PIN      38
-#define SDSS               53
-#define LED_PIN             6
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // This pin must be enabled at boot to keep power flowing
+#define SD_DETECT_PIN                         38
+#define SDSS                                  53
+#define LED_PIN                                6
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // This pin must be enabled at boot to keep power flowing
 
 #ifndef CASE_LIGHT_PIN
-  #define CASE_LIGHT_PIN    6   // 21
+  #define CASE_LIGHT_PIN                       6  // 21
 #endif
 
 //
 // LCD Controller
 //
-#define BEEPER_PIN         18
+#define BEEPER_PIN                            18
 
 #ifndef LCD_PINS_RS
-  #define LCD_PINS_RS      20
+  #define LCD_PINS_RS                         20
 #endif
 #ifndef LCD_PINS_ENABLE
-  #define LCD_PINS_ENABLE  17
+  #define LCD_PINS_ENABLE                     17
 #endif
 #ifndef LCD_PINS_D4
-  #define LCD_PINS_D4      16
+  #define LCD_PINS_D4                         16
 #endif
 #ifndef LCD_PINS_D5
-  #define LCD_PINS_D5      21
+  #define LCD_PINS_D5                         21
 #endif
 #ifndef LCD_PINS_D6
-  #define LCD_PINS_D6       5
+  #define LCD_PINS_D6                          5
 #endif
 #ifndef LCD_PINS_D7
-  #define LCD_PINS_D7      36
+  #define LCD_PINS_D7                         36
 #endif
 
 #if ENABLED(NEWPANEL)
   #ifndef BTN_EN1
-    #define BTN_EN1        42
+    #define BTN_EN1                           42
   #endif
   #ifndef BTN_EN2
-    #define BTN_EN2        40
+    #define BTN_EN2                           40
   #endif
   #ifndef BTN_ENC
-    #define BTN_ENC        19
+    #define BTN_ENC                           19
   #endif
 #endif
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
index 037ea1324444..06ac9fd9df14 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_A20.h
@@ -25,15 +25,15 @@
  * Geeetech A20M pin assignment
  */
 
-#define LCD_PINS_RS       5
-#define LCD_PINS_ENABLE  36
-#define LCD_PINS_D4      21
-#define LCD_PINS_D7       6
+#define LCD_PINS_RS                           5
+#define LCD_PINS_ENABLE                      36
+#define LCD_PINS_D4                          21
+#define LCD_PINS_D7                           6
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1        16
-  #define BTN_EN2        17
-  #define BTN_ENC        19
+  #define BTN_EN1                            16
+  #define BTN_EN2                            17
+  #define BTN_ENC                            19
 #endif
 
 #include "pins_GT2560_V3.h"
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
index 7ba9112d4e72..0f06aaf25642 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
@@ -27,9 +27,9 @@
 
 #define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
 
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
+#define X_MIN_PIN                            22
+#define X_MAX_PIN                            24
+#define Y_MIN_PIN                            26
+#define Y_MAX_PIN                            28
 
 #include "pins_GT2560_V3.h"
diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index b66756668805..66adfb2fa7d7 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -42,79 +42,79 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         22
-#define Y_STOP_PIN         26
-#define Z_STOP_PIN         29
-//#define EXP_STOP_PIN       28
+#define X_STOP_PIN                            22
+#define Y_STOP_PIN                            26
+#define Z_STOP_PIN                            29
+//#define EXP_STOP_PIN                        28
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         32
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            32
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          36
-#define Z_ENABLE_PIN       34
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             36
+#define Z_ENABLE_PIN                          34
 
-#define E0_STEP_PIN        42
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           42
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define MOTOR_CURRENT_PWM_XY_PIN   44
-#define MOTOR_CURRENT_PWM_Z_PIN    45
-#define MOTOR_CURRENT_PWM_E_PIN    46
+#define MOTOR_CURRENT_PWM_XY_PIN              44
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               46
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE  2000
+  #define MOTOR_CURRENT_PWM_RANGE            2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1300, 1300, 1250 }
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7   //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
+  #define FAN_PIN                              7  //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      39
-//#define LED_PIN           8
-#define CASE_LIGHT_PIN      8           // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
+#define SDSS                                  53
+#define SD_DETECT_PIN                         39
+//#define LED_PIN                              8
+#define CASE_LIGHT_PIN                         8  // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
 
-//#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
-//#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+//#define SAFETY_TRIGGERED_PIN                28  // PIN to detect the safety circuit has triggered
+//#define MAIN_VOLTAGE_MEASURE_PIN            14  // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if ENABLED(SPINDLE_LASER_ENABLE)
-  #define SPINDLE_DIR_PIN           16
-  #define SPINDLE_LASER_ENABLE_PIN  17   // Pin should have a pullup!
-  #define SPINDLE_LASER_PWM_PIN      9   // Hardware PWM
+  #define SPINDLE_DIR_PIN                     16
+  #define SPINDLE_LASER_ENABLE_PIN            17  // Pin should have a pullup!
+  #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
 #endif
 
 //
@@ -122,48 +122,48 @@
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS     20   // LCD_CS
-    #define LCD_PINS_ENABLE 15   // LCD_SDA
-    #define LCD_PINS_D4     14   // LCD_SCK
+    #define LCD_PINS_RS                       20  // LCD_CS
+    #define LCD_PINS_ENABLE                   15  // LCD_SDA
+    #define LCD_PINS_D4                       14  // LCD_SCK
 
     #if ENABLED(HJC_LCD_SMART_CONTROLLER)
-      #define LCD_BACKLIGHT_PIN  5   // LCD_Backlight
+      #define LCD_BACKLIGHT_PIN                5  // LCD_Backlight
       //#ifndef LCD_CONTRAST_PIN
       //  #define LCD_CONTRAST_PIN  5   // LCD_Contrast
       //#endif
       #ifndef FIL_RUNOUT_PIN
-        #define FIL_RUNOUT_PIN 24   // Filament runout
+        #define FIL_RUNOUT_PIN                24  // Filament runout
       #endif
     #else
-      #define LCD_PINS_D5  21
-      #define LCD_PINS_D6   5
-      #define LCD_PINS_D7   6
+      #define LCD_PINS_D5                     21
+      #define LCD_PINS_D6                      5
+      #define LCD_PINS_D7                      6
     #endif
 
-    #define BTN_EN1        41
-    #define BTN_EN2        40
-    #define BTN_ENC        19
+    #define BTN_EN1                           41
+    #define BTN_EN2                           40
+    #define BTN_ENC                           19
 
-    #define SD_DETECT_PIN  39
+    #define SD_DETECT_PIN                     39
 
   #else
 
     // Buttons attached to a shift register
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
-
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
+
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
   #endif // !NEWPANEL
 
diff --git a/Marlin/src/pins/mega/pins_INTAMSYS40.h b/Marlin/src/pins/mega/pins_INTAMSYS40.h
new file mode 100644
index 000000000000..c688823ddf75
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_INTAMSYS40.h
@@ -0,0 +1,152 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Intamsys Funmat HT V4.0 Mainboard
+ * 4988 Drivers Tested
+ * 2208 version exists and may or may not work
+ */
+
+#ifndef __AVR_ATmega2560__
+  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
+#endif
+
+#define BOARD_INFO_NAME "Intamsys 4.0"
+
+//
+// Servos
+//
+#define SERVO0_PIN                            12  // Uses High Temp Present Jumper Pin
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                            22
+#define Y_STOP_PIN                            26
+#define Z_MIN_PIN                             29
+#define Z_MAX_PIN                             69
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     69
+#endif
+
+#define FIL_RUNOUT_PIN                        10
+
+//
+// Steppers
+//
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27  // 44
+
+#define Y_STEP_PIN                            32  // 33
+#define Y_DIR_PIN                             33  // 31, 32
+#define Y_ENABLE_PIN                          31  // 32
+
+#define Z_STEP_PIN                            35  // 35
+#define Z_DIR_PIN                             36
+#define Z_ENABLE_PIN                          34  // 34
+
+#define E0_STEP_PIN                           42
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         37
+
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
+
+#define MOTOR_CURRENT_PWM_X_PIN               11
+#define MOTOR_CURRENT_PWM_Y_PIN               44
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               46
+
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
+#ifndef MOTOR_CURRENT_PWM_RANGE
+  #define MOTOR_CURRENT_PWM_RANGE  2000
+#endif
+#define DEFAULT_PWM_MOTOR_CURRENT  { 1300, 1300, 1250 }
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                             8  // Analog Input D62
+#define TEMP_BED_PIN                          10  // Analog Input D64
+
+#define TEMP_CHAMBER_PIN                       9  // Analog Input D63
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                           2  // PWM
+#define HEATER_BED_PIN                         4  // PWM
+#define HEATER_CHAMBER_PIN                     3  // PWM
+#define FAN_PIN                                7  // PWM
+
+//
+// Misc. Functions
+//
+#define SDSS                                  53
+#define SD_DETECT_PIN                         39
+
+#if ENABLED(CASE_LIGHT_ENABLE)
+  #define CASE_LIGHT_PIN                       8
+#endif
+
+#if ENABLED(PSU_CONTROL)
+  #define PS_ON_PIN                           38  // UPS Module
+#endif
+
+//
+// LCD Controller
+//
+
+#define BEEPER_PIN                            18
+
+#if HAS_SPI_LCD
+  #define LCD_PINS_RS                         20
+  #define LCD_PINS_ENABLE                     30
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D5                         21
+  #define LCD_PINS_D6                          5
+  #define LCD_PINS_D7                          6
+  #define BTN_EN1                             40
+  #define BTN_EN2                             41
+  #define BTN_ENC                             19
+#endif
+
+///////////////////// SPARE HEADERS //////////////
+
+/**
+ *
+ * J25
+ * 1 D54
+ * 2 D55
+ * 3 D56
+ * 4 D57
+ * 5 D58
+ * 6 D59
+ * 7 D60
+ * 8 D61
+
+Hotend High Temp Connected : D12
+*/
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG.h b/Marlin/src/pins/mega/pins_LEAPFROG.h
index f04b89d4bcb0..188cbcad3da8 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG.h
@@ -34,59 +34,59 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          47
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          48
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          49
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                             47
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             48
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             49
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28
-#define X_DIR_PIN          63
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            28
+#define X_DIR_PIN                             63
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         14   // A6
-#define Y_DIR_PIN          15   // A0
-#define Y_ENABLE_PIN       39
+#define Y_STEP_PIN                            14  // A6
+#define Y_DIR_PIN                             15  // A0
+#define Y_ENABLE_PIN                          39
 
-#define Z_STEP_PIN         31   // A2
-#define Z_DIR_PIN          32   // A6
-#define Z_ENABLE_PIN       30   // A1
+#define Z_STEP_PIN                            31  // A2
+#define Z_DIR_PIN                             32  // A6
+#define Z_ENABLE_PIN                          30  // A1
 
-#define E0_STEP_PIN        34   // 34
-#define E0_DIR_PIN         35   // 35
-#define E0_ENABLE_PIN      33   // 33
+#define E0_STEP_PIN                           34  // 34
+#define E0_DIR_PIN                            35  // 35
+#define E0_ENABLE_PIN                         33  // 33
 
-#define E1_STEP_PIN        37   // 37
-#define E1_DIR_PIN         40   // 40
-#define E1_ENABLE_PIN      36   // 36
+#define E1_STEP_PIN                           37  // 37
+#define E1_DIR_PIN                            40  // 40
+#define E1_ENABLE_PIN                         36  // 36
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input (D27)
-#define TEMP_1_PIN         15   // Analog Input (1)
-#define TEMP_BED_PIN       14   // Analog Input (1,2 or I2C)
+#define TEMP_0_PIN                            13  // Analog Input (D27)
+#define TEMP_1_PIN                            15  // Analog Input (1)
+#define TEMP_BED_PIN                          14  // Analog Input (1,2 or I2C)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8   // 12
-#define HEATER_2_PIN       11   // 13
-#define HEATER_BED_PIN     10   // 14/15
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8  // 12
+#define HEATER_2_PIN                          11  // 13
+#define HEATER_BED_PIN                        10  // 14/15
 
-#define FAN_PIN             7
+#define FAN_PIN                                7
 
 //
 // Misc. Functions
 //
-#define SDSS               11
-#define LED_PIN            13
-#define SOL1_PIN           16
-#define SOL2_PIN           17
+#define SDSS                                  11
+#define LED_PIN                               13
+#define SOL1_PIN                              16
+#define SOL2_PIN                              17
 
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
index ab6299a9b05c..36cb0e2c142d 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
@@ -38,9 +38,9 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         47   // 'X Min'
-#define Y_STOP_PIN         48   // 'Y Min'
-#define Z_STOP_PIN         49   // 'Z Min'
+#define X_STOP_PIN                            47  // 'X Min'
+#define Y_STOP_PIN                            48  // 'Y Min'
+#define Z_STOP_PIN                            49  // 'Z Min'
 
 //
 // Steppers
@@ -51,65 +51,65 @@
 //
 
 // X-axis signal-level connector
-#define X_STEP_PIN         65
-#define X_DIR_PIN          64
-#define X_ENABLE_PIN       66   // Not actually used on Xeed, could be repurposed
+#define X_STEP_PIN                            65
+#define X_DIR_PIN                             64
+#define X_ENABLE_PIN                          66  // Not actually used on Xeed, could be repurposed
 
 // Y-axis signal-level connector
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24   // Not actually used on Xeed, could be repurposed
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24  // Not actually used on Xeed, could be repurposed
 
 // ZMOT connector (Front Right Z Motor)
-#define Z_STEP_PIN         31
-#define Z_DIR_PIN          32
-#define Z_ENABLE_PIN       30
+#define Z_STEP_PIN                            31
+#define Z_DIR_PIN                             32
+#define Z_ENABLE_PIN                          30
 
 // XMOT connector (Rear Z Motor)
-#define Z2_STEP_PIN        28
-#define Z2_DIR_PIN         63
-#define Z2_ENABLE_PIN      29
+#define Z2_STEP_PIN                           28
+#define Z2_DIR_PIN                            63
+#define Z2_ENABLE_PIN                         29
 
 // YMOT connector (Front Left Z Motor)
-#define Z3_STEP_PIN        14
-#define Z3_DIR_PIN         15
-#define Z3_ENABLE_PIN      39
+#define Z3_STEP_PIN                           14
+#define Z3_DIR_PIN                            15
+#define Z3_ENABLE_PIN                         39
 
 // EMOT2 connector
-#define E0_STEP_PIN        37
-#define E0_DIR_PIN         40
-#define E0_ENABLE_PIN      36
+#define E0_STEP_PIN                           37
+#define E0_DIR_PIN                            40
+#define E0_ENABLE_PIN                         36
 
 // EMOT connector
-#define E1_STEP_PIN        34
-#define E1_DIR_PIN         35
-#define E1_ENABLE_PIN      33
+#define E1_STEP_PIN                           34
+#define E1_DIR_PIN                            35
+#define E1_ENABLE_PIN                         33
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     42   // ROT2 Connector
-#define FIL_RUNOUT2_PIN    44   // ROT1 Connector
+#define FIL_RUNOUT_PIN                        42  // ROT2 Connector
+#define FIL_RUNOUT2_PIN                       44  // ROT1 Connector
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         15   // T3 Connector
-#define TEMP_1_PIN         13   // T1 Connector
-#define TEMP_BED_PIN       14   // BED Connector (Between T1 and T3)
+#define TEMP_0_PIN                            15  // T3 Connector
+#define TEMP_1_PIN                            13  // T1 Connector
+#define TEMP_BED_PIN                          14  // BED Connector (Between T1 and T3)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        8   // Misc Connector, pins 3 and 4 (Out2)
-#define HEATER_1_PIN        9   // Misc Connector, pins 5 and 6 (Out3)
-#define HEATER_BED_PIN      6   // Misc Connector, pins 9(-) and 10(+) (OutA)
+#define HEATER_0_PIN                           8  // Misc Connector, pins 3 and 4 (Out2)
+#define HEATER_1_PIN                           9  // Misc Connector, pins 5 and 6 (Out3)
+#define HEATER_BED_PIN                         6  // Misc Connector, pins 9(-) and 10(+) (OutA)
 
-#define FAN_PIN            10   // Misc Connector, pins 7(-) and 8 (+) (Out4)
+#define FAN_PIN                               10  // Misc Connector, pins 7(-) and 8 (+) (Out4)
 
-#define LED_PIN            13
+#define LED_PIN                               13
 
-#define SOL1_PIN            7   // Misc Connector, pins 1(-) and 2(+) (Out1)
+#define SOL1_PIN                               7  // Misc Connector, pins 1(-) and 2(+) (Out1)
 
 // Door Closed Sensor
-//#define DOOR_PIN           45 // HM1 Connector
+//#define DOOR_PIN                            45  // HM1 Connector
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index 8fecc71bac88..2d0db1582511 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -36,89 +36,89 @@
 //
 // Servos
 //
-#define SERVO0_PIN         30
-#define SERVO1_PIN         31
-#define SERVO2_PIN         32
-#define SERVO3_PIN         33
+#define SERVO0_PIN                            30
+#define SERVO1_PIN                            31
+#define SERVO2_PIN                            32
+#define SERVO3_PIN                            33
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          43
-#define X_MAX_PIN          42
-#define Y_MIN_PIN          38
-#define Y_MAX_PIN          41
-#define Z_MIN_PIN          40
-#define Z_MAX_PIN          37
+#define X_MIN_PIN                             43
+#define X_MAX_PIN                             42
+#define Y_MIN_PIN                             38
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             40
+#define Z_MAX_PIN                             37
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  37
+  #define Z_MIN_PROBE_PIN                     37
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         62   // A8
-#define X_DIR_PIN          63   // A9
-#define X_ENABLE_PIN       61   // A7
+#define X_STEP_PIN                            62  // A8
+#define X_DIR_PIN                             63  // A9
+#define X_ENABLE_PIN                          61  // A7
 
-#define Y_STEP_PIN         65   // A11
-#define Y_DIR_PIN          66   // A12
-#define Y_ENABLE_PIN       64   // A10
+#define Y_STEP_PIN                            65  // A11
+#define Y_DIR_PIN                             66  // A12
+#define Y_ENABLE_PIN                          64  // A10
 
-#define Z_STEP_PIN         68   // A14
-#define Z_DIR_PIN          69   // A15
-#define Z_ENABLE_PIN       67   // A13
+#define Z_STEP_PIN                            68  // A14
+#define Z_DIR_PIN                             69  // A15
+#define Z_ENABLE_PIN                          67  // A13
 
-#define E0_STEP_PIN        23
-#define E0_DIR_PIN         24
-#define E0_ENABLE_PIN      22
+#define E0_STEP_PIN                           23
+#define E0_DIR_PIN                            24
+#define E0_ENABLE_PIN                         22
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         27
-#define E1_ENABLE_PIN      25
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            27
+#define E1_ENABLE_PIN                         25
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        4   // Analog Input
+  #define TEMP_0_PIN                           4  // Analog Input
 #else
-  #define TEMP_0_PIN        0   // Analog Input
+  #define TEMP_0_PIN                           0  // Analog Input
 #endif
 
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN        5   // Analog Input
+  #define TEMP_1_PIN                           5  // Analog Input
 #else
-  #define TEMP_1_PIN        2   // Analog Input
+  #define TEMP_1_PIN                           2  // Analog Input
 #endif
 
-#define TEMP_2_PIN          3   // Analog Input
+#define TEMP_2_PIN                             3  // Analog Input
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      6   // Analog Input
+  #define TEMP_BED_PIN                         6  // Analog Input
 #else
-  #define TEMP_BED_PIN      1   // Analog Input
+  #define TEMP_BED_PIN                         1  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       29
-#define HEATER_1_PIN       34
-#define HEATER_BED_PIN     28
+#define HEATER_0_PIN                          29
+#define HEATER_1_PIN                          34
+#define HEATER_BED_PIN                        28
 
 #ifndef FAN_PIN
-  #define FAN_PIN          39
+  #define FAN_PIN                             39
 #endif
-#define FAN1_PIN           35
-#define FAN2_PIN           36
+#define FAN1_PIN                              35
+#define FAN2_PIN                              36
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN FAN2_PIN
+  #define CONTROLLER_FAN_PIN            FAN2_PIN
 #endif
 
 #define FAN_SOFT_PWM
@@ -126,39 +126,39 @@
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                         2
 
 //
 // LCD / Controller
 //
 #if ENABLED(MINIPANEL)
 
-  #define BEEPER_PIN       46
+  #define BEEPER_PIN                          46
   // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0        47
-  #define DOGLCD_CS        45
-  #define LCD_BACKLIGHT_PIN 44   // backlight LED on PA3
+  #define DOGLCD_A0                           47
+  #define DOGLCD_CS                           45
+  #define LCD_BACKLIGHT_PIN                   44  // backlight LED on PA3
 
-  #define KILL_PIN         12
+  #define KILL_PIN                            12
   // GLCD features
   // Uncomment screen orientation
   //#define LCD_SCREEN_ROT_90
   //#define LCD_SCREEN_ROT_180
   //#define LCD_SCREEN_ROT_270
 
-  #define BTN_EN1          48
-  #define BTN_EN2          11
-  #define BTN_ENC          10
+  #define BTN_EN1                             48
+  #define BTN_EN2                             11
+  #define BTN_ENC                             10
 
-  #define SD_DETECT_PIN    49
+  #define SD_DETECT_PIN                       49
 
 #endif // MINIPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     7   // Pullup!
-#define SPINDLE_DIR_PIN           8
+#define SPINDLE_LASER_PWM_PIN                  6  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  7  // Pullup!
+#define SPINDLE_DIR_PIN                        8
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h
index d3015340de09..4d7a98005077 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h
@@ -33,99 +33,99 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          41
-#define X_MAX_PIN          37
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                             41
+#define X_MAX_PIN                             37
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          28
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         60   // A6
-#define Y_DIR_PIN          61   // A7
-#define Y_ENABLE_PIN       22
+#define Y_STEP_PIN                            60  // A6
+#define Y_DIR_PIN                             61  // A7
+#define Y_ENABLE_PIN                          22
 
-#define Z_STEP_PIN         54   // A0
-#define Z_DIR_PIN          55   // A1
-#define Z_ENABLE_PIN       56   // A2
+#define Z_STEP_PIN                            54  // A0
+#define Z_DIR_PIN                             55  // A1
+#define Z_ENABLE_PIN                          56  // A2
 
-#define E0_STEP_PIN        31
-#define E0_DIR_PIN         32
-#define E0_ENABLE_PIN      38
+#define E0_STEP_PIN                           31
+#define E0_DIR_PIN                            32
+#define E0_ENABLE_PIN                         38
 
-#define E1_STEP_PIN        34
-#define E1_DIR_PIN         36
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           34
+#define E1_DIR_PIN                            36
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        8   // Analog Input
+  #define TEMP_0_PIN                           8  // Analog Input
 #else
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7   // IO pin. Buffer needed
+  #define FAN_PIN                              7  // IO pin. Buffer needed
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                         2
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         33
+#define BEEPER_PIN                            33
 
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define LCD_PINS_RS     16
-  #define LCD_PINS_ENABLE 17
-  #define LCD_PINS_D4     23
-  #define LCD_PINS_D5     25
-  #define LCD_PINS_D6     27
-  #define LCD_PINS_D7     29
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 
   // Buttons directly attached to AUX-2
-  #define BTN_EN1         59
-  #define BTN_EN2         64
-  #define BTN_ENC         43
+  #define BTN_EN1                             59
+  #define BTN_EN2                             64
+  #define BTN_ENC                             43
 
-  #define SD_DETECT_PIN   -1   // RAMPS doesn't use this
+  #define SD_DETECT_PIN                       -1  // RAMPS doesn't use this
 
 #endif // HAS_SPI_LCD && NEWPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     4   // Pullup!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
+#define SPINDLE_DIR_PIN                       11
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
index 160d9d4b786a..d976e0981682 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
@@ -33,120 +33,120 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37
-#define X_MAX_PIN          40
-#define Y_MIN_PIN          41
-#define Y_MAX_PIN          38
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                             37
+#define X_MAX_PIN                             40
+#define Y_MIN_PIN                             41
+#define Y_MAX_PIN                             38
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          27
-#define X_ENABLE_PIN       25
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             27
+#define X_ENABLE_PIN                          25
 
-#define Y_STEP_PIN          4   // A6
-#define Y_DIR_PIN          54   // A0
-#define Y_ENABLE_PIN        5
+#define Y_STEP_PIN                             4  // A6
+#define Y_DIR_PIN                             54  // A0
+#define Y_ENABLE_PIN                           5
 
-#define Z_STEP_PIN         56   // A2
-#define Z_DIR_PIN          60   // A6
-#define Z_ENABLE_PIN       55   // A1
+#define Z_STEP_PIN                            56  // A2
+#define Z_DIR_PIN                             60  // A6
+#define Z_ENABLE_PIN                          55  // A1
 
-#define E0_STEP_PIN        35
-#define E0_DIR_PIN         36
-#define E0_ENABLE_PIN      34
+#define E0_STEP_PIN                           35
+#define E0_DIR_PIN                            36
+#define E0_ENABLE_PIN                         34
 
-#define E1_STEP_PIN        29
-#define E1_DIR_PIN         39
-#define E1_ENABLE_PIN      28
+#define E1_STEP_PIN                           29
+#define E1_DIR_PIN                            39
+#define E1_ENABLE_PIN                         28
 
-#define E2_STEP_PIN        23   // ? schematic says 24
-#define E2_DIR_PIN         24   // ? schematic says 23
-#define E2_ENABLE_PIN      22
+#define E2_STEP_PIN                           23  // ? schematic says 24
+#define E2_DIR_PIN                            24  // ? schematic says 23
+#define E2_ENABLE_PIN                         22
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        4   // Analog Input
+  #define TEMP_0_PIN                           4  // Analog Input
 #else
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
 
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN        8   // Analog Input
+  #define TEMP_1_PIN                           8  // Analog Input
 #else
-  #define TEMP_1_PIN       15   // Analog Input
+  #define TEMP_1_PIN                          15  // Analog Input
 #endif
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      8   // Analog Input
+  #define TEMP_BED_PIN                         8  // Analog Input
 #else
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
-#define FAN1_PIN            6
+#define FAN1_PIN                               6
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                         2
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    16   // Pullup!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 16  // Pullup!
+#define SPINDLE_DIR_PIN                       11
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         64
+#define BEEPER_PIN                            64
 
 #if HAS_SPI_LCD
 
-  #define LCD_PINS_RS      14
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      30
-  #define LCD_PINS_D5      31
-  #define LCD_PINS_D6      32
-  #define LCD_PINS_D7      33
+  #define LCD_PINS_RS                         14
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         30
+  #define LCD_PINS_D5                         31
+  #define LCD_PINS_D6                         32
+  #define LCD_PINS_D7                         33
 
   #if ENABLED(NEWPANEL)
     // Buttons are directly attached using keypad
-    #define BTN_EN1        61
-    #define BTN_EN2        59
-    #define BTN_ENC        43
+    #define BTN_EN1                           61
+    #define BTN_EN2                           59
+    #define BTN_ENC                           43
   #else
     // Buttons attached to shift register of reprapworld keypad v1.1
-    #define SHIFT_CLK      63
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      17
-    #define SHIFT_EN       17
+    #define SHIFT_CLK                         63
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         17
+    #define SHIFT_EN                          17
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
index fe0f4826be32..78dd88809ff0 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
@@ -40,132 +40,132 @@
 //
 // Servos
 //
-#define SERVO0_PIN         46   // AUX3-6
-#define SERVO1_PIN         47   // AUX3-5
-#define SERVO2_PIN         48   // AUX3-4
-#define SERVO3_PIN         49   // AUX3-3
+#define SERVO0_PIN                            46  // AUX3-6
+#define SERVO1_PIN                            47  // AUX3-5
+#define SERVO2_PIN                            48  // AUX3-4
+#define SERVO3_PIN                            49  // AUX3-3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37   // No INT
-#define X_MAX_PIN          40   // No INT
-#define Y_MIN_PIN          41   // No INT
-#define Y_MAX_PIN          38   // No INT
-#define Z_MIN_PIN          18   // No INT
-#define Z_MAX_PIN          19   // No INT
+#define X_MIN_PIN                             37  // No INT
+#define X_MAX_PIN                             40  // No INT
+#define Y_MIN_PIN                             41  // No INT
+#define Y_MAX_PIN                             38  // No INT
+#define Z_MIN_PIN                             18  // No INT
+#define Z_MAX_PIN                             19  // No INT
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         58
-#define X_DIR_PIN          57
-#define X_ENABLE_PIN       59
+#define X_STEP_PIN                            58
+#define X_DIR_PIN                             57
+#define X_ENABLE_PIN                          59
 
-#define Y_STEP_PIN          5
-#define Y_DIR_PIN          17
-#define Y_ENABLE_PIN        4
+#define Y_STEP_PIN                             5
+#define Y_DIR_PIN                             17
+#define Y_ENABLE_PIN                           4
 
-#define Z_STEP_PIN         16
-#define Z_DIR_PIN          11
-#define Z_ENABLE_PIN        3
+#define Z_STEP_PIN                            16
+#define Z_DIR_PIN                             11
+#define Z_ENABLE_PIN                           3
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      29
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         29
 
-#define E1_STEP_PIN        25
-#define E1_DIR_PIN         24
-#define E1_ENABLE_PIN      26
+#define E1_STEP_PIN                           25
+#define E1_DIR_PIN                            24
+#define E1_ENABLE_PIN                         26
 
-#define E2_STEP_PIN        22
-#define E2_DIR_PIN         60
-#define E2_ENABLE_PIN      23
+#define E2_STEP_PIN                           22
+#define E2_DIR_PIN                            60
+#define E2_ENABLE_PIN                         23
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN       11   // Analog Input
+  #define TEMP_0_PIN                          11  // Analog Input
 #else
-  #define TEMP_0_PIN       15   // Analog Input
+  #define TEMP_0_PIN                          15  // Analog Input
 #endif
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN       10   // Analog Input
+  #define TEMP_1_PIN                          10  // Analog Input
 #else
-  #define TEMP_1_PIN       13   // Analog Input
+  #define TEMP_1_PIN                          13  // Analog Input
 #endif
 #if TEMP_SENSOR_2 == -1
-  #define TEMP_2_PIN        9   // Analog Input
+  #define TEMP_2_PIN                           9  // Analog Input
 #else
-  #define TEMP_2_PIN       12   // Analog Input
+  #define TEMP_2_PIN                          12  // Analog Input
 #endif
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      8   // Analog Input
+  #define TEMP_BED_PIN                         8  // Analog Input
 #else
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        9
-#define HEATER_2_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           9
+#define HEATER_2_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           6
+  #define FAN_PIN                              6
 #endif
-#define FAN1_PIN            7
+#define FAN1_PIN                               7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN     45   // Try the keypad connector
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                        45  // Try the keypad connector
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         61
+#define BEEPER_PIN                            61
 
-#define BTN_EN1            44
-#define BTN_EN2            45
-#define BTN_ENC            33
+#define BTN_EN1                               44
+#define BTN_EN2                               45
+#define BTN_ENC                               33
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      56   // CS chip select / SS chip slave select
-  #define LCD_PINS_ENABLE  51   // SID (MOSI)
-  #define LCD_PINS_D4      52   // SCK (CLK) clock
-  #define SD_DETECT_PIN    35
+  #define LCD_PINS_RS                         56  // CS chip select / SS chip slave select
+  #define LCD_PINS_ENABLE                     51  // SID (MOSI)
+  #define LCD_PINS_D4                         52  // SCK (CLK) clock
+  #define SD_DETECT_PIN                       35
 
 #else
 
-  #define LCD_PINS_RS      32
-  #define LCD_PINS_ENABLE  31
-  #define LCD_PINS_D4      14
-  #define LCD_PINS_D5      30
-  #define LCD_PINS_D6      39
-  #define LCD_PINS_D7      15
+  #define LCD_PINS_RS                         32
+  #define LCD_PINS_ENABLE                     31
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D5                         30
+  #define LCD_PINS_D6                         39
+  #define LCD_PINS_D7                         15
 
-  #define SHIFT_CLK        43
-  #define SHIFT_LD         35
-  #define SHIFT_OUT        34
-  #define SHIFT_EN         44
+  #define SHIFT_CLK                           43
+  #define SHIFT_LD                            35
+  #define SHIFT_OUT                           34
+  #define SHIFT_EN                            44
 
   #if MB(MEGATRONICS_31, MEGATRONICS_32)
-    #define SD_DETECT_PIN  56
+    #define SD_DETECT_PIN                     56
   #endif
 
 #endif
@@ -173,23 +173,23 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if DISABLED(REPRAPWORLD_KEYPAD)        // try to use the keypad connector first
-  #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    43   // Pullup!
-  #define SPINDLE_DIR_PIN          42
+#if DISABLED(REPRAPWORLD_KEYPAD)                  // try to use the keypad connector first
+  #define SPINDLE_LASER_PWM_PIN               44  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               43  // Pullup!
+  #define SPINDLE_DIR_PIN                     42
 #elif EXTRUDERS <= 2
   // Hijack the last extruder so that we can get the PWM signal off the Y breakout
   // Move Y to the E2 plug. This makes dual Y steppers harder
-  #undef Y_ENABLE_PIN  //  4
-  #undef Y_STEP_PIN    //  5
-  #undef Y_DIR_PIN     // 17
-  #undef E2_ENABLE_PIN // 23
-  #undef E2_STEP_PIN   // 22
-  #undef E2_DIR_PIN    // 60
-  #define Y_ENABLE_PIN             23
-  #define Y_STEP_PIN               22
-  #define Y_DIR_PIN                60
-  #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    17   // Pullup!
-  #define SPINDLE_DIR_PIN           5
+  #undef Y_ENABLE_PIN                             //  4
+  #undef Y_STEP_PIN                               //  5
+  #undef Y_DIR_PIN                                // 17
+  #undef E2_ENABLE_PIN                            // 23
+  #undef E2_STEP_PIN                              // 22
+  #undef E2_DIR_PIN                               // 60
+  #define Y_ENABLE_PIN                        23
+  #define Y_STEP_PIN                          22
+  #define Y_DIR_PIN                           60
+  #define SPINDLE_LASER_PWM_PIN                4  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
+  #define SPINDLE_DIR_PIN                      5
 #endif
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 6d3102172bb8..3282216819f9 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -47,60 +47,60 @@
 //
 // Servos
 //
-#define SERVO0_PIN         36   // C1 (1280-EX1)
-#define SERVO1_PIN         37   // C0 (1280-EX2)
-#define SERVO2_PIN         40   // G1 (1280-EX3)
-#define SERVO3_PIN         41   // G0 (1280-EX4)
+#define SERVO0_PIN                            36  // C1 (1280-EX1)
+#define SERVO1_PIN                            37  // C0 (1280-EX2)
+#define SERVO2_PIN                            40  // G1 (1280-EX3)
+#define SERVO3_PIN                            41  // G0 (1280-EX4)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          49   // L0
-#define X_MAX_PIN          48   // L1
-#define Y_MIN_PIN          47   // L2
-#define Y_MAX_PIN          46   // L3
-#define Z_MIN_PIN          43   // L6
-#define Z_MAX_PIN          42   // L7
+#define X_MIN_PIN                             49  // L0
+#define X_MAX_PIN                             48  // L1
+#define Y_MIN_PIN                             47  // L2
+#define Y_MAX_PIN                             46  // L3
+#define Z_MIN_PIN                             43  // L6
+#define Z_MAX_PIN                             42  // L7
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  42
+  #define Z_MIN_PROBE_PIN                     42
 #endif
 
 //
 // Filament Runout Pins
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   49
+  #define FIL_RUNOUT_PIN                      49
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  47
+  #define FIL_RUNOUT2_PIN                     47
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         55   // F1
-#define X_DIR_PIN          54   // F0
-#define X_ENABLE_PIN       56   // F2
+#define X_STEP_PIN                            55  // F1
+#define X_DIR_PIN                             54  // F0
+#define X_ENABLE_PIN                          56  // F2
 
-#define Y_STEP_PIN         59   // F5
-#define Y_DIR_PIN          58   // F4
-#define Y_ENABLE_PIN       60   // F6
+#define Y_STEP_PIN                            59  // F5
+#define Y_DIR_PIN                             58  // F4
+#define Y_ENABLE_PIN                          60  // F6
 
-#define Z_STEP_PIN         63   // K1
-#define Z_DIR_PIN          62   // K0
-#define Z_ENABLE_PIN       64   // K2
+#define Z_STEP_PIN                            63  // K1
+#define Z_DIR_PIN                             62  // K0
+#define Z_ENABLE_PIN                          64  // K2
 
-#define E0_STEP_PIN        25   // A3
-#define E0_DIR_PIN         24   // A2
-#define E0_ENABLE_PIN      26   // A4
+#define E0_STEP_PIN                           25  // A3
+#define E0_DIR_PIN                            24  // A2
+#define E0_ENABLE_PIN                         26  // A4
 
-#define E1_STEP_PIN        29   // A7
-#define E1_DIR_PIN         28   // A6
-#define E1_ENABLE_PIN      39   // G2
+#define E1_STEP_PIN                           29  // A7
+#define E1_DIR_PIN                            28  // A6
+#define E1_ENABLE_PIN                         39  // G2
 
 //
 // I2C Digipots - MCP4018
@@ -108,22 +108,22 @@
 // Set from 0 - 127 with stop bit.
 // (Ex. 3F << 1 | 1)
 //
-#define DIGIPOTS_I2C_SCL    76   // J5
-#define DIGIPOTS_I2C_SDA_X  57   // F3
-#define DIGIPOTS_I2C_SDA_Y  61   // F7
-#define DIGIPOTS_I2C_SDA_Z  65   // K3
-#define DIGIPOTS_I2C_SDA_E0 27   // A5
-#define DIGIPOTS_I2C_SDA_E1 77   // J6
+#define DIGIPOTS_I2C_SCL                      76  // J5
+#define DIGIPOTS_I2C_SDA_X                    57  // F3
+#define DIGIPOTS_I2C_SDA_Y                    61  // F7
+#define DIGIPOTS_I2C_SDA_Z                    65  // K3
+#define DIGIPOTS_I2C_SDA_E0                   27  // A5
+#define DIGIPOTS_I2C_SDA_E1                   77  // J6
 
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2F   // unshifted slave address (5E <- 2F << 1)
+  #define DIGIPOT_I2C_ADDRESS_A 0x2F              // unshifted slave address (5E <- 2F << 1)
 #endif
 
 //
 // Temperature Sensors
 //
 // K7 - 69 / ADC15 - 15
-#define TEMP_BED_PIN       15
+#define TEMP_BED_PIN                          15
 
 // SPI for Max6675 or Max31855 Thermocouple
 // Uses a separate SPI bus
@@ -133,15 +133,15 @@
 //  2 E4 CS2
 // 78 E2 SCK
 //
-#define THERMO_SCK_PIN     78   // E2
-#define THERMO_DO_PIN       3   // E5
-#define THERMO_CS1_PIN      5   // E3
-#define THERMO_CS2_PIN      2   // E4
+#define THERMO_SCK_PIN                        78  // E2
+#define THERMO_DO_PIN                          3  // E5
+#define THERMO_CS1_PIN                         5  // E3
+#define THERMO_CS2_PIN                         2  // E4
 
-#define MAX6675_SS_PIN     THERMO_CS1_PIN
-#define MAX6675_SS2_PIN    THERMO_CS2_PIN
-#define MAX6675_SCK_PIN    THERMO_SCK_PIN
-#define MAX6675_DO_PIN     THERMO_DO_PIN
+#define MAX6675_SS_PIN            THERMO_CS1_PIN
+#define MAX6675_SS2_PIN           THERMO_CS2_PIN
+#define MAX6675_SCK_PIN           THERMO_SCK_PIN
+#define MAX6675_DO_PIN             THERMO_DO_PIN
 
 //
 // Augmentation for auto-assigning plugs
@@ -152,12 +152,12 @@
 //
 
 // Labels from the schematic:
-#define EX1_HEAT_PIN        6   // H3
-#define EX1_FAN_PIN         7   // H4
-#define EX2_HEAT_PIN       11   // B5
-#define EX2_FAN_PIN        12   // B6
-#define HBP_PIN            45   // L4
-#define EXTRA_FET_PIN      44   // L5
+#define EX1_HEAT_PIN                           6  // H3
+#define EX1_FAN_PIN                            7  // H4
+#define EX2_HEAT_PIN                          11  // B5
+#define EX2_FAN_PIN                           12  // B6
+#define HBP_PIN                               45  // L4
+#define EXTRA_FET_PIN                         44  // L5
 
 #if HOTENDS > 1
   #if TEMP_SENSOR_BED
@@ -174,35 +174,35 @@
 //
 // Heaters / Fans (24V)
 //
-#define HEATER_0_PIN       EX1_HEAT_PIN
-
-#if ENABLED(IS_EFB)                            // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   HBP_PIN
-#elif ENABLED(IS_EEF)                          // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     EX2_HEAT_PIN
-#elif ENABLED(IS_EEB)                          // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     EX2_HEAT_PIN
-  #define HEATER_BED_PIN   HBP_PIN
-#elif ENABLED(IS_EFF)                          // Hotend, Fan, Fan
-  #define FAN1_PIN         HBP_PIN
+#define HEATER_0_PIN                EX1_HEAT_PIN
+
+#if ENABLED(IS_EFB)                               // Hotend, Fan, Bed
+  #define HEATER_BED_PIN                 HBP_PIN
+#elif ENABLED(IS_EEF)                             // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              EX2_HEAT_PIN
+#elif ENABLED(IS_EEB)                             // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              EX2_HEAT_PIN
+  #define HEATER_BED_PIN                 HBP_PIN
+#elif ENABLED(IS_EFF)                             // Hotend, Fan, Fan
+  #define FAN1_PIN                       HBP_PIN
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_EFB, IS_EFF)                      // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        EX2_HEAT_PIN
+    #define FAN_PIN                 EX2_HEAT_PIN
   #elif EITHER(IS_EEF, IS_SF)                     // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        HBP_PIN
+    #define FAN_PIN                      HBP_PIN
   #else
-    #define FAN_PIN        EXTRA_FET_PIN
+    #define FAN_PIN                EXTRA_FET_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13   // B7
-#define CUTOFF_RESET_PIN   16   // H1
-#define CUTOFF_TEST_PIN    17   // H0
+#define LED_PIN                               13  // B7
+#define CUTOFF_RESET_PIN                      16  // H1
+#define CUTOFF_TEST_PIN                       17  // H0
 
 //
 // LCD / Controller
@@ -211,57 +211,57 @@
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS    33   // C4: LCD-STROBE
-    #define LCD_PINS_ENABLE 72  // J2: LEFT
-    #define LCD_PINS_D4    35   // C2: LCD-CLK
-    #define LCD_PINS_D5    32   // C5: RLED
-    #define LCD_PINS_D6    34   // C3: LCD-DATA
-    #define LCD_PINS_D7    31   // C6: GLED
+    #define LCD_PINS_RS                       33  // C4: LCD-STROBE
+    #define LCD_PINS_ENABLE                   72  // J2: LEFT
+    #define LCD_PINS_D4                       35  // C2: LCD-CLK
+    #define LCD_PINS_D5                       32  // C5: RLED
+    #define LCD_PINS_D6                       34  // C3: LCD-DATA
+    #define LCD_PINS_D7                       31  // C6: GLED
 
-    #define BTN_EN2        75   // J4, UP
-    #define BTN_EN1        73   // J3, DOWN
+    #define BTN_EN2                           75  // J4, UP
+    #define BTN_EN1                           73  // J3, DOWN
     //STOP button connected as KILL_PIN
-    #define KILL_PIN       14   // J1, RIGHT
+    #define KILL_PIN                          14  // J1, RIGHT
     //KILL - not connected
 
-    #define BEEPER_PIN      8   // H5, SD_WP
+    #define BEEPER_PIN                         8  // H5, SD_WP
 
     //on board leds
-    #define STAT_LED_RED_LED  SERVO0_PIN   // C1 (1280-EX1, DEBUG2)
-    #define STAT_LED_BLUE_PIN SERVO1_PIN   // C0 (1280-EX2, DEBUG3)
+    #define STAT_LED_RED_LED          SERVO0_PIN  // C1 (1280-EX1, DEBUG2)
+    #define STAT_LED_BLUE_PIN         SERVO1_PIN  // C0 (1280-EX2, DEBUG3)
 
   #else
     // Replicator uses a 3-wire SR controller with HD44780
-    #define SR_DATA_PIN    34   // C3
-    #define SR_CLK_PIN     35   // C2
-    #define SR_STROBE_PIN  33   // C4
+    #define SR_DATA_PIN                       34  // C3
+    #define SR_CLK_PIN                        35  // C2
+    #define SR_STROBE_PIN                     33  // C4
 
-    #define BTN_UP         75   // J4
-    #define BTN_DWN        73   // J3
-    #define BTN_LFT        72   // J2
-    #define BTN_RT         14   // J1
+    #define BTN_UP                            75  // J4
+    #define BTN_DWN                           73  // J3
+    #define BTN_LFT                           72  // J2
+    #define BTN_RT                            14  // J1
 
     // Disable encoder
     #undef BTN_EN1
     #undef BTN_EN2
 
-    #define BEEPER_PIN      4   // G5
+    #define BEEPER_PIN                         4  // G5
 
-    #define STAT_LED_RED_PIN  32   // C5
-    #define STAT_LED_BLUE_PIN 31   // C6 (Actually green)
+    #define STAT_LED_RED_PIN                  32  // C5
+    #define STAT_LED_BLUE_PIN                 31  // C6 (Actually green)
 
   #endif
 
-  #define BTN_CENTER       15   // J0
-  #define BTN_ENC          BTN_CENTER
+  #define BTN_CENTER                          15  // J0
+  #define BTN_ENC                     BTN_CENTER
 
 #endif // HAS_SPI_LCD
 
 //
 // SD Card
 //
-#define SDSS               53   // B0
-#define SD_DETECT_PIN       9   // H6
+#define SDSS                                  53  // B0
+#define SD_DETECT_PIN                          9  // H6
 
 //
 // TMC 220x
@@ -280,19 +280,19 @@
    * Software serial
    */
 
-  #define X_SERIAL_TX_PIN  16
-  #define X_SERIAL_RX_PIN  17
+  #define X_SERIAL_TX_PIN                     16
+  #define X_SERIAL_RX_PIN                     17
 
-  #define Y_SERIAL_TX_PIN  18
-  #define Y_SERIAL_RX_PIN  19
+  #define Y_SERIAL_TX_PIN                     18
+  #define Y_SERIAL_RX_PIN                     19
 
-  #define Z_SERIAL_TX_PIN  41
-  #define Z_SERIAL_RX_PIN  66
+  #define Z_SERIAL_TX_PIN                     41
+  #define Z_SERIAL_RX_PIN                     66
 
-  #define E0_SERIAL_TX_PIN 40
-  #define E0_SERIAL_RX_PIN 67
+  #define E0_SERIAL_TX_PIN                    40
+  #define E0_SERIAL_RX_PIN                    67
 
-  #define E1_SERIAL_TX_PIN 37
-  #define E1_SERIAL_RX_PIN 68
+  #define E1_SERIAL_TX_PIN                    37
+  #define E1_SERIAL_RX_PIN                    68
 
 #endif
diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h
index 5b06e3b83590..35d1b59ecbfb 100644
--- a/Marlin/src/pins/mega/pins_MINITRONICS.h
+++ b/Marlin/src/pins/mega/pins_MINITRONICS.h
@@ -42,102 +42,102 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN           5
-#define X_MAX_PIN           2
-#define Y_MIN_PIN           2
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN           6
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                              5
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                              2
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                              6
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         48
-#define X_DIR_PIN          47
-#define X_ENABLE_PIN       49
+#define X_STEP_PIN                            48
+#define X_DIR_PIN                             47
+#define X_ENABLE_PIN                          49
 
-#define Y_STEP_PIN         39   // A6
-#define Y_DIR_PIN          40   // A0
-#define Y_ENABLE_PIN       38
+#define Y_STEP_PIN                            39  // A6
+#define Y_DIR_PIN                             40  // A0
+#define Y_ENABLE_PIN                          38
 
-#define Z_STEP_PIN         42   // A2
-#define Z_DIR_PIN          43   // A6
-#define Z_ENABLE_PIN       41   // A1
+#define Z_STEP_PIN                            42  // A2
+#define Z_DIR_PIN                             43  // A6
+#define Z_ENABLE_PIN                          41  // A1
 
-#define E0_STEP_PIN        45
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      27
+#define E0_STEP_PIN                           45
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         27
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         35
-#define E1_ENABLE_PIN      37
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            35
+#define E1_ENABLE_PIN                         37
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input
-#define TEMP_1_PIN          6   // Analog Input
-#define TEMP_BED_PIN        6   // Analog Input
+#define TEMP_0_PIN                             7  // Analog Input
+#define TEMP_1_PIN                             6  // Analog Input
+#define TEMP_BED_PIN                           6  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        7   // EXTRUDER 1
-#define HEATER_1_PIN        8   // EXTRUDER 2
-#define HEATER_BED_PIN      3   // BED
+#define HEATER_0_PIN                           7  // EXTRUDER 1
+#define HEATER_1_PIN                           8  // EXTRUDER 2
+#define HEATER_BED_PIN                         3  // BED
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               16
-#define LED_PIN            46
+#define SDSS                                  16
+#define LED_PIN                               46
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         -1
+#define BEEPER_PIN                            -1
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      15   // CS chip select /SS chip slave select
-  #define LCD_PINS_ENABLE  11   // SID (MOSI)
-  #define LCD_PINS_D4      10   // SCK (CLK) clock
+  #define LCD_PINS_RS                         15  // CS chip select /SS chip slave select
+  #define LCD_PINS_ENABLE                     11  // SID (MOSI)
+  #define LCD_PINS_D4                         10  // SCK (CLK) clock
 
-  #define BTN_EN1          18
-  #define BTN_EN2          17
-  #define BTN_ENC          25
+  #define BTN_EN1                             18
+  #define BTN_EN2                             17
+  #define BTN_ENC                             25
 
-  #define SD_DETECT_PIN    30
+  #define SD_DETECT_PIN                       30
 
 #else
 
-  #define LCD_PINS_RS      -1
-  #define LCD_PINS_ENABLE  -1
+  #define LCD_PINS_RS                         -1
+  #define LCD_PINS_ENABLE                     -1
 
   // Buttons are directly attached using keypad
-  #define BTN_EN1          -1
-  #define BTN_EN2          -1
-  #define BTN_ENC          -1
+  #define BTN_EN1                             -1
+  #define BTN_EN2                             -1
+  #define BTN_ENC                             -1
 
-  #define SD_DETECT_PIN    -1   // Minitronics doesn't use this
+  #define SD_DETECT_PIN                       -1  // Minitronics doesn't use this
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if HAS_CUTTER  // assumes we're only doing CNC work (no 3D printing)
+#if HAS_CUTTER                                    // assumes we're only doing CNC work (no 3D printing)
   #undef HEATER_BED_PIN
-  #undef TEMP_BED_PIN             // need to free up some pins but also need to
-  #undef TEMP_0_PIN               // re-assign them (to unused pins) because Marlin
-  #undef TEMP_1_PIN               // requires the presence of certain pins or else it
-  #define HEATER_BED_PIN      4   // won't compile
-  #define TEMP_BED_PIN       50
-  #define TEMP_0_PIN         51
-  #define SPINDLE_LASER_ENA_PIN         52   // using A6 because it already has a pullup
-  #define SPINDLE_LASER_PWM_PIN          3   // WARNING - LED & resistor pull up to +12/+24V stepper voltage
-  #define SPINDLE_DIR_PIN               53
+  #undef TEMP_BED_PIN                             // need to free up some pins but also need to
+  #undef TEMP_0_PIN                               // re-assign them (to unused pins) because Marlin
+  #undef TEMP_1_PIN                               // requires the presence of certain pins or else it
+  #define HEATER_BED_PIN                       4  // won't compile
+  #define TEMP_BED_PIN                        50
+  #define TEMP_0_PIN                          51
+  #define SPINDLE_LASER_ENA_PIN               52  // using A6 because it already has a pullup
+  #define SPINDLE_LASER_PWM_PIN                3  // WARNING - LED & resistor pull up to +12/+24V stepper voltage
+  #define SPINDLE_DIR_PIN                     53
 #endif
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index 80f72d04e902..4e02127c1206 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -37,83 +37,83 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         24
-#define Y_STOP_PIN         28
-#define Z_MIN_PIN          46
-#define Z_MAX_PIN          32
+#define X_STOP_PIN                            24
+#define Y_STOP_PIN                            28
+#define Z_MIN_PIN                             46
+#define Z_MAX_PIN                             32
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  46   // JP4, Tfeed1
+  #define Z_MIN_PROBE_PIN                     46  // JP4, Tfeed1
 #endif
 
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #define FIL_RUNOUT_PIN   44   // JP3, Tfeed2
+  #define FIL_RUNOUT_PIN                      44  // JP3, Tfeed2
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input - Redundant temp sensor
-#define TEMP_2_PIN         12   // Analog Input
-#define TEMP_3_PIN         14   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input - Redundant temp sensor
+#define TEMP_2_PIN                            12  // Analog Input
+#define TEMP_3_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
-#define FAN_PIN             7   // material cooling fan
+#define FAN_PIN                                7  // material cooling fan
 
 //
 // SD Card
 //
-#define SDSS               53
-#define SD_DETECT_PIN      38
+#define SDSS                                  53
+#define SD_DETECT_PIN                         38
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13   // On PCB status led
-#define PS_ON_PIN          12   // For stepper/heater/fan power. Active HIGH.
-#define POWER_LOSS_PIN     34   // Power check - whether hotends/steppers/fans have power
+#define LED_PIN                               13  // On PCB status led
+#define PS_ON_PIN                             12  // For stepper/heater/fan power. Active HIGH.
+#define POWER_LOSS_PIN                        34  // Power check - whether hotends/steppers/fans have power
 
 #if ENABLED(BATTERY_STATUS_AVAILABLE)
   #undef BATTERY_STATUS_PIN
-  #define BATTERY_STATUS_PIN 26   // Status of power loss battery, whether it is charged (low) or charging (high)
+  #define BATTERY_STATUS_PIN                  26  // Status of power loss battery, whether it is charged (low) or charging (high)
 #endif
 #if ENABLED(INPUT_VOLTAGE_AVAILABLE)
   #undef VOLTAGE_DETECTION_PIN
-  #define VOLTAGE_DETECTION_PIN 11  // Analog Input - ADC Voltage level of main input
+  #define VOLTAGE_DETECTION_PIN               11  // Analog Input - ADC Voltage level of main input
 #endif
 
 //
@@ -121,24 +121,24 @@
 //
 #if HAS_GRAPHICAL_LCD
   // OVERLORD OLED pins
-  #define LCD_PINS_RS      20
-  #define LCD_PINS_D5      21
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      14
-  #define LCD_PINS_D6       5
-  #define LCD_PINS_D7       6
+  #define LCD_PINS_RS                         20
+  #define LCD_PINS_D5                         21
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D6                          5
+  #define LCD_PINS_D7                          6
   #ifndef LCD_RESET_PIN
-    #define LCD_RESET_PIN   5   // LCD_PINS_D6
+    #define LCD_RESET_PIN                      5  // LCD_PINS_D6
   #endif
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_ENC          16   // Enter Pin
-  #define BTN_UP           19   // Button UP Pin
-  #define BTN_DWN          17   // Button DOWN Pin
+  #define BTN_ENC                             16  // Enter Pin
+  #define BTN_UP                              19  // Button UP Pin
+  #define BTN_DWN                             17  // Button DOWN Pin
 #endif
 
 // Additional connectors/pins on the Overlord V1.X board
-#define PCB_VERSION_PIN    22
-#define APPROACH_PIN       11   // JP7, Tpd
-#define GATE_PIN           36   // Threshold, JP6, Tg
+#define PCB_VERSION_PIN                       22
+#define APPROACH_PIN                          11  // JP7, Tpd
+#define GATE_PIN                              36  // Threshold, JP6, Tg
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
index 4c618bda4e33..f00d817d6e89 100644
--- a/Marlin/src/pins/mega/pins_PICA.h
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -49,95 +49,95 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          14
-#define X_MAX_PIN          15
-#define Y_MIN_PIN          16
-#define Y_MAX_PIN          17
-#define Z_MIN_PIN          23
-#define Z_MAX_PIN          22
+#define X_MIN_PIN                             14
+#define X_MAX_PIN                             15
+#define Y_MIN_PIN                             16
+#define Y_MAX_PIN                             17
+#define Z_MIN_PIN                             23
+#define Z_MAX_PIN                             22
 
 //
 // Steppers
 //
-#define X_STEP_PIN         55
-#define X_DIR_PIN          54
-#define X_ENABLE_PIN       60
+#define X_STEP_PIN                            55
+#define X_DIR_PIN                             54
+#define X_ENABLE_PIN                          60
 
-#define Y_STEP_PIN         57
-#define Y_DIR_PIN          56
-#define Y_ENABLE_PIN       61
+#define Y_STEP_PIN                            57
+#define Y_DIR_PIN                             56
+#define Y_ENABLE_PIN                          61
 
-#define Z_STEP_PIN         59
-#define Z_DIR_PIN          58
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            59
+#define Z_DIR_PIN                             58
+#define Z_ENABLE_PIN                          62
 
-#define E0_STEP_PIN        67
-#define E0_DIR_PIN         24
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           67
+#define E0_DIR_PIN                            24
+#define E0_ENABLE_PIN                         26
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          9   // Analog Input
-#define TEMP_1_PIN         10
-#define TEMP_BED_PIN       10
-#define TEMP_2_PIN         11
-#define TEMP_3_PIN         12
+#define TEMP_0_PIN                             9  // Analog Input
+#define TEMP_1_PIN                            10
+#define TEMP_BED_PIN                          10
+#define TEMP_2_PIN                            11
+#define TEMP_3_PIN                            12
 
 //
 // Heaters / Fans
 //
 #ifndef HEATER_0_PIN
-  #define HEATER_0_PIN     10   // E0
+  #define HEATER_0_PIN                        10  // E0
 #endif
 #ifndef HEATER_1_PIN
-  #define HEATER_1_PIN      2   // E1
+  #define HEATER_1_PIN                         2  // E1
 #endif
-#define HEATER_BED_PIN      8   // HEAT-BED
+#define HEATER_BED_PIN                         8  // HEAT-BED
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 #ifndef FAN_2_PIN
-  #define FAN_2_PIN         7
+  #define FAN_2_PIN                            7
 #endif
 
-#define SDPOWER_PIN        -1
-#define LED_PIN            -1
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
+#define SDPOWER_PIN                           -1
+#define LED_PIN                               -1
+#define PS_ON_PIN                             -1
+#define KILL_PIN                              -1
 
-#define SSR_PIN             6
+#define SSR_PIN                                6
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
 // SD Support
 //
-#define SD_DETECT_PIN      49
-#define SDSS               53
+#define SD_DETECT_PIN                         49
+#define SDSS                                  53
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         29
+#define BEEPER_PIN                            29
 
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS      33
-  #define LCD_PINS_ENABLE  30
-  #define LCD_PINS_D4      35
-  #define LCD_PINS_D5      32
-  #define LCD_PINS_D6      37
-  #define LCD_PINS_D7      36
-
-  #define BTN_EN1          47
-  #define BTN_EN2          48
-  #define BTN_ENC          31
-
-  #define LCD_SDSS         53
+  #define LCD_PINS_RS                         33
+  #define LCD_PINS_ENABLE                     30
+  #define LCD_PINS_D4                         35
+  #define LCD_PINS_D5                         32
+  #define LCD_PINS_D6                         37
+  #define LCD_PINS_D7                         36
+
+  #define BTN_EN1                             47
+  #define BTN_EN2                             48
+  #define BTN_ENC                             31
+
+  #define LCD_SDSS                            53
 #endif
diff --git a/Marlin/src/pins/mega/pins_PICAOLD.h b/Marlin/src/pins/mega/pins_PICAOLD.h
index 88fa1ada29c0..34861277a889 100644
--- a/Marlin/src/pins/mega/pins_PICAOLD.h
+++ b/Marlin/src/pins/mega/pins_PICAOLD.h
@@ -20,9 +20,9 @@
  *
  */
 
-#define HEATER_0_PIN        9   // E0
-#define HEATER_1_PIN       10   // E1
-#define FAN_PIN            11
-#define FAN2_PIN           12
+#define HEATER_0_PIN                          9   // E0
+#define HEATER_1_PIN                         10   // E1
+#define FAN_PIN                              11
+#define FAN2_PIN                             12
 
 #include "pins_PICA.h"
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index bde1f8708892..4c79507eab0b 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -27,67 +27,67 @@
 
 #define BOARD_INFO_NAME "Silver Gate"
 
-#define X_STEP_PIN         43
-#define X_DIR_PIN          44
-#define X_ENABLE_PIN       42
-#define X_MIN_PIN          31
-#define X_MAX_PIN          34
-
-#define Y_STEP_PIN         40
-#define Y_DIR_PIN          41
-#define Y_ENABLE_PIN       39
-#define Y_MIN_PIN          32
-#define Y_MAX_PIN          35
-
-#define Z_STEP_PIN         13
-#define Z_DIR_PIN          38
-#define Z_ENABLE_PIN       14
-#define Z_MIN_PIN          33
-#define Z_MAX_PIN          36
-
-#define E0_STEP_PIN        27
-#define E0_DIR_PIN         37
-#define E0_ENABLE_PIN      45
-
-#define SDSS               16
+#define X_STEP_PIN                            43
+#define X_DIR_PIN                             44
+#define X_ENABLE_PIN                          42
+#define X_MIN_PIN                             31
+#define X_MAX_PIN                             34
+
+#define Y_STEP_PIN                            40
+#define Y_DIR_PIN                             41
+#define Y_ENABLE_PIN                          39
+#define Y_MIN_PIN                             32
+#define Y_MAX_PIN                             35
+
+#define Z_STEP_PIN                            13
+#define Z_DIR_PIN                             38
+#define Z_ENABLE_PIN                          14
+#define Z_MIN_PIN                             33
+#define Z_MAX_PIN                             36
+
+#define E0_STEP_PIN                           27
+#define E0_DIR_PIN                            37
+#define E0_ENABLE_PIN                         45
+
+#define SDSS                                  16
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   34   // X_MAX unless overridden
+  #define FIL_RUNOUT_PIN                      34  // X_MAX unless overridden
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN           5
+  #define FAN_PIN                              5
 #endif
 
-#define HEATER_0_PIN        7
+#define HEATER_0_PIN                           7
 
-#define ORIG_E0_AUTO_FAN_PIN 3   // Use this by NOT overriding E0_AUTO_FAN_PIN
-#define CONTROLLER_FAN_PIN  2
+#define ORIG_E0_AUTO_FAN_PIN                   3  // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define CONTROLLER_FAN_PIN                     2
 
-#define TEMP_0_PIN          7   // Analog Input
+#define TEMP_0_PIN                             7  // Analog Input
 
-#define HEATER_BED_PIN      8
-#define TEMP_BED_PIN        6
+#define HEATER_BED_PIN                         8
+#define TEMP_BED_PIN                           6
 
 #if HAS_GRAPHICAL_LCD
-  #if ENABLED(U8GLIB_ST7920)    // SPI GLCD 12864 ST7920
-    #define LCD_PINS_RS    30
-    #define LCD_PINS_ENABLE 20
-    #define LCD_PINS_D4    25
-    #define BEEPER_PIN     29
-    #define BTN_EN1        19
-    #define BTN_EN2        22
-    #define BTN_ENC        24
-    #define LCD_BACKLIGHT_PIN  6
+  #if ENABLED(U8GLIB_ST7920)                      // SPI GLCD 12864 ST7920
+    #define LCD_PINS_RS                       30
+    #define LCD_PINS_ENABLE                   20
+    #define LCD_PINS_D4                       25
+    #define BEEPER_PIN                        29
+    #define BTN_EN1                           19
+    #define BTN_EN2                           22
+    #define BTN_ENC                           24
+    #define LCD_BACKLIGHT_PIN                  6
     #if ENABLED(SILVER_GATE_GLCD_CONTROLLER)
-      #define KILL_PIN     21
-      #define HOME_PIN     28
+      #define KILL_PIN                        21
+      #define HOME_PIN                        28
     #endif
   #endif
 #endif
 
-#define SD_DETECT_PIN      15
+#define SD_DETECT_PIN                         15
 
-#define STAT_LED_RED_PIN   23
-#define STAT_LED_BLUE_PIN  26
-#define CASE_LIGHT_PIN     51
+#define STAT_LED_RED_PIN                      23
+#define STAT_LED_BLUE_PIN                     26
+#define CASE_LIGHT_PIN                        51
diff --git a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
index c011d9daa765..6c53b7ea4e62 100644
--- a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
+++ b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
@@ -36,76 +36,76 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         19
-#define Y_STOP_PIN         18
-#define Z_STOP_PIN         38
+#define X_STOP_PIN                            19
+#define Y_STOP_PIN                            18
+#define Z_STOP_PIN                            38
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  38
+  #define Z_MIN_PROBE_PIN                     38
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         22
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       57
+#define X_STEP_PIN                            22
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          57
 
-#define Y_STEP_PIN         25
-#define Y_DIR_PIN          26
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            25
+#define Y_DIR_PIN                             26
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         29
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       28
+#define Z_STEP_PIN                            29
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          28
 
-#define E0_STEP_PIN        55
-#define E0_DIR_PIN         56
-#define E0_ENABLE_PIN      54
+#define E0_STEP_PIN                           55
+#define E0_DIR_PIN                            56
+#define E0_ENABLE_PIN                         54
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
-#define TEMP_BED_PIN       14
+#define TEMP_0_PIN                            13
+#define TEMP_BED_PIN                          14
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN     44
-#define FAN_PIN            12   // IO pin. Buffer needed
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                        44
+#define FAN_PIN                               12  // IO pin. Buffer needed
 
 //
 // SD Card
 //
-#define SD_DETECT_PIN      -1
-#define SDSS               53
+#define SD_DETECT_PIN                         -1
+#define SDSS                                  53
 
 //
 // Misc. Functions
 //
-#define BEEPER_PIN         37
-#define KILL_PIN           64
+#define BEEPER_PIN                            37
+#define KILL_PIN                              64
 
 //
 // LCD / Controller (Integrated MINIPANEL)
 //
 #if ENABLED(MINIPANEL)
-  #define DOGLCD_A0        40
-  #define DOGLCD_CS        41
-  #define LCD_BACKLIGHT_PIN 65   // Backlight LED on A11/D65
-  #define LCD_RESET_PIN    27
+  #define DOGLCD_A0                           40
+  #define DOGLCD_CS                           41
+  #define LCD_BACKLIGHT_PIN                   65  // Backlight LED on A11/D65
+  #define LCD_RESET_PIN                       27
 
-  #define BTN_EN1           2
-  #define BTN_EN2           3
-  #define BTN_ENC           5
+  #define BTN_EN1                              2
+  #define BTN_EN2                              3
+  #define BTN_ENC                              5
 
   // This display has adjustable contrast
-  #define LCD_CONTRAST_MIN       0
-  #define LCD_CONTRAST_MAX     255
-  #define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
+  #define LCD_CONTRAST_MIN                     0
+  #define LCD_CONTRAST_MAX                   255
+  #define LCD_CONTRAST_INIT     LCD_CONTRAST_MAX
 #endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index ce03a3468d31..5de75a1f0e64 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -35,7 +35,7 @@
  *    These numbers are the same in any pin mapping.
  */
 
-#define MAX_EXTRUDERS 6
+#define MAX_EXTRUDERS 8
 
 #if   MB(RAMPS_13_EFB, RAMPS_14_EFB, RAMPS_PLUS_EFB, RAMPS_14_RE_ARM_EFB, RAMPS_SMART_EFB, RAMPS_DUO_EFB, RAMPS4DUE_EFB)
   #define IS_RAMPS_EFB
@@ -56,138 +56,140 @@
 //
 
 #if MB(RAMPS_OLD)
-  #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_OLD.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EFB)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EEB)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EFF)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_EEF)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_13_SF)
-  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_13.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EFB)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EEB)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EFF)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_EEF)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_14_SF)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EFB)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EEB)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EFF)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_EEF)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RAMPS_PLUS_SF)
-  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS_PLUS.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 
 //
 // RAMPS Derivatives - ATmega1280, ATmega2560
 //
 
 #elif MB(3DRAG)
-  #include "ramps/pins_3DRAG.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_3DRAG.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(K8200)
-  #include "ramps/pins_K8200.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8200.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
 #elif MB(K8400)
-  #include "ramps/pins_K8400.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8400.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
 #elif MB(K8800)
-  #include "ramps/pins_K8800.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (3DRAG)
+  #include "ramps/pins_K8800.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (3DRAG)
 #elif MB(BAM_DICE)
-  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RAMPS.h"                 // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(BAM_DICE_DUE)
-  #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_BAM_DICE_DUE.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MKS_BASE)
-  #include "ramps/pins_MKS_BASE_10.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_10.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_14)
-  #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_14.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_15)
-  #include "ramps/pins_MKS_BASE_15.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_15.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_16)
-  #include "ramps/pins_MKS_BASE_16.h"           // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_16.h"           // ATmega2560                             env:mega2560
 #elif MB(MKS_BASE_HEROIC)
-  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_BASE_HEROIC.h"       // ATmega2560                             env:mega2560
 #elif MB(MKS_GEN_13)
-  #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_13.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MKS_GEN_L)
-  #include "ramps/pins_MKS_GEN_L.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_L.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(KFB_2)
-  #include "ramps/pins_BIQU_KFB_2.h"            // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_BIQU_KFB_2.h"            // ATmega2560                             env:mega2560
 #elif MB(ZRIB_V20)
-  #include "ramps/pins_ZRIB_V20.h"              // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560 (MKS_GEN_13)
+  #include "ramps/pins_ZRIB_V20.h"              // ATmega1280, ATmega2560                 env:mega1280 env:mega2560 (MKS_GEN_13)
 #elif MB(FELIX2)
-  #include "ramps/pins_FELIX2.h"                // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_FELIX2.h"                // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RIGIDBOARD)
-  #include "ramps/pins_RIGIDBOARD.h"            // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RIGIDBOARD.h"            // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(RIGIDBOARD_V2)
-  #include "ramps/pins_RIGIDBOARD_V2.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_RIGIDBOARD_V2.h"         // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(SAINSMART_2IN1)
-  #include "ramps/pins_SAINSMART_2IN1.h"        // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_SAINSMART_2IN1.h"        // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(ULTIMAKER)
-  #include "ramps/pins_ULTIMAKER.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_ULTIMAKER.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(ULTIMAKER_OLD)
-  #include "ramps/pins_ULTIMAKER_OLD.h"         // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "ramps/pins_ULTIMAKER_OLD.h"         // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(AZTEEG_X3)
-  #include "ramps/pins_AZTEEG_X3.h"             // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_AZTEEG_X3.h"             // ATmega2560                             env:mega2560
 #elif MB(AZTEEG_X3_PRO)
-  #include "ramps/pins_AZTEEG_X3_PRO.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_AZTEEG_X3_PRO.h"         // ATmega2560                             env:mega2560
 #elif MB(ULTIMAIN_2)
-  #include "ramps/pins_ULTIMAIN_2.h"            // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_ULTIMAIN_2.h"            // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_RAPTOR)
-  #include "ramps/pins_FORMBOT_RAPTOR.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_RAPTOR.h"        // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_RAPTOR2)
-  #include "ramps/pins_FORMBOT_RAPTOR2.h"       // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_RAPTOR2.h"       // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_TREX2PLUS)
-  #include "ramps/pins_FORMBOT_TREX2PLUS.h"     // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_TREX2PLUS.h"     // ATmega2560                             env:mega2560
 #elif MB(FORMBOT_TREX3)
-  #include "ramps/pins_FORMBOT_TREX3.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_FORMBOT_TREX3.h"         // ATmega2560                             env:mega2560
 #elif MB(RUMBA)
-  #include "ramps/pins_RUMBA.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RUMBA.h"                 // ATmega2560                             env:mega2560
 #elif MB(RUMBA_RAISE3D)
-  #include "ramps/pins_RUMBA_RAISE3D.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RUMBA_RAISE3D.h"         // ATmega2560                             env:mega2560
 #elif MB(RL200)
-  #include "ramps/pins_RL200.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RL200.h"                 // ATmega2560                             env:mega2560
 #elif MB(BQ_ZUM_MEGA_3D)
-  #include "ramps/pins_BQ_ZUM_MEGA_3D.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_BQ_ZUM_MEGA_3D.h"        // ATmega2560                             env:mega2560
 #elif MB(MAKEBOARD_MINI)
-  #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MAKEBOARD_MINI.h"        // ATmega2560                             env:mega2560
 #elif MB(TRIGORILLA_13)
-  #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:mega2560
 #elif MB(TRIGORILLA_14)
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
 #elif MB(TRIGORILLA_14_11)
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560
 #elif MB(RAMPS_ENDER_4)
-  #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:mega2560
 #elif MB(RAMPS_CREALITY)
-  #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RAMPS_CREALITY.h"        // ATmega2560                             env:mega2560
 #elif MB(RAMPS_DAGOMA)
-  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_RAMPS_DAGOMA.h"          // ATmega2560                             env:mega2560
 #elif MB(FYSETC_F6_13)
   #include "ramps/pins_FYSETC_F6_13.h"          // ATmega2560                             env:FYSETC_F6_13
 #elif MB(FYSETC_F6_14)
   #include "ramps/pins_FYSETC_F6_14.h"          // ATmega2560                             env:FYSETC_F6_14
 #elif MB(DUPLICATOR_I3_PLUS)
-  #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_DUPLICATOR_I3_PLUS.h"    // ATmega2560                             env:mega2560
 #elif MB(VORON)
-  #include "ramps/pins_VORON.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_VORON.h"                 // ATmega2560                             env:mega2560
 #elif MB(TRONXY_V3_1_0)
-  #include "ramps/pins_TRONXY_V3_1_0.h"         // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TRONXY_V3_1_0.h"         // ATmega2560                             env:mega2560
 #elif MB(Z_BOLT_X_SERIES)
-  #include "ramps/pins_Z_BOLT_X_SERIES.h"       // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_Z_BOLT_X_SERIES.h"       // ATmega2560                             env:mega2560
 #elif MB(TT_OSCAR)
-  #include "ramps/pins_TT_OSCAR.h"              // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TT_OSCAR.h"              // ATmega2560                             env:mega2560
 #elif MB(TANGO)
-  #include "ramps/pins_TANGO.h"                 // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_TANGO.h"                 // ATmega2560                             env:mega2560
 #elif MB(MKS_GEN_L_V2)
-  #include "ramps/pins_MKS_GEN_L_V2.h"          // ATmega2560                             env:megaatmega2560
+  #include "ramps/pins_MKS_GEN_L_V2.h"          // ATmega2560                             env:mega2560
+#elif MB(COPYMASTER_3D)
+  #include "ramps/pins_COPYMASTER_3D.h"         // ATmega2560                             env:mega2560
 
 //
 // RAMBo and derivatives
@@ -209,114 +211,116 @@
 //
 
 #elif MB(CNCONTROLS_11)
-  #include "mega/pins_CNCONTROLS_11.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_CNCONTROLS_11.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(CNCONTROLS_12)
-  #include "mega/pins_CNCONTROLS_12.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_CNCONTROLS_12.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(CNCONTROLS_15)
-  #include "mega/pins_CNCONTROLS_15.h"          // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_CNCONTROLS_15.h"          // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MIGHTYBOARD_REVE)
-  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(CHEAPTRONIC)
-  #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:mega2560
 #elif MB(CHEAPTRONIC_V2)
-  #include "mega/pins_CHEAPTRONICv2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_CHEAPTRONICv2.h"          // ATmega2560                             env:mega2560
 #elif MB(MEGATRONICS)
-  #include "mega/pins_MEGATRONICS.h"            // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGATRONICS.h"            // ATmega2560                             env:mega2560
 #elif MB(MEGATRONICS_2)
-  #include "mega/pins_MEGATRONICS_2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGATRONICS_2.h"          // ATmega2560                             env:mega2560
 #elif MB(MEGATRONICS_3, MEGATRONICS_31, MEGATRONICS_32)
-  #include "mega/pins_MEGATRONICS_3.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGATRONICS_3.h"          // ATmega2560                             env:mega2560
 #elif MB(ELEFU_3)
-  #include "mega/pins_ELEFU_3.h"                // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_ELEFU_3.h"                // ATmega2560                             env:mega2560
 #elif MB(LEAPFROG)
-  #include "mega/pins_LEAPFROG.h"               // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_LEAPFROG.h"               // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(MEGACONTROLLER)
-  #include "mega/pins_MEGACONTROLLER.h"         // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_MEGACONTROLLER.h"         // ATmega2560                             env:mega2560
 #elif MB(GT2560_REV_A)
-  #include "mega/pins_GT2560_REV_A.h"           // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_GT2560_REV_A.h"           // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(GT2560_REV_A_PLUS)
-  #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_GT2560_REV_A_PLUS.h"      // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(GT2560_V3)
-  #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_GT2560_V3.h"              // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_MC2)
-  #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_A20)
-  #include "mega/pins_GT2560_V3_A20.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_GT2560_V3_A20.h"          // ATmega2560                             env:mega2560
 #elif MB(EINSTART_S)
-  #include "mega/pins_EINSTART-S.h"             // ATmega1280, ATmega2560                 env:megaatmega1280 env:megaatmega2560
+  #include "mega/pins_EINSTART-S.h"             // ATmega1280, ATmega2560                 env:mega1280 env:mega2560
 #elif MB(WANHAO_ONEPLUS)
-  #include "mega/pins_WANHAO_ONEPLUS.h"         // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_WANHAO_ONEPLUS.h"         // ATmega2560                             env:mega2560
 #elif MB(OVERLORD)
-  #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:mega2560
 #elif MB(HJC2560C_REV2)
-  #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:mega2560
 #elif MB(LEAPFROG_XEED2015)
-  #include "mega/pins_LEAPFROG_XEED2015.h"      // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_LEAPFROG_XEED2015.h"      // ATmega2560                             env:mega2560
 #elif MB(PICA)
-  #include "mega/pins_PICA.h"                   // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_PICA.h"                   // ATmega2560                             env:mega2560
 #elif MB(PICA_REVB)
-  #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:megaatmega2560
+  #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:mega2560
+#elif MB(INTAMSYS40)
+  #include "mega/pins_INTAMSYS40.h"             // ATmega2560                             env:mega2560
 
 //
 // ATmega1281, ATmega2561
 //
 
 #elif MB(MINITRONICS)
-  #include "mega/pins_MINITRONICS.h"            // ATmega1281                             env:megaatmega1280
+  #include "mega/pins_MINITRONICS.h"            // ATmega1281                             env:mega1280
 #elif MB(SILVER_GATE)
-  #include "mega/pins_SILVER_GATE.h"            // ATmega2561                             env:megaatmega2560
+  #include "mega/pins_SILVER_GATE.h"            // ATmega2561                             env:mega2560
 
 //
 // Sanguinololu and Derivatives - ATmega644P, ATmega1284P
 //
 
 #elif MB(SANGUINOLOLU_11)
-  #include "sanguino/pins_SANGUINOLOLU_11.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SANGUINOLOLU_11.h"    // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(SANGUINOLOLU_12)
-  #include "sanguino/pins_SANGUINOLOLU_12.h"    // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SANGUINOLOLU_12.h"    // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI)
-  #include "sanguino/pins_MELZI.h"              // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI.h"              // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_MAKR3D)
-  #include "sanguino/pins_MELZI_MAKR3D.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_MAKR3D.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_CREALITY)
-  #include "sanguino/pins_MELZI_CREALITY.h"     // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_CREALITY.h"     // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_MALYAN)
-  #include "sanguino/pins_MELZI_MALYAN.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_MALYAN.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(MELZI_TRONXY)
-  #include "sanguino/pins_MELZI_TRONXY.h"       // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_MELZI_TRONXY.h"       // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(STB_11)
-  #include "sanguino/pins_STB_11.h"             // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_STB_11.h"             // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(AZTEEG_X1)
-  #include "sanguino/pins_AZTEEG_X1.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_AZTEEG_X1.h"          // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 
 //
 // Other ATmega644P, ATmega644, ATmega1284P
 //
 
 #elif MB(GEN3_MONOLITHIC)
-  #include "sanguino/pins_GEN3_MONOLITHIC.h"    // ATmega644P                             env:sanguino_atmega644p
+  #include "sanguino/pins_GEN3_MONOLITHIC.h"    // ATmega644P                             env:sanguino644p
 #elif MB(GEN3_PLUS)
-  #include "sanguino/pins_GEN3_PLUS.h"          // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN3_PLUS.h"          // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(GEN6)
-  #include "sanguino/pins_GEN6.h"               // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN6.h"               // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(GEN6_DELUXE)
-  #include "sanguino/pins_GEN6_DELUXE.h"        // ATmega644P, ATmega1284P                env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN6_DELUXE.h"        // ATmega644P, ATmega1284P                env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_CUSTOM)
-  #include "sanguino/pins_GEN7_CUSTOM.h"        // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_CUSTOM.h"        // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_12)
-  #include "sanguino/pins_GEN7_12.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_12.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_13)
-  #include "sanguino/pins_GEN7_13.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_13.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(GEN7_14)
-  #include "sanguino/pins_GEN7_14.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_GEN7_14.h"            // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 #elif MB(OMCA_A)
-  #include "sanguino/pins_OMCA_A.h"             // ATmega644                              env:sanguino_atmega644p
+  #include "sanguino/pins_OMCA_A.h"             // ATmega644                              env:sanguino644p
 #elif MB(OMCA)
-  #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino_atmega644p
+  #include "sanguino/pins_OMCA.h"               // ATmega644P, ATmega644                  env:sanguino644p
 #elif MB(ANET_10)
-  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino_atmega1284p
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p
 #elif MB(SETHI)
-  #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino_atmega644p env:sanguino_atmega1284p
+  #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino644p env:sanguino1284p
 
 //
 // Teensyduino - AT90USB1286, AT90USB1286P
@@ -465,53 +469,53 @@
 //
 
 #elif MB(STM32F103RE)
-  #include "stm32/pins_STM32F1R.h"              // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_STM32F1R.h"            // STM32F1                                env:STM32F103RE
 #elif MB(MALYAN_M200)
-  #include "stm32/pins_MALYAN_M200.h"           // STM32F1                                env:STM32F103CB_malyan
+  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F1                                env:STM32F103CB_malyan
 #elif MB(STM3R_MINI)
-  #include "stm32/pins_STM3R_MINI.h"            // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_PRO_VB)
-  #include "stm32/pins_GTM32_PRO_VB.h"          // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_MINI_A30)
-  #include "stm32/pins_GTM32_MINI_A30.h"        // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_MINI)
-  #include "stm32/pins_GTM32_MINI.h"            // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F1                                env:STM32F103RE
 #elif MB(GTM32_REV_B)
-  #include "stm32/pins_GTM32_REV_B.h"           // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F1                                env:STM32F103RE
 #elif MB(MORPHEUS)
-  #include "stm32/pins_MORPHEUS.h"              // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_MORPHEUS.h"            // STM32F1                                env:STM32F103RE
 #elif MB(CHITU3D)
-  #include "stm32/pins_CHITU3D.h"               // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_CHITU3D.h"             // STM32F1                                env:STM32F103RE
 #elif MB(MKS_ROBIN)
-  #include "stm32/pins_MKS_ROBIN.h"             // STM32F1                                env:mks_robin
+  #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin
 #elif MB(MKS_ROBIN_MINI)
-  #include "stm32/pins_MKS_ROBIN_MINI.h"        // STM32F1                                env:mks_robin_mini
+  #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini
 #elif MB(MKS_ROBIN_NANO)
-  #include "stm32/pins_MKS_ROBIN_NANO.h"        // STM32F1                                env:mks_robin_nano
+  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano
 #elif MB(MKS_ROBIN_LITE)
-  #include "stm32/pins_MKS_ROBIN_LITE.h"        // STM32F1                                env:mks_robin_lite
+  #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite
 #elif MB(BTT_SKR_MINI_V1_1)
-  #include "stm32/pins_BTT_SKR_MINI_V1_1.h"     // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_0)
-  #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V1_2)
-  #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_E3_DIP)
-  #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RE_bigtree env:STM32F103RE_bigtree_USB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_USB env:STM32F103RC_bigtree_512K_USB
+  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(JGAURORA_A5S_A1)
-  #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:jgaurora_a5s_a1
+  #include "stm32f1/pins_JGAURORA_A5S_A1.h"     // STM32F1                                env:jgaurora_a5s_a1
 #elif MB(FYSETC_AIO_II)
-  #include "stm32/pins_FYSETC_AIO_II.h"         // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_AIO_II.h"       // STM32F1                                env:STM32F103RC_fysetc
 #elif MB(FYSETC_CHEETAH)
-  #include "stm32/pins_FYSETC_CHEETAH.h"        // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_CHEETAH.h"      // STM32F1                                env:STM32F103RC_fysetc
 #elif MB(FYSETC_CHEETAH_V12)
-  #include "stm32/pins_FYSETC_CHEETAH_V12.h"    // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_CHEETAH_V12.h"  // STM32F1                                env:STM32F103RC_fysetc
 #elif MB(LONGER3D_LK)
-  #include "stm32/pins_LONGER3D_LK.h"           // STM32F1                                env:STM32F103VE_longer
+  #include "stm32f1/pins_LONGER3D_LK.h"         // STM32F1                                env:STM32F103VE_longer
 #elif MB(MKS_ROBIN_LITE3)
-  #include "stm32/pins_MKS_ROBIN_LITE3.h"       // STM32F1                                env:mks_robin_lite3
+  #include "stm32f1/pins_MKS_ROBIN_LITE3.h"     // STM32F1                                env:mks_robin_lite3
 #elif MB(MKS_ROBIN_PRO)
-  #include "stm32/pins_MKS_ROBIN_PRO.h"         // STM32F1                                env:mks_robin_pro
+  #include "stm32f1/pins_MKS_ROBIN_PRO.h"       // STM32F1                                env:mks_robin_pro
 
 //
 // ARM Cortex-M4F
@@ -527,46 +531,46 @@
 //
 
 #elif MB(BEAST)
-  #include "stm32/pins_BEAST.h"                 // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_BEAST.h"               // STM32F4                                env:STM32F4
 #elif MB(GENERIC_STM32F4)
-  #include "stm32/pins_GENERIC_STM32F4.h"       // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_GENERIC_STM32F4.h"     // STM32F4                                env:STM32F4
 #elif MB(ARMED)
-  #include "stm32/pins_ARMED.h"                 // STM32F4                                env:ARMED
+  #include "stm32f4/pins_ARMED.h"               // STM32F4                                env:ARMED
 #elif MB(RUMBA32_AUS3D)
-  #include "stm32/pins_RUMBA32_AUS3D.h"         // STM32F4                                env:rumba32_f446ve
+  #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32_f446ve
 #elif MB(RUMBA32_MKS)
-  #include "stm32/pins_RUMBA32_MKS.h"           // STM32F4                                env:rumba32_mks
+  #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32_mks
 #elif MB(BLACK_STM32F407VE)
-  #include "stm32/pins_BLACK_STM32F407VE.h"     // STM32F4                                env:STM32F407VE_black
+  #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
 #elif MB(STEVAL_3DP001V1)
-  #include "stm32/pins_STEVAL_3DP001V1.h"       // STM32F4                                env:STM32F401VE_STEVAL
+  #include "stm32f4/pins_STEVAL_3DP001V1.h"     // STM32F4                                env:STM32F401VE_STEVAL
 #elif MB(BTT_SKR_PRO_V1_1)
-  #include "stm32/pins_BTT_SKR_PRO_V1_1.h"      // STM32F4                                env:BIGTREE_SKR_PRO
+  #include "stm32f4/pins_BTT_SKR_PRO_V1_1.h"    // STM32F4                                env:BIGTREE_SKR_PRO
 #elif MB(BTT_GTR_V1_0)
-  #include "stm32/pins_BTT_GTR_V1_0.h"          // STM32F4                                env:BIGTREE_GTR_V1_0
+  #include "stm32f4/pins_BTT_GTR_V1_0.h"        // STM32F4                                env:BIGTREE_GTR_V1_0
 #elif MB(BTT_BTT002_V1_0)
-  #include "stm32/pins_BTT_BTT002_V1_0.h"       // STM32F4                                env:BIGTREE_BTT002
+  #include "stm32f4/pins_BTT_BTT002_V1_0.h"     // STM32F4                                env:BIGTREE_BTT002
 #elif MB(LERDGE_K)
-  #include "stm32/pins_LERDGE_K.h"              // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:STM32F4
 #elif MB(LERDGE_X)
-  #include "stm32/pins_LERDGE_X.h"              // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_LERDGE_X.h"            // STM32F4                                env:STM32F4
 #elif MB(VAKE403D)
-  #include "stm32/pins_VAKE403D.h"              // STM32F4                                env:STM32F4
+  #include "stm32f4/pins_VAKE403D.h"            // STM32F4                                env:STM32F4
 #elif MB(FYSETC_S6)
-  #include "stm32/pins_FYSETC_S6.h"             // STM32F4                                env:FYSETC_S6
+  #include "stm32f4/pins_FYSETC_S6.h"           // STM32F4                                env:FYSETC_S6
 #elif MB(FLYF407ZG)
-  #include "stm32/pins_FLYF407ZG.h"             // STM32F4                                env:FLYF407ZG
+  #include "stm32f4/pins_FLYF407ZG.h"           // STM32F4                                env:FLYF407ZG
 #elif MB(MKS_ROBIN2)
-  #include "pins_MKS_ROBIN2.h"                  // STM32F4                                env:MKS_ROBIN2
+  #include "stm32f4/pins_MKS_ROBIN2.h"          // STM32F4                                env:MKS_ROBIN2
 
 //
 // ARM Cortex M7
 //
 
 #elif MB(THE_BORG)
-  #include "stm32/pins_THE_BORG.h"              // STM32F7                                env:STM32F7
+  #include "stm32f7/pins_THE_BORG.h"            // STM32F7                                env:STM32F7
 #elif MB(REMRAM_V1)
-  #include "stm32/pins_REMRAM_V1.h"             // STM32F7                                env:STM32F7
+  #include "stm32f7/pins_REMRAM_V1.h"           // STM32F7                                env:STM32F7
 
 //
 // Espressif ESP32
@@ -862,6 +866,43 @@
   #define E7_ENABLE_PIN -1
 #endif
 
+//
+// Destroy unused CS pins
+//
+#if !AXIS_HAS_SPI(X)
+  #undef X_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(Y)
+  #undef Y_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(Z)
+  #undef Z_CS_PIN
+#endif
+#if E_STEPPERS && !AXIS_HAS_SPI(E0)
+  #undef E0_CS_PIN
+#endif
+#if E_STEPPERS > 1 && !AXIS_HAS_SPI(E1)
+  #undef E1_CS_PIN
+#endif
+#if E_STEPPERS > 2 && !AXIS_HAS_SPI(E2)
+  #undef E2_CS_PIN
+#endif
+#if E_STEPPERS > 3 && !AXIS_HAS_SPI(E3)
+  #undef E3_CS_PIN
+#endif
+#if E_STEPPERS > 4 && !AXIS_HAS_SPI(E4)
+  #undef E4_CS_PIN
+#endif
+#if E_STEPPERS > 5 && !AXIS_HAS_SPI(E5)
+  #undef E5_CS_PIN
+#endif
+#if E_STEPPERS > 6 && !AXIS_HAS_SPI(E6)
+  #undef E6_CS_PIN
+#endif
+#if E_STEPPERS > 7 && !AXIS_HAS_SPI(E7)
+  #undef E7_CS_PIN
+#endif
+
 #ifndef X_CS_PIN
   #define X_CS_PIN -1
 #endif
@@ -1170,6 +1211,9 @@
 
 #if HAS_FILAMENT_SENSOR
   #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN
+#else
+  #undef FIL_RUNOUT_PIN
+  #undef FIL_RUNOUT1_PIN
 #endif
 
 #ifndef LCD_PINS_D4
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index f247c7cacf7a..c08acd383621 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -207,17 +207,32 @@ static void print_input_or_output(const bool isout) {
 }
 
 // pretty report with PWM info
-inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = false, const char *start_string = "") {
+inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool extended=false, PGM_P const start_string=nullptr) {
   char buffer[MAX_NAME_LENGTH + 1];   // for the sprintf statements
   bool found = false, multi_name_pin = false;
 
-  for (uint8_t x = 0; x < COUNT(pin_array); x++)  {    // scan entire array and report all instances of this pin
+  auto alt_pin_echo = [](const pin_t &pin) {
+    #if AVR_AT90USB1286_FAMILY
+      // Use FastIO for pins Teensy doesn't expose
+      if (pin == 46) {
+        print_input_or_output(IS_OUTPUT(46));
+        SERIAL_CHAR('0' + READ(46));
+        return false;
+      }
+      else if (pin == 47) {
+        print_input_or_output(IS_OUTPUT(47));
+        SERIAL_CHAR('0' + READ(47));
+        return false;
+      }
+    #endif
+    return true;
+  };
+
+  LOOP_L_N(x, COUNT(pin_array))  {    // scan entire array and report all instances of this pin
     if (GET_ARRAY_PIN(x) == pin) {
-      if (found) multi_name_pin = true;
-      found = true;
-      if (!multi_name_pin) {    // report digital and analog pin number only on the first time through
-        sprintf_P(buffer, PSTR("%sPIN: "), start_string);     // digital pin number
-        SERIAL_ECHO(buffer);
+      if (!found) {    // report digital and analog pin number only on the first time through
+        if (start_string) serialprintPGM(start_string);
+        serialprintPGM(PSTR("PIN: "));
         PRINT_PIN(pin);
         PRINT_PORT(pin);
         if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
@@ -228,27 +243,14 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
       }
       else {
         SERIAL_CHAR('.');
-        SERIAL_ECHO_SP(MULTI_NAME_PAD + strlen(start_string));  // add padding if not the first instance found
+        SERIAL_ECHO_SP(MULTI_NAME_PAD + (start_string ? strlen_P(start_string) : 0));  // add padding if not the first instance found
       }
       PRINT_ARRAY_NAME(x);
       if (extended) {
         if (pin_is_protected(pin) && !ignore)
           SERIAL_ECHOPGM("protected ");
         else {
-          #if AVR_AT90USB1286_FAMILY //Teensy IDEs don't know about these pins so must use FASTIO
-            if (pin == 46 || pin == 47) {
-              if (pin == 46) {
-                print_input_or_output(IS_OUTPUT(46));
-                SERIAL_CHAR('0' + READ(46));
-              }
-              else if (pin == 47) {
-                print_input_or_output(IS_OUTPUT(47));
-                SERIAL_CHAR('0' + READ(47));
-              }
-            }
-            else
-          #endif
-          {
+          if (alt_pin_echo(pin)) {
             if (!GET_ARRAY_IS_DIGITAL(x)) {
               sprintf_P(buffer, PSTR("Analog in = %5ld"), (long)analogRead(DIGITAL_PIN_TO_ANALOG_PIN(pin)));
               SERIAL_ECHO(buffer);
@@ -274,12 +276,14 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
         }
       }
       SERIAL_EOL();
+      multi_name_pin = found;
+      found = true;
     }  // end of IF
   } // end of for loop
 
   if (!found) {
-    sprintf_P(buffer, PSTR("%sPIN: "), start_string);
-    SERIAL_ECHO(buffer);
+    if (start_string) serialprintPGM(start_string);
+    serialprintPGM(PSTR("PIN: "));
     PRINT_PIN(pin);
     PRINT_PORT(pin);
     if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
@@ -290,21 +294,8 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
       SERIAL_ECHO_SP(8);   // add padding if not an analog pin
     SERIAL_ECHOPGM("<unused/unknown>");
     if (extended) {
-      #if AVR_AT90USB1286_FAMILY  //Teensy IDEs don't know about these pins so must use FASTIO
-        if (pin == 46 || pin == 47) {
-          SERIAL_ECHO_SP(12);
-          if (pin == 46) {
-            print_input_or_output(IS_OUTPUT(46));
-            SERIAL_CHAR('0' + READ(46));
-          }
-          else {
-            print_input_or_output(IS_OUTPUT(47));
-            SERIAL_CHAR('0' + READ(47));
-          }
-        }
-        else
-      #endif
-      {
+
+      if (alt_pin_echo(pin)) {
         if (pwm_status(pin)) {
           // do nothing
         }
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index dae4bde450f0..28478973fbcb 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -168,6 +168,18 @@
 #if defined(BTN_UP) && BTN_UP >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
 #endif
+#if PIN_EXISTS(JOY_X)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_X_PIN)
+#endif
+#if PIN_EXISTS(JOY_Y)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_Y_PIN)
+#endif
+#if PIN_EXISTS(JOY_Z)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_Z_PIN)
+#endif
+#if PIN_EXISTS(JOY_EN)
+  REPORT_NAME_DIGITAL(__LINE__, JOY_EN_PIN)
+#endif
 #if PIN_EXISTS(CASE_LIGHT)
   REPORT_NAME_DIGITAL(__LINE__, CASE_LIGHT_PIN)
 #endif
@@ -547,6 +559,18 @@
 #if PIN_EXISTS(FAN7)
   REPORT_NAME_DIGITAL(__LINE__, FAN7_PIN)
 #endif
+#if PIN_EXISTS(FAN_MUX0)
+  REPORT_NAME_DIGITAL(__LINE__, FAN_MUX0_PIN)
+#endif
+#if PIN_EXISTS(FAN_MUX1)
+  REPORT_NAME_DIGITAL(__LINE__, FAN_MUX1_PIN)
+#endif
+#if PIN_EXISTS(FAN_MUX2)
+  REPORT_NAME_DIGITAL(__LINE__, FAN_MUX2_PIN)
+#endif
+#if PIN_EXISTS(POWER_LOSS)
+  REPORT_NAME_DIGITAL(__LINE__, POWER_LOSS_PIN)
+#endif
 #if PIN_EXISTS(FIL_RUNOUT)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
 #endif
@@ -565,6 +589,12 @@
 #if PIN_EXISTS(FIL_RUNOUT6)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT6_PIN)
 #endif
+#if PIN_EXISTS(FIL_RUNOUT7)
+  REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT7_PIN)
+#endif
+#if PIN_EXISTS(FIL_RUNOUT8)
+  REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT8_PIN)
+#endif
 #if PIN_EXISTS(HEATER_0)
   REPORT_NAME_DIGITAL(__LINE__, HEATER_0_PIN)
 #endif
@@ -592,6 +622,9 @@
 #if PIN_EXISTS(HEATER_BED)
   REPORT_NAME_DIGITAL(__LINE__, HEATER_BED_PIN)
 #endif
+#if PIN_EXISTS(HEATER_CHAMBER)
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_CHAMBER_PIN)
+#endif
 #if PIN_EXISTS(HOME)
   REPORT_NAME_DIGITAL(__LINE__, HOME_PIN)
 #endif
@@ -637,9 +670,6 @@
 #if PIN_EXISTS(LED_RED)
   REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
 #endif
-#if PIN_EXISTS(MAX)
-  REPORT_NAME_DIGITAL(__LINE__, MAX_PIN)
-#endif
 #if PIN_EXISTS(MAX6675_DO)
   REPORT_NAME_DIGITAL(__LINE__, MAX6675_DO_PIN)
 #endif
@@ -652,6 +682,16 @@
 #if PIN_EXISTS(MAX6675_SS2)
   REPORT_NAME_DIGITAL(__LINE__, MAX6675_SS2_PIN)
 #endif
+#if PIN_EXISTS(MAX7219_CLK)
+  REPORT_NAME_DIGITAL(__LINE__, MAX7219_CLK_PIN)
+#endif
+#if PIN_EXISTS(MAX7219_DIN)
+  REPORT_NAME_DIGITAL(__LINE__, MAX7219_DIN_PIN)
+#endif
+#if PIN_EXISTS(MAX7219_LOAD)
+  REPORT_NAME_DIGITAL(__LINE__, MAX7219_LOAD_PIN)
+#endif
+
 // #if defined(MISO) && MISO >= 0
 //   REPORT_NAME_DIGITAL(__LINE__, MISO)
 // #endif
@@ -700,33 +740,12 @@
 #if PIN_EXISTS(MOTOR_FAULT)
   REPORT_NAME_DIGITAL(__LINE__, MOTOR_FAULT_PIN)
 #endif
-#if PIN_EXISTS(ORIG_E0_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E0_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E1_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E1_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E2_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E2_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E3_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E3_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E4_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E4_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E5_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E5_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E6_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E6_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(ORIG_E7_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, ORIG_E7_AUTO_FAN_PIN)
-#endif
 #if PIN_EXISTS(PHOTOGRAPH)
   REPORT_NAME_DIGITAL(__LINE__, PHOTOGRAPH_PIN)
 #endif
+#if PIN_EXISTS(CHDK)
+  REPORT_NAME_DIGITAL(__LINE__, CHDK_PIN)
+#endif
 #if PIN_EXISTS(PS_ON)
   REPORT_NAME_DIGITAL(__LINE__, PS_ON_PIN)
 #endif
@@ -748,6 +767,12 @@
 #if PIN_EXISTS(RAMPS_D9)
   REPORT_NAME_DIGITAL(__LINE__, RAMPS_D9_PIN)
 #endif
+#if PIN_EXISTS(NEOPIXEL)
+  REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL_PIN)
+#endif
+#if PIN_EXISTS(NEOPIXEL2)
+  REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL2_PIN)
+#endif
 #if PIN_EXISTS(RGB_LED_R)
   REPORT_NAME_DIGITAL(__LINE__, RGB_LED_R_PIN)
 #endif
@@ -838,6 +863,12 @@
 #if PIN_EXISTS(SOL5)
   REPORT_NAME_DIGITAL(__LINE__, SOL5_PIN)
 #endif
+#if PIN_EXISTS(SOL6)
+  REPORT_NAME_DIGITAL(__LINE__, SOL6_PIN)
+#endif
+#if PIN_EXISTS(SOL7)
+  REPORT_NAME_DIGITAL(__LINE__, SOL7_PIN)
+#endif
 #if defined(SPARE_IO) && SPARE_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
 #endif
@@ -988,6 +1019,9 @@
 #if PIN_EXISTS(X_STOP)
   REPORT_NAME_DIGITAL(__LINE__, X_STOP_PIN)
 #endif
+#if PIN_EXISTS(X2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, X2_CS_PIN)
+#endif
 #if PIN_EXISTS(X2_DIR)
   REPORT_NAME_DIGITAL(__LINE__, X2_DIR_PIN)
 #endif
@@ -1048,6 +1082,9 @@
 #if PIN_EXISTS(Y_STOP)
   REPORT_NAME_DIGITAL(__LINE__, Y_STOP_PIN)
 #endif
+#if PIN_EXISTS(Y2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_CS_PIN)
+#endif
 #if PIN_EXISTS(Y2_DIR)
   REPORT_NAME_DIGITAL(__LINE__, Y2_DIR_PIN)
 #endif
@@ -1351,6 +1388,24 @@
 #if PIN_EXISTS(TOUCH_INT)
   REPORT_NAME_DIGITAL(__LINE__, TOUCH_INT_PIN)
 #endif
+#if PIN_EXISTS(USB_CS)
+  REPORT_NAME_DIGITAL(__LINE__, USB_CS_PIN)
+#endif
+#if PIN_EXISTS(USB_INTR)
+  REPORT_NAME_DIGITAL(__LINE__, USB_INTR_PIN)
+#endif
+#if PIN_EXISTS(MMU2_RST)
+  REPORT_NAME_DIGITAL(__LINE__, MMU2_RST_PIN)
+#endif
+#if PIN_EXISTS(CALIBRATION)
+  REPORT_NAME_DIGITAL(__LINE__, CALIBRATION_PIN)
+#endif
 #if PIN_EXISTS(SMART_EFFECTOR_MOD)
   REPORT_NAME_DIGITAL(__LINE__, SMART_EFFECTOR_MOD_PIN)
 #endif
+#if PIN_EXISTS(CLOSED_LOOP_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, CLOSED_LOOP_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(CLOSED_LOOP_MOVE_COMPLETE)
+  REPORT_NAME_DIGITAL(__LINE__, CLOSED_LOOP_MOVE_COMPLETE_PIN)
+#endif
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 4cfa3261655d..430fa170e12a 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -39,10 +39,10 @@
 #endif
 
 // TMC2130 Diag Pins (currently just for reference)
-#define X_DIAG_PIN         64
-#define Y_DIAG_PIN         69
-#define Z_DIAG_PIN         68
-#define E0_DIAG_PIN        65
+#define X_DIAG_PIN                            64
+#define Y_DIAG_PIN                            69
+#define Z_DIAG_PIN                            68
+#define E0_DIAG_PIN                           65
 
 //
 // Limit Switches
@@ -55,20 +55,20 @@
 
 #if DISABLED(SENSORLESS_HOMING)
 
-  #define X_STOP_PIN       12
-  #define Y_STOP_PIN       11
-  #define Z_STOP_PIN       10
+  #define X_STOP_PIN                          12
+  #define Y_STOP_PIN                          11
+  #define Z_STOP_PIN                          10
 
 #else
 
-  #define X_STOP_PIN       X_DIAG_PIN
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
 
   #if ENABLED(BLTOUCH)
-    #define Z_STOP_PIN     11   // Y-MIN
-    #define SERVO0_PIN     10   // Z-MIN
+    #define Z_STOP_PIN                        11  // Y-MIN
+    #define SERVO0_PIN                        10  // Z-MIN
   #else
-    #define Z_STOP_PIN     10
+    #define Z_STOP_PIN                        10
   #endif
 
 #endif
@@ -77,104 +77,104 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  10
+  #define Z_MIN_PROBE_PIN                     10
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          49
-#define X_ENABLE_PIN       29
-#define X_CS_PIN           41
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             49
+#define X_ENABLE_PIN                          29
+#define X_CS_PIN                              41
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          48
-#define Y_ENABLE_PIN       28
-#define Y_CS_PIN           39
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             48
+#define Y_ENABLE_PIN                          28
+#define Y_CS_PIN                              39
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
-#define Z_CS_PIN           67
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
+#define Z_CS_PIN                              67
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
-#define E0_CS_PIN          66
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
+#define E0_CS_PIN                             66
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
 
 #ifndef FAN1_PIN
-  #define FAN1_PIN          6
+  #define FAN1_PIN                             6
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               77
-#define LED_PIN            13
-#define CASE_LIGHT_PIN      9
+#define SDSS                                  77
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                         9
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
-#define SPINDLE_DIR_PIN          19
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+#define SPINDLE_DIR_PIN                       19
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
-#define E_MUX2_PIN         78   // 84 in MK2 Firmware, with BEEPER as 78
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
+#define E_MUX2_PIN                            78  // 84 in MK2 Firmware, with BEEPER as 78
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
 
-  #define KILL_PIN         32
+  #define KILL_PIN                            32
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
 
     #if ENABLED(CR10_STOCKDISPLAY)
-      #define LCD_PINS_RS     85
-      #define LCD_PINS_ENABLE 71
-      #define LCD_PINS_D4     70
-      #define BTN_EN1         61
-      #define BTN_EN2         59
+      #define LCD_PINS_RS                     85
+      #define LCD_PINS_ENABLE                 71
+      #define LCD_PINS_D4                     70
+      #define BTN_EN1                         61
+      #define BTN_EN2                         59
     #else
-      #define LCD_PINS_RS     82
-      #define LCD_PINS_ENABLE 61
-      #define LCD_PINS_D4     59
-      #define LCD_PINS_D5     70
-      #define LCD_PINS_D6     85
-      #define LCD_PINS_D7     71
-      #define BTN_EN1         14
-      #define BTN_EN2         72
+      #define LCD_PINS_RS                     82
+      #define LCD_PINS_ENABLE                 61
+      #define LCD_PINS_D4                     59
+      #define LCD_PINS_D5                     70
+      #define LCD_PINS_D6                     85
+      #define LCD_PINS_D7                     71
+      #define BTN_EN1                         14
+      #define BTN_EN2                         72
     #endif
 
-    #define BTN_ENC            9   // AUX-2
-    #define BEEPER_PIN        84   // AUX-4
-    #define SD_DETECT_PIN     15
+    #define BTN_ENC                            9  // AUX-2
+    #define BEEPER_PIN                        84  // AUX-4
+    #define SD_DETECT_PIN                     15
 
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 2bc577313ecc..6e8463d0bdcd 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -39,10 +39,10 @@
 #endif
 
 // TMC2130 Diag Pins
-#define X_DIAG_PIN         64
-#define Y_DIAG_PIN         69
-#define Z_DIAG_PIN         68
-#define E0_DIAG_PIN        65
+#define X_DIAG_PIN                            64
+#define Y_DIAG_PIN                            69
+#define Z_DIAG_PIN                            68
+#define E0_DIAG_PIN                           65
 
 //
 // Limit Switches
@@ -55,141 +55,141 @@
 
 #if DISABLED(SENSORLESS_HOMING)
 
-  #define X_MIN_PIN        12   // X-
-  #define Y_MIN_PIN        11   // Y-
-  #define Z_MIN_PIN        10   // Z-
-  #define X_MAX_PIN        81   // X+
-  #define Y_MAX_PIN        57   // Y+
+  #define X_MIN_PIN                           12  // X-
+  #define Y_MIN_PIN                           11  // Y-
+  #define Z_MIN_PIN                           10  // Z-
+  #define X_MAX_PIN                           81  // X+
+  #define Y_MAX_PIN                           57  // Y+
 
 #else
 
   #if X_HOME_DIR < 0
-    #define X_MIN_PIN      X_DIAG_PIN
-    #define X_MAX_PIN      81   // X+
+    #define X_MIN_PIN                 X_DIAG_PIN
+    #define X_MAX_PIN                         81  // X+
   #else
-    #define X_MIN_PIN      12   // X-
-    #define X_MAX_PIN      X_DIAG_PIN
+    #define X_MIN_PIN                         12  // X-
+    #define X_MAX_PIN                 X_DIAG_PIN
   #endif
 
   #if Y_HOME_DIR < 0
-    #define Y_MIN_PIN      Y_DIAG_PIN
-    #define Y_MAX_PIN      57   // Y+
+    #define Y_MIN_PIN                 Y_DIAG_PIN
+    #define Y_MAX_PIN                         57  // Y+
   #else
-    #define Y_MIN_PIN      11   // Y-
-    #define Y_MAX_PIN      Y_DIAG_PIN
+    #define Y_MIN_PIN                         11  // Y-
+    #define Y_MAX_PIN                 Y_DIAG_PIN
   #endif
 
   #if ENABLED(BLTOUCH)
-    #define Z_MIN_PIN      11   // Y-MIN
-    #define SERVO0_PIN     10   // Z-MIN
+    #define Z_MIN_PIN                         11  // Y-MIN
+    #define SERVO0_PIN                        10  // Z-MIN
   #else
-    #define Z_MIN_PIN      10
+    #define Z_MIN_PIN                         10
   #endif
 
 #endif
 
-#define Z_MAX_PIN           7
+#define Z_MAX_PIN                              7
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  10
+  #define Z_MIN_PROBE_PIN                     10
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          49
-#define X_ENABLE_PIN       29
-#define X_CS_PIN           41
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             49
+#define X_ENABLE_PIN                          29
+#define X_CS_PIN                              41
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          48
-#define Y_ENABLE_PIN       28
-#define Y_CS_PIN           39
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             48
+#define Y_ENABLE_PIN                          28
+#define Y_CS_PIN                              39
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
-#define Z_CS_PIN           67
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
+#define Z_CS_PIN                              67
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
-#define E0_CS_PIN          66
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
+#define E0_CS_PIN                             66
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
+#define FAN1_PIN                               6
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define CASE_LIGHT_PIN      9
+#define SDSS                                  53
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                         9
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
-#define SPINDLE_DIR_PIN          19
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+#define SPINDLE_DIR_PIN                       19
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
-#define E_MUX2_PIN         78   // 84 in MK2 Firmware, with BEEPER as 78
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
+#define E_MUX2_PIN                            78  // 84 in MK2 Firmware, with BEEPER as 78
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
 
-  #define KILL_PIN         32
+  #define KILL_PIN                            32
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
 
     #if ENABLED(CR10_STOCKDISPLAY)
-      #define LCD_PINS_RS     85
-      #define LCD_PINS_ENABLE 71
-      #define LCD_PINS_D4     70
-      #define BTN_EN1         18
-      #define BTN_EN2         19
+      #define LCD_PINS_RS                     85
+      #define LCD_PINS_ENABLE                 71
+      #define LCD_PINS_D4                     70
+      #define BTN_EN1                         18
+      #define BTN_EN2                         19
     #else
-      #define LCD_PINS_RS     82
-      #define LCD_PINS_ENABLE 18   // On 0.6b, use 61
-      #define LCD_PINS_D4     19   // On 0.6b, use 59
-      #define LCD_PINS_D5     70
-      #define LCD_PINS_D6     85
-      #define LCD_PINS_D7     71
-      #define BTN_EN1         14
-      #define BTN_EN2         72
+      #define LCD_PINS_RS                     82
+      #define LCD_PINS_ENABLE                 18  // On 0.6b, use 61
+      #define LCD_PINS_D4                     19  // On 0.6b, use 59
+      #define LCD_PINS_D5                     70
+      #define LCD_PINS_D6                     85
+      #define LCD_PINS_D7                     71
+      #define BTN_EN1                         14
+      #define BTN_EN2                         72
     #endif
 
-    #define BTN_ENC            9   // AUX-2
-    #define BEEPER_PIN        84   // AUX-4
+    #define BTN_ENC                            9  // AUX-2
+    #define BEEPER_PIN                        84  // AUX-4
 
-    #define SD_DETECT_PIN     15
+    #define SD_DETECT_PIN                     15
 
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index 6aabf594ac20..18bc3ddd1677 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -26,7 +26,7 @@
  */
 
 #ifndef __AVR_ATmega2560__
-  #error "Oops! Select 'RAMBo' in 'Tools > Board.'"
+  #error "Oops! Select 'RAMBo' in 'Tools > Board' or the Mega2560 environment in PlatformIO."
 #endif
 
 #if MB(MINIRAMBO_10A)
@@ -38,104 +38,104 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          12
-#define X_MAX_PIN          30
-#define Y_MIN_PIN          11
-#define Y_MAX_PIN          24
-#define Z_MIN_PIN          10
-#define Z_MAX_PIN          23
+#define X_MIN_PIN                             12
+#define X_MAX_PIN                             30
+#define Y_MIN_PIN                             11
+#define Y_MAX_PIN                             24
+#define Z_MIN_PIN                             10
+#define Z_MAX_PIN                             23
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  23
+  #define Z_MIN_PROBE_PIN                     23
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          48
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             48
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          49
-#define Y_ENABLE_PIN       28
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             49
+#define Y_ENABLE_PIN                          28
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          40
-#define X_MS2_PIN          41
-#define Y_MS1_PIN          69
-#define Y_MS2_PIN          39
-#define Z_MS1_PIN          68
-#define Z_MS2_PIN          67
-#define E0_MS1_PIN         65
-#define E0_MS2_PIN         66
-
-#define MOTOR_CURRENT_PWM_XY_PIN 46
-#define MOTOR_CURRENT_PWM_Z_PIN  45
-#define MOTOR_CURRENT_PWM_E_PIN  44
+#define X_MS1_PIN                             40
+#define X_MS2_PIN                             41
+#define Y_MS1_PIN                             69
+#define Y_MS2_PIN                             39
+#define Z_MS1_PIN                             68
+#define Z_MS2_PIN                             67
+#define E0_MS1_PIN                            65
+#define E0_MS2_PIN                            66
+
+#define MOTOR_CURRENT_PWM_XY_PIN              46
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               44
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE 2000
+  #define MOTOR_CURRENT_PWM_RANGE            2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_1_PIN        7
+#define HEATER_0_PIN                           3
+#define HEATER_1_PIN                           7
 #if !MB(MINIRAMBO_10A)
-  #define HEATER_2_PIN      6
+  #define HEATER_2_PIN                         6
 #endif
-#define HEATER_BED_PIN      4
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
+#define FAN1_PIN                               6
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 #if !MB(MINIRAMBO_10A)
-  #define CASE_LIGHT_PIN    9
+  #define CASE_LIGHT_PIN                       9
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    18   // Pullup!
-#define SPINDLE_DIR_PIN          19
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
+#define SPINDLE_DIR_PIN                       19
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
 #if !MB(MINIRAMBO_10A)
-  #define E_MUX2_PIN       78   // 84 in MK2 Firmware, with BEEPER as 78
+  #define E_MUX2_PIN                          78  // 84 in MK2 Firmware, with BEEPER as 78
 #endif
 
 //
@@ -144,46 +144,46 @@
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
 
   #if !MB(MINIRAMBO_10A)
-    #define KILL_PIN       32
+    #define KILL_PIN                          32
   #endif
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
 
     #if MB(MINIRAMBO_10A)
 
-      #define BEEPER_PIN   78
+      #define BEEPER_PIN                      78
 
-      #define BTN_EN1      80
-      #define BTN_EN2      73
-      #define BTN_ENC      21
+      #define BTN_EN1                         80
+      #define BTN_EN2                         73
+      #define BTN_ENC                         21
 
-      #define LCD_PINS_RS  38
-      #define LCD_PINS_ENABLE 5
-      #define LCD_PINS_D4  14
-      #define LCD_PINS_D5  15
-      #define LCD_PINS_D6  32
-      #define LCD_PINS_D7  31
+      #define LCD_PINS_RS                     38
+      #define LCD_PINS_ENABLE                  5
+      #define LCD_PINS_D4                     14
+      #define LCD_PINS_D5                     15
+      #define LCD_PINS_D6                     32
+      #define LCD_PINS_D7                     31
 
-      #define SD_DETECT_PIN  72
+      #define SD_DETECT_PIN                   72
 
-    #else // !MINIRAMBO_10A
+    #else                                         // !MINIRAMBO_10A
 
       // AUX-4
-      #define BEEPER_PIN   84
+      #define BEEPER_PIN                      84
 
       // AUX-2
-      #define BTN_EN1      14
-      #define BTN_EN2      72
-      #define BTN_ENC       9
-
-      #define LCD_PINS_RS  82
-      #define LCD_PINS_ENABLE 18
-      #define LCD_PINS_D4  19
-      #define LCD_PINS_D5  70
-      #define LCD_PINS_D6  85
-      #define LCD_PINS_D7  71
-
-      #define SD_DETECT_PIN  15
+      #define BTN_EN1                         14
+      #define BTN_EN2                         72
+      #define BTN_ENC                          9
+
+      #define LCD_PINS_RS                     82
+      #define LCD_PINS_ENABLE                 18
+      #define LCD_PINS_D4                     19
+      #define LCD_PINS_D5                     70
+      #define LCD_PINS_D6                     85
+      #define LCD_PINS_D7                     71
+
+      #define SD_DETECT_PIN                   15
 
     #endif // !MINIRAMBO_10A
 
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 2e52e9427c28..dec72b8ea751 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -50,64 +50,68 @@
 //
 // Servos
 //
-#define SERVO0_PIN         22   // Motor header MX1
-#define SERVO1_PIN         23   // Motor header MX2
-#define SERVO2_PIN         24   // Motor header MX3
-#define SERVO3_PIN          5   // PWM header pin 5
+#define SERVO0_PIN                            22  // Motor header MX1
+#define SERVO1_PIN                            23  // Motor header MX2
+#define SERVO2_PIN                            24  // Motor header MX3
+#define SERVO3_PIN                             5  // PWM header pin 5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          12
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          11
-#define Y_MAX_PIN          23
-#define Z_MIN_PIN          10
-#define Z_MAX_PIN          30
+#define X_MIN_PIN                             12
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             11
+#define Y_MAX_PIN                             23
+#define Z_MIN_PIN                             10
+#define Z_MAX_PIN                             30
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  30
+  #define Z_MIN_PROBE_PIN                     30
+#endif
+
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                       5
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          48
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             48
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          49
-#define Y_ENABLE_PIN       28
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             49
+#define Y_ENABLE_PIN                          28
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         42
-#define E1_ENABLE_PIN      25
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            42
+#define E1_ENABLE_PIN                         25
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          40
-#define X_MS2_PIN          41
-#define Y_MS1_PIN          69
-#define Y_MS2_PIN          39
-#define Z_MS1_PIN          68
-#define Z_MS2_PIN          67
-#define E0_MS1_PIN         65
-#define E0_MS2_PIN         66
-#define E1_MS1_PIN         63
-#define E1_MS2_PIN         64
-
-#define DIGIPOTSS_PIN      38
+#define X_MS1_PIN                             40
+#define X_MS2_PIN                             41
+#define Y_MS1_PIN                             69
+#define Y_MS2_PIN                             39
+#define Z_MS1_PIN                             68
+#define Z_MS2_PIN                             67
+#define E0_MS1_PIN                            65
+#define E0_MS2_PIN                            66
+#define E1_MS1_PIN                            63
+#define E1_MS2_PIN                            64
+
+#define DIGIPOTSS_PIN                         38
 #define DIGIPOT_CHANNELS  { 4,5,3,0,1 }   // X Y Z E0 E1 digipot channels to stepper driver mapping
 #ifndef DIGIPOT_MOTOR_CURRENT
   #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 }   // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
@@ -116,122 +120,129 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN        6
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                           6
+#define HEATER_BED_PIN                         3
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
-#define FAN2_PIN            2
+#define FAN1_PIN                               6
+#define FAN2_PIN                               2
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN           4
-#define CASE_LIGHT_PIN     46
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                              4
+#define CASE_LIGHT_PIN                        46
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      3   // Analog Input
+  #define FILWIDTH_PIN                         3  // Analog Input
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    31   // Pullup!
-#define SPINDLE_DIR_PIN          32
+#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 31  // Pullup!
+#define SPINDLE_DIR_PIN                       32
+
+//
+// SPI for Max6675 or Max31855 Thermocouple
+//
+#ifndef MAX6675_SS_PIN
+  #define MAX6675_SS_PIN                      32  // SPINDLE_DIR_PIN / STAT_LED_BLUE_PIN
+#endif
 
 //
 // M7/M8/M9 - Coolant Control
 //
-#define COOLANT_MIST_PIN   22
-#define COOLANT_FLOOD_PIN  44
+#define COOLANT_MIST_PIN                      22
+#define COOLANT_FLOOD_PIN                     44
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX0_PIN         17
-#define E_MUX1_PIN         16
-#define E_MUX2_PIN         84   // 84 in MK2 Firmware
+#define E_MUX0_PIN                            17
+#define E_MUX1_PIN                            16
+#define E_MUX2_PIN                            84  // 84 in MK2 Firmware
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
 
-  #define KILL_PIN         80
+  #define KILL_PIN                            80
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
 
-    #define LCD_PINS_RS     70
-    #define LCD_PINS_ENABLE 71
-    #define LCD_PINS_D4     72
-    #define LCD_PINS_D5     73
-    #define LCD_PINS_D6     74
-    #define LCD_PINS_D7     75
+    #define LCD_PINS_RS                       70
+    #define LCD_PINS_ENABLE                   71
+    #define LCD_PINS_D4                       72
+    #define LCD_PINS_D5                       73
+    #define LCD_PINS_D6                       74
+    #define LCD_PINS_D7                       75
 
     #if ANY(VIKI2, miniVIKI)
-      #define BEEPER_PIN   44
+      #define BEEPER_PIN                      44
       // NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
       //     beeper/buzzer is connected to pin 33; however, the pin used in the
       //     diagram is actually pin 44, so this is correct.
 
-      #define DOGLCD_A0    70
-      #define DOGLCD_CS    71
+      #define DOGLCD_A0                       70
+      #define DOGLCD_CS                       71
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1      85
-      #define BTN_EN2      84
-      #define BTN_ENC      83
+      #define BTN_EN1                         85
+      #define BTN_EN2                         84
+      #define BTN_ENC                         83
 
-      #define SD_DETECT_PIN -1   // Pin 72 if using easy adapter board
+      #define SD_DETECT_PIN                   -1  // Pin 72 if using easy adapter board
 
-      #define STAT_LED_RED_PIN 22
-      #define STAT_LED_BLUE_PIN 32
+      #define STAT_LED_RED_PIN                22
+      #define STAT_LED_BLUE_PIN               32
 
-    #else // !VIKI2 && !miniVIKI
+    #else                                         // !VIKI2 && !miniVIKI
 
-      #define BEEPER_PIN   79   // AUX-4
+      #define BEEPER_PIN                      79  // AUX-4
 
       // AUX-2
-      #define BTN_EN1      76
-      #define BTN_EN2      77
-      #define BTN_ENC      78
+      #define BTN_EN1                         76
+      #define BTN_EN2                         77
+      #define BTN_ENC                         78
 
-      #define SD_DETECT_PIN 81
+      #define SD_DETECT_PIN                   81
 
     #endif // !VIKI2 && !miniVIKI
 
-  #else // !NEWPANEL - old style panel with shift register
+  #else                                           // !NEWPANEL - old style panel with shift register
 
     // No Beeper added
-    #define BEEPER_PIN     33
+    #define BEEPER_PIN                        33
 
     // Buttons attached to a shift register
     // Not wired yet
-    //#define SHIFT_CLK 38
-    //#define SHIFT_LD 42
-    //#define SHIFT_OUT 40
-    //#define SHIFT_EN 17
-
-    #define LCD_PINS_RS     75
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4     23
-    #define LCD_PINS_D5     25
-    #define LCD_PINS_D6     27
-    #define LCD_PINS_D7     29
+    //#define SHIFT_CLK                       38
+    //#define SHIFT_LD                        42
+    //#define SHIFT_OUT                       40
+    //#define SHIFT_EN                        17
+
+    #define LCD_PINS_RS                       75
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       23
+    #define LCD_PINS_D5                       25
+    #define LCD_PINS_D6                       27
+    #define LCD_PINS_D7                       29
 
   #endif // !NEWPANEL
 
diff --git a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
index 2bb6e9b97925..49237c706247 100644
--- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
+++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
@@ -34,126 +34,126 @@
 //
 // Servos
 //
-#define SERVO0_PIN         22   // Motor header MX1
-#define SERVO1_PIN         23   // Motor header MX2
-#define SERVO2_PIN         24   // Motor header MX3
-#define SERVO3_PIN          5   // PWM header pin 5
+#define SERVO0_PIN                            22  // Motor header MX1
+#define SERVO1_PIN                            23  // Motor header MX2
+#define SERVO2_PIN                            24  // Motor header MX3
+#define SERVO3_PIN                             5  // PWM header pin 5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          12
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          11
-#define Y_MAX_PIN          23
-#define Z_MIN_PIN          10
-#define Z_MAX_PIN          30
+#define X_MIN_PIN                             12
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             11
+#define Y_MAX_PIN                             23
+#define Z_MIN_PIN                             10
+#define Z_MAX_PIN                             30
 
 //
 // Z Probe (when not Z_MIN_IN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  30
+  #define Z_MIN_PROBE_PIN                     30
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          48
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             48
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         36
-#define Y_DIR_PIN          49
-#define Y_ENABLE_PIN       28
+#define Y_STEP_PIN                            36
+#define Y_DIR_PIN                             49
+#define Y_ENABLE_PIN                          28
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          47
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             47
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        34
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           34
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         26
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         42
-#define E1_ENABLE_PIN      25
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            42
+#define E1_ENABLE_PIN                         25
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          40
-#define X_MS2_PIN          41
-#define Y_MS1_PIN          69
-#define Y_MS2_PIN          39
-#define Z_MS1_PIN          68
-#define Z_MS2_PIN          67
-#define E0_MS1_PIN         65
-#define E0_MS2_PIN         66
-#define E1_MS1_PIN         63
-#define E1_MS2_PIN         64
-
-#define DIGIPOTSS_PIN      38
+#define X_MS1_PIN                             40
+#define X_MS2_PIN                             41
+#define Y_MS1_PIN                             69
+#define Y_MS2_PIN                             39
+#define Z_MS1_PIN                             68
+#define Z_MS2_PIN                             67
+#define E0_MS1_PIN                            65
+#define E0_MS2_PIN                            66
+#define E1_MS1_PIN                            63
+#define E1_MS2_PIN                            64
+
+#define DIGIPOTSS_PIN                         38
 #define DIGIPOT_CHANNELS {4,5,3,0,1}   // X Y Z E0 E1 digipot channels to stepper driver mapping
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_BED_PIN        7   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_BED_PIN                           7  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                         3
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8
+  #define FAN_PIN                              8
 #endif
-#define FAN1_PIN            6
-#define FAN2_PIN            2
+#define FAN1_PIN                               6
+#define FAN2_PIN                               2
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN           4
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                              4
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      3   // Analog Input
+  #define FILWIDTH_PIN                         3  // Analog Input
 #endif
 
 //
 // LCD / Controller
 //
-#define LCD_PINS_RS        70   // Ext2_5
-#define LCD_PINS_ENABLE    71   // Ext2_7
-#define LCD_PINS_D4        72   // Ext2_9 ?
-#define LCD_PINS_D5        73   // Ext2_11 ?
-#define LCD_PINS_D6        74   // Ext2_13
-#define LCD_PINS_D7        75   // Ext2_15 ?
-#define BEEPER_PIN         -1
+#define LCD_PINS_RS                           70  // Ext2_5
+#define LCD_PINS_ENABLE                       71  // Ext2_7
+#define LCD_PINS_D4                           72  // Ext2_9 ?
+#define LCD_PINS_D5                           73  // Ext2_11 ?
+#define LCD_PINS_D6                           74  // Ext2_13
+#define LCD_PINS_D7                           75  // Ext2_15 ?
+#define BEEPER_PIN                            -1
 
-#define BTN_HOME           80   // Ext_16
-#define BTN_CENTER         81   // Ext_14
-#define BTN_ENC            BTN_CENTER
-#define BTN_RIGHT          82   // Ext_12
-#define BTN_LEFT           83   // Ext_10
-#define BTN_UP             84   // Ext2_8
-#define BTN_DOWN           85   // Ext2_6
+#define BTN_HOME                              80  // Ext_16
+#define BTN_CENTER                            81  // Ext_14
+#define BTN_ENC                       BTN_CENTER
+#define BTN_RIGHT                             82  // Ext_12
+#define BTN_LEFT                              83  // Ext_10
+#define BTN_UP                                84  // Ext2_8
+#define BTN_DOWN                              85  // Ext2_6
 
-#define HOME_PIN           BTN_HOME
+#define HOME_PIN                        BTN_HOME
 
 #if ANY(VIKI2, miniVIKI)
-  #define BEEPER_PIN       44
+  #define BEEPER_PIN                          44
   // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0        70
-  #define DOGLCD_CS        71
+  #define DOGLCD_A0                           70
+  #define DOGLCD_CS                           71
   #define LCD_SCREEN_ROT_180
 
-  #define SD_DETECT_PIN    -1   // Pin 72 if using easy adapter board
+  #define SD_DETECT_PIN                       -1  // Pin 72 if using easy adapter board
 
-  #define STAT_LED_RED_PIN  22
-  #define STAT_LED_BLUE_PIN 32
+  #define STAT_LED_RED_PIN                    22
+  #define STAT_LED_BLUE_PIN                   32
 #endif // VIKI2/miniVIKI
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 3f537a6663f1..69d2ac2088ff 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -40,11 +40,11 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D8_PIN        9
-#define RAMPS_D9_PIN        8
-#define MOSFET_D_PIN       12
+#define RAMPS_D8_PIN                           9
+#define RAMPS_D9_PIN                           8
+#define MOSFET_D_PIN                          12
 
-#define CASE_LIGHT_PIN     -1   // Hardware PWM but one is not available on expansion header
+#define CASE_LIGHT_PIN                        -1  // Hardware PWM but one is not available on expansion header
 
 #include "pins_RAMPS.h"
 
@@ -57,21 +57,21 @@
 // Steppers
 //
 #undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN       63
+#define Z_ENABLE_PIN                          63
 
 //
 // Heaters / Fans
 //
-#define HEATER_2_PIN        6
+#define HEATER_2_PIN                           6
 
 //
 // Misc. Functions
 //
 #undef SDSS
-#define SDSS               25
+#define SDSS                                  25
 
 #undef SD_DETECT_PIN
-#define SD_DETECT_PIN      53
+#define SD_DETECT_PIN                         53
 
 //
 // LCD / Controller
@@ -85,24 +85,24 @@
   #undef LCD_PINS_D5
   #undef LCD_PINS_D6
   #undef LCD_PINS_D7
-  #define LCD_PINS_RS      27
-  #define LCD_PINS_ENABLE  29
-  #define LCD_PINS_D4      37
-  #define LCD_PINS_D5      35
-  #define LCD_PINS_D6      33
-  #define LCD_PINS_D7      31
+  #define LCD_PINS_RS                         27
+  #define LCD_PINS_ENABLE                     29
+  #define LCD_PINS_D4                         37
+  #define LCD_PINS_D5                         35
+  #define LCD_PINS_D6                         33
+  #define LCD_PINS_D7                         31
 
   // Buttons
   #undef BTN_EN1
   #undef BTN_EN2
   #undef BTN_ENC
-  #define BTN_EN1          16
-  #define BTN_EN2          17
-  #define BTN_ENC          23
+  #define BTN_EN1                             16
+  #define BTN_EN2                             17
+  #define BTN_ENC                             23
 
 #else
 
-  #define BEEPER_PIN       33
+  #define BEEPER_PIN                          33
 
 #endif // HAS_SPI_LCD && NEWPANEL
 
@@ -137,7 +137,7 @@
  *
  *  Note: Socket names vary from vendor to vendor
  */
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are not good with 3DRAG
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are not good with 3DRAG
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
 
@@ -149,14 +149,14 @@
     #undef Z_DIR_PIN
     #undef Z_ENABLE_PIN
     #undef Z_STEP_PIN
-    #define Z_DIR_PIN                28
-    #define Z_ENABLE_PIN             24
-    #define Z_STEP_PIN               26
-    #define SPINDLE_LASER_PWM_PIN    46   // Hardware PWM
-    #define SPINDLE_LASER_ENA_PIN    62   // Pullup!
-    #define SPINDLE_DIR_PIN          48
-  #elif !BOTH(ULTRA_LCD, NEWPANEL)     // use expansion header if no LCD in use
-    #define SPINDLE_LASER_ENA_PIN    16   // Pullup or pulldown!
-    #define SPINDLE_DIR_PIN          17
+    #define Z_DIR_PIN                         28
+    #define Z_ENABLE_PIN                      24
+    #define Z_STEP_PIN                        26
+    #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
+    #define SPINDLE_DIR_PIN                   48
+  #elif !BOTH(ULTRA_LCD, NEWPANEL)                // use expansion header if no LCD in use
+    #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
+    #define SPINDLE_DIR_PIN                   17
   #endif
 #endif
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index 99b75d5e0024..a38e4e1b43aa 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -32,15 +32,15 @@
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
-  #define CASE_LIGHT_PIN    6   // Define before RAMPS pins include
+  #define CASE_LIGHT_PIN                       6  // Define before RAMPS pins include
 #endif
 #define BOARD_INFO_NAME "Azteeg X3"
 
 //
 // Servos
 //
-#define SERVO0_PIN         44   // SERVO1 port
-#define SERVO1_PIN         55   // SERVO2 port
+#define SERVO0_PIN                            44  // SERVO1 port
+#define SERVO1_PIN                            55  // SERVO2 port
 
 #include "pins_RAMPS_13.h"
 
@@ -55,17 +55,17 @@
   #undef DOGLCD_A0
   #undef DOGLCD_CS
   #undef BTN_ENC
-  #define DOGLCD_A0         31
-  #define DOGLCD_CS         32
-  #define BTN_ENC           12
+  #define DOGLCD_A0                           31
+  #define DOGLCD_CS                           32
+  #define BTN_ENC                             12
 
-  #define STAT_LED_RED_PIN  64
-  #define STAT_LED_BLUE_PIN 63
+  #define STAT_LED_RED_PIN                    64
+  #define STAT_LED_BLUE_PIN                   63
 
 #else
 
-  #define STAT_LED_RED_PIN   6
-  #define STAT_LED_BLUE_PIN 11
+  #define STAT_LED_RED_PIN                     6
+  #define STAT_LED_BLUE_PIN                   11
 
 #endif
 
@@ -79,18 +79,18 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are no good with the AzteegX3 board
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
 
 #if HAS_CUTTER
-  #undef SDA                       // use EXP3 header
+  #undef SDA                                      // use EXP3 header
   #undef SCL
   #if SERVO0_PIN == 7
     #undef SERVO0_PIN
-    #define SERVO0_PIN     11
+    #define SERVO0_PIN                        11
   #endif
-  #define SPINDLE_LASER_PWM_PIN     7   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    20   // Pullup!
-  #define SPINDLE_DIR_PIN          21
+  #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               20  // Pullup!
+  #define SPINDLE_DIR_PIN                     21
 #endif
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index 627eaabfd69e..c8e2a6683d98 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -43,21 +43,21 @@
 // Tested this pin with bed leveling on a Delta with 1 servo.
 // Physical wire attachment on EXT1: GND, 5V, D47.
 //
-#define SERVO0_PIN         47
+#define SERVO0_PIN                            47
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN         14
-#define Z_STOP_PIN         18
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                            14
+#define Z_STOP_PIN                            18
 
 #ifndef FAN_PIN
-  #define FAN_PIN           6
+  #define FAN_PIN                              6
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
-  #define CASE_LIGHT_PIN   44
+  #define CASE_LIGHT_PIN                      44
 #endif
 
 //
@@ -67,100 +67,100 @@
 
 // DIGIPOT slave addresses
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
 #endif
 #ifndef DIGIPOT_I2C_ADDRESS_B
-  #define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
+  #define DIGIPOT_I2C_ADDRESS_B 0x2E              // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  18
+  #define Z_MIN_PROBE_PIN                     18
 #endif
 
 //
 // Steppers
 //
-#define E2_STEP_PIN        23
-#define E2_DIR_PIN         25
-#define E2_ENABLE_PIN      40
+#define E2_STEP_PIN                           23
+#define E2_DIR_PIN                            25
+#define E2_ENABLE_PIN                         40
 
-#define E3_STEP_PIN        27
-#define E3_DIR_PIN         29
-#define E3_ENABLE_PIN      41
+#define E3_STEP_PIN                           27
+#define E3_DIR_PIN                            29
+#define E3_ENABLE_PIN                         41
 
-#define E4_STEP_PIN        43
-#define E4_DIR_PIN         37
-#define E4_ENABLE_PIN      42
+#define E4_STEP_PIN                           43
+#define E4_DIR_PIN                            37
+#define E4_ENABLE_PIN                         42
 
 //
 // Temperature Sensors
 //
-#define TEMP_2_PIN         12   // Analog Input
-#define TEMP_3_PIN         11   // Analog Input
-#define TEMP_4_PIN         10   // Analog Input
-#define TC1                 4   // Analog Input (Thermo couple on Azteeg X3Pro)
-#define TC2                 5   // Analog Input (Thermo couple on Azteeg X3Pro)
+#define TEMP_2_PIN                            12  // Analog Input
+#define TEMP_3_PIN                            11  // Analog Input
+#define TEMP_4_PIN                            10  // Analog Input
+#define TC1                                    4  // Analog Input (Thermo couple on Azteeg X3Pro)
+#define TC2                                    5  // Analog Input (Thermo couple on Azteeg X3Pro)
 
 //
 // Heaters / Fans
 //
-#define HEATER_2_PIN       16
-#define HEATER_3_PIN       17
-#define HEATER_4_PIN        4
-#define HEATER_5_PIN        5
-#define HEATER_6_PIN        6
-#define HEATER_7_PIN       11
+#define HEATER_2_PIN                          16
+#define HEATER_3_PIN                          17
+#define HEATER_4_PIN                           4
+#define HEATER_5_PIN                           5
+#define HEATER_6_PIN                           6
+#define HEATER_7_PIN                          11
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN 4   // Pin used for the fan to cool motherboard (-1 to disable)
+  #define CONTROLLER_FAN_PIN                   4  // Pin used for the fan to cool motherboard (-1 to disable)
 #endif
 
 // Fans/Water Pump to cool the hotend cool side.
-#define ORIG_E0_AUTO_FAN_PIN 5
-#define ORIG_E1_AUTO_FAN_PIN 5
-#define ORIG_E2_AUTO_FAN_PIN 5
-#define ORIG_E3_AUTO_FAN_PIN 5
+#define ORIG_E0_AUTO_FAN_PIN                   5
+#define ORIG_E1_AUTO_FAN_PIN                   5
+#define ORIG_E2_AUTO_FAN_PIN                   5
+#define ORIG_E3_AUTO_FAN_PIN                   5
 
 //
 // LCD / Controller
 //
 #undef BEEPER_PIN
-#define BEEPER_PIN         33
+#define BEEPER_PIN                            33
 
 #if ANY(VIKI2, miniVIKI)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    49   // For easy adapter board
+  #define SD_DETECT_PIN                       49  // For easy adapter board
   #undef BEEPER_PIN
-  #define  BEEPER_PIN      12   // 33 isn't physically available to the LCD display
+  #define BEEPER_PIN                          12  // 33 isn't physically available to the LCD display
 #else
-  #define STAT_LED_RED_PIN  32
-  #define STAT_LED_BLUE_PIN 35
+  #define STAT_LED_RED_PIN                    32
+  #define STAT_LED_BLUE_PIN                   35
 #endif
 
 //
 // Misc. Functions
 //
 #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN
-  #undef DOGLCD_A0              // Steal pin 44 for the case light; if you have a Viki2 and have connected it
-  #define DOGLCD_A0        57   // following the Panucatt wiring diagram, you may need to tweak these pin assignments
+  #undef DOGLCD_A0                                // Steal pin 44 for the case light; if you have a Viki2 and have connected it
+  #define DOGLCD_A0                           57  // following the Panucatt wiring diagram, you may need to tweak these pin assignments
                                 // as the wiring diagram uses pin 44 for DOGLCD_A0
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#undef SPINDLE_LASER_PWM_PIN    // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
 
-#if HAS_CUTTER   // EXP2 header
+#if HAS_CUTTER                                    // EXP2 header
   #if ANY(VIKI2, miniVIKI)
-    #define BTN_EN2        31   // Pin 7 needed for Spindle PWM
+    #define BTN_EN2                           31  // Pin 7 needed for Spindle PWM
   #endif
-  #define SPINDLE_LASER_PWM_PIN  7   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN 20   // Pullup!
-  #define SPINDLE_DIR_PIN       21
+  #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               20  // Pullup!
+  #define SPINDLE_DIR_PIN                     21
 #endif
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index 9945c94d7627..1aa9b67f7c1b 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -34,9 +34,9 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    66   // Pullup or pulldown!
-#define SPINDLE_DIR_PIN          67
-#define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                66   // Pullup or pulldown!
+#define SPINDLE_DIR_PIN                      67
+#define SPINDLE_LASER_PWM_PIN                44   // Hardware PWM
 
 #include "pins_RAMPS.h"
 
@@ -45,5 +45,5 @@
 //
 #undef TEMP_0_PIN
 #undef TEMP_1_PIN
-#define TEMP_0_PIN          9   // Analog Input
-#define TEMP_1_PIN         11   // Analog Input
+#define TEMP_0_PIN                            9   // Analog Input
+#define TEMP_1_PIN                           11   // Analog Input
diff --git a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
index bf75c1a2a2ab..44b6ff1e617e 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -34,30 +34,30 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D8_PIN       10
-#define RAMPS_D9_PIN       12
-#define RAMPS_D10_PIN       9
-#define MOSFET_D_PIN        7
+#define RAMPS_D8_PIN                          10
+#define RAMPS_D9_PIN                          12
+#define RAMPS_D10_PIN                          9
+#define MOSFET_D_PIN                           7
 
 //
 // Auto fans
 //
-#define ORIG_E0_AUTO_FAN_PIN 11
-#define ORIG_E1_AUTO_FAN_PIN  6
-#define ORIG_E2_AUTO_FAN_PIN  6
-#define ORIG_E3_AUTO_FAN_PIN  6
+#define ORIG_E0_AUTO_FAN_PIN                  11
+#define ORIG_E1_AUTO_FAN_PIN                   6
+#define ORIG_E2_AUTO_FAN_PIN                   6
+#define ORIG_E3_AUTO_FAN_PIN                   6
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-#define SPINDLE_DIR_PIN          42
+#define SPINDLE_LASER_ENA_PIN                 40  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
+#define SPINDLE_DIR_PIN                       42
 
 //
 // Limit Switches
 //
-#define X_MAX_PIN          79   // 2
+#define X_MAX_PIN                             79  // 2
 
 //
 // Import RAMPS 1.3 pins
@@ -68,34 +68,33 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #undef Z_MIN_PROBE_PIN
-#define Z_MIN_PROBE_PIN    19   // IND_S_5V
+#define Z_MIN_PROBE_PIN                       19  // IND_S_5V
 
 #undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN       77   // 62
+#define Z_ENABLE_PIN                          77  // 62
 
 //
 // Steppers
 //
-#define DIGIPOTSS_PIN      22
+#define DIGIPOTSS_PIN                         22
 #define DIGIPOT_CHANNELS   { 4, 5, 3, 0, 1 }
 
 //
 // Temperature Sensors
 //
 #undef TEMP_1_PIN
-#define TEMP_1_PIN         14   // Analog Input (15)
+#define TEMP_1_PIN                            14  // Analog Input (15)
 
 #undef TEMP_BED_PIN
-#define TEMP_BED_PIN       15   // Analog Input (14)
+#define TEMP_BED_PIN                          15  // Analog Input (14)
 
 //
 // Misc. Functions
 //
-#undef PS_ON_PIN                // 12
-#define PS_ON_PIN          81   // External Power Supply
-
-#define CASE_LIGHT_PIN     44   // Hardware PWM
+#undef PS_ON_PIN                                  // 12
+#define PS_ON_PIN                             81  // External Power Supply
 
+#define CASE_LIGHT_PIN                        44  // Hardware PWM
 
 // This board has headers for Z-min, Z-max and IND_S_5V *but* as the bq team
 // decided to ship the printer only with the probe and no additional Z-min
@@ -104,8 +103,8 @@
 #ifdef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
   #undef Z_MIN_PIN
   #undef Z_MAX_PIN
-  #define Z_MIN_PIN        19   // IND_S_5V
-  #define Z_MAX_PIN        18   // Z-MIN Label
+  #define Z_MIN_PIN                           19  // IND_S_5V
+  #define Z_MAX_PIN                           18  // Z-MIN Label
 #endif
 
 //
@@ -113,5 +112,5 @@
 //
 #if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
   #undef HEATER_BED_PIN
-  #define HEATER_BED_PIN    8
+  #define HEATER_BED_PIN                       8
 #endif
diff --git a/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
new file mode 100644
index 000000000000..8f61ef47dc68
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
@@ -0,0 +1,34 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "Copymaster 3D RAMPS"
+
+#define Z_STEP_PIN        47
+#define Y_MAX_PIN         14
+#define FIL_RUNOUT_PIN    15
+#define SD_DETECT_PIN     66
+
+//
+// Import RAMPS 1.4 pins
+//
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
index 6a9897334755..9ff9d3be62ed 100644
--- a/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
@@ -34,68 +34,68 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         54   // PF0 / A0
-#define Y_STOP_PIN         24   // PA2 / AD2
-#define Z_MIN_PIN          23   // PA1 / AD1
-#define Z_MAX_PIN          25   // PA3 / AD3
-#define SERVO0_PIN         40   // PG1 / !RD
+#define X_STOP_PIN                            54  // PF0 / A0
+#define Y_STOP_PIN                            24  // PA2 / AD2
+#define Z_MIN_PIN                             23  // PA1 / AD1
+#define Z_MAX_PIN                             25  // PA3 / AD3
+#define SERVO0_PIN                            40  // PG1 / !RD
 
 //
 // Steppers
 //
-#define X_STEP_PIN         61   // PF7 / A7
-#define X_DIR_PIN          62   // PK0 / A8
-#define X_ENABLE_PIN       60   // PF6 / A6
+#define X_STEP_PIN                            61  // PF7 / A7
+#define X_DIR_PIN                             62  // PK0 / A8
+#define X_ENABLE_PIN                          60  // PF6 / A6
 
-#define Y_STEP_PIN         64   // PK2 / A10
-#define Y_DIR_PIN          65   // PK3 / A11
-#define Y_ENABLE_PIN       63   // PK1 / A9
+#define Y_STEP_PIN                            64  // PK2 / A10
+#define Y_DIR_PIN                             65  // PK3 / A11
+#define Y_ENABLE_PIN                          63  // PK1 / A9
 
-#define Z_STEP_PIN         67   // PK5 / A13
-#define Z_DIR_PIN          69   // PK7 / A15
-#define Z_ENABLE_PIN       66   // PK4 / A12
-#define Z_MIN_PROBE_PIN    25   // PA3 / AD3
+#define Z_STEP_PIN                            67  // PK5 / A13
+#define Z_DIR_PIN                             69  // PK7 / A15
+#define Z_ENABLE_PIN                          66  // PK4 / A12
+#define Z_MIN_PROBE_PIN                       25  // PA3 / AD3
 
-#define E0_STEP_PIN        58   // PF4 / A4
-#define E0_DIR_PIN         59   // PF5 / A5
-#define E0_ENABLE_PIN      57   // PF3 / A3
+#define E0_STEP_PIN                           58  // PF4 / A4
+#define E0_DIR_PIN                            59  // PF5 / A5
+#define E0_ENABLE_PIN                         57  // PF3 / A3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // PF1 / A1   Analog
-#define TEMP_BED_PIN       14   // PK6 / A14  Analog
+#define TEMP_0_PIN                             1  // PF1 / A1   Analog
+#define TEMP_BED_PIN                          14  // PK6 / A14  Analog
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4   // PG5 / PWM4
-#define HEATER_BED_PIN      3   // PE5 / PWM3
+#define HEATER_0_PIN                           4  // PG5 / PWM4
+#define HEATER_BED_PIN                         3  // PE5 / PWM3
 
-#define FAN_PIN             5   // PE3 / PWM5
+#define FAN_PIN                                5  // PE3 / PWM5
 
 //
 // Misc. Functions
 //
-#define SDSS               53   // PB0 / SS
-#define LED_PIN            13   // PB7 / PWM13
+#define SDSS                                  53  // PB0 / SS
+#define LED_PIN                               13  // PB7 / PWM13
 
-#define MISO_PIN           50   // PB3
-#define MOSI_PIN           51   // PB2
-#define SCK_PIN            52   // PB1
+#define MISO_PIN                              50  // PB3
+#define MOSI_PIN                              51  // PB2
+#define SCK_PIN                               52  // PB1
 
 //
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
   #if ENABLED(ZONESTAR_LCD)
-    #define LCD_PINS_RS        2
-    #define LCD_PINS_ENABLE   36
-    #define LCD_PINS_D4       37
-    #define LCD_PINS_D5       34
-    #define LCD_PINS_D6       35
-    #define LCD_PINS_D7       32
-    #define ADC_KEYPAD_PIN    12   // Analog
+    #define LCD_PINS_RS                        2
+    #define LCD_PINS_ENABLE                   36
+    #define LCD_PINS_D4                       37
+    #define LCD_PINS_D5                       34
+    #define LCD_PINS_D6                       35
+    #define LCD_PINS_D7                       32
+    #define ADC_KEYPAD_PIN                    12  // Analog
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h
index f5a49db53302..bfd341db6d3d 100644
--- a/Marlin/src/pins/ramps/pins_FELIX2.h
+++ b/Marlin/src/pins/ramps/pins_FELIX2.h
@@ -35,29 +35,29 @@
 // Heaters / Fans
 //
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN        7
+#define MOSFET_D_PIN                          7
 
 #include "pins_RAMPS.h"
 
 //
 // Misc. Functions
 //
-#define SDPOWER_PIN         1
+#define SDPOWER_PIN                           1
 
-#define PS_ON_PIN          12
+#define PS_ON_PIN                            12
 
 //
 // LCD / Controller
 //
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define SD_DETECT_PIN     6
+  #define SD_DETECT_PIN                       6
 
 #endif // NEWPANEL && ULTRA_LCD
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#undef SPINDLE_LASER_PWM_PIN     // Definitions in pins_RAMPS.h are not valid with this board
+#undef SPINDLE_LASER_PWM_PIN                      // Definitions in pins_RAMPS.h are not valid with this board
 #undef SPINDLE_LASER_ENA_PIN
 #undef SPINDLE_DIR_PIN
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index 3dcd7e57bc08..75d647fed5c2 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -41,83 +41,83 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         43
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            43
+#define E2_ENABLE_PIN                         44
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -140,39 +140,39 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                         8
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   57
+  #define FIL_RUNOUT_PIN                      57
 #endif
 
 #if !HAS_FILAMENT_SENSOR
-  #define FAN1_PIN          4
+  #define FAN1_PIN                             4
 #endif
 
 //
 // Misc. Functions
 //
 #ifndef SDSS
-  #define SDSS             53
+  #define SDSS                                53
 #endif
-#define LED_PIN            13
-#define LED4_PIN            5
+#define LED_PIN                               13
+#define LED4_PIN                               5
 
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN        5   // Analog Input
+#define FILWIDTH_PIN                           5  // Analog Input
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
-#define CASE_LIGHT_PIN      5
+#define CASE_LIGHT_PIN                         5
 
 //
 // LCD / Controller
@@ -180,16 +180,16 @@
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-  #define BEEPER_PIN       37
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
-  #define KILL_PIN         41
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
+  #define BEEPER_PIN                          37
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
+  #define KILL_PIN                            41
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
index 3bbff7f8f212..3ed9fb969252 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
@@ -28,10 +28,10 @@
 #define BOARD_INFO_NAME      "Formbot Raptor2"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
-#define FAN_PIN             6
+#define FAN_PIN                                6
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   22
+  #define FIL_RUNOUT_PIN                      22
 #endif
 
 #include "pins_FORMBOT_RAPTOR.h"
@@ -42,22 +42,22 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !NUM_SERVOS                       // Try to use servo connector first
-    #define SPINDLE_LASER_ENA_PIN     6 // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     4 // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
-  #elif !GREEDY_PANEL                   // Try to use AUX2
-    #define SPINDLE_LASER_ENA_PIN     4 // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44 // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+  #if !NUM_SERVOS                                 // Try to use servo connector first
+    #define SPINDLE_LASER_ENA_PIN              6  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif !GREEDY_PANEL                             // Try to use AUX2
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
-  #if NUM_SERVOS <= 1                   // Try to use servo connector first
-    #define CASE_LIGHT_PIN  6           // Hardware PWM
-  #elif !GREEDY_PANEL                   // Try to use AUX2
-    #define CASE_LIGHT_PIN 44           // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Try to use servo connector first
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+  #elif !GREEDY_PANEL                             // Try to use AUX2
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 1c911cd125df..5176c699ee28 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -21,6 +21,15 @@
  */
 #pragma once
 
+/**
+ * Override default LCD timing for Formbot T-Rex 2+ machines.
+ * The long LCD cables and the routing near electrically noisy stepper motors
+ * requires a slightly longer setup and hold time on the signals.
+ */
+#define BOARD_ST7920_DELAY_1 DELAY_NS(200)
+#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
+#define BOARD_ST7920_DELAY_3 DELAY_NS(200)
+
 /**
  * Formbot pin assignments
  */
@@ -37,84 +46,84 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN         -1    // was 6
-#define SERVO2_PIN         -1    // was 5
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                            -1  // was 6
+#define SERVO2_PIN                            -1  // was 5
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         43
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            43
+#define E2_ENABLE_PIN                         44
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN        3   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                           3  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -137,36 +146,36 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN     58
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                        58
 
-#define FAN_PIN             9
+#define FAN_PIN                                9
 
 #if HAS_FILAMENT_SENSOR
-  #define FIL_RUNOUT_PIN    4
-  //#define FIL_RUNOUT2_PIN  -1
+  #define FIL_RUNOUT_PIN                       4
+  //#define FIL_RUNOUT2_PIN                   -1
 #else
   // Though defined as a fan pin, it is utilized as a dedicated laser pin by Formbot.
-  #define FAN1_PIN          4
+  #define FAN1_PIN                             4
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
+#define SDSS                                  53
 #ifndef LED_PIN
-  #define LED_PIN          13   // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
+  #define LED_PIN                             13  // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
 #endif                          // is a good place to get a signal to control the Max7219 LED Matrix.
 
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN        5   // Analog Input
+#define FILWIDTH_PIN                           5  // Analog Input
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
-#define CASE_LIGHT_PIN      8
+#define CASE_LIGHT_PIN                         8
 
 //
 // LCD / Controller
@@ -175,22 +184,22 @@
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN     37
+    #define BEEPER_PIN                        37
   #endif
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
 
   // Allow MAX7219 to steal the KILL pin
   #if !defined(KILL_PIN) && MAX7219_CLK_PIN != 41 && MAX7219_DIN_PIN != 41 && MAX7219_LOAD_PIN != 41
-    #define KILL_PIN       41
+    #define KILL_PIN                          41
   #endif
 
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index bdcb28dac211..3846a7649e70 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -37,116 +37,114 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN         -1    // was 6
-#define SERVO2_PIN         -1
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                            -1  // was 6
+#define SERVO2_PIN                            -1
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         43
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            43
+#define E2_ENABLE_PIN                         44
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
-
-
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN             9
-#define FAN1_PIN           12
+#define FAN_PIN                                9
+#define FAN1_PIN                              12
 
-#define NUM_RUNOUT_SENSORS  2
-#define FIL_RUNOUT_PIN     22
-#define FIL_RUNOUT2_PIN    21
+#define NUM_RUNOUT_SENSORS                     2
+#define FIL_RUNOUT_PIN                        22
+#define FIL_RUNOUT2_PIN                       21
 
 //
 // Misc. Functions
 //
-#define CASE_LIGHT_PIN      5
-#define SDSS               53
+#define CASE_LIGHT_PIN                         5
+#define SDSS                                  53
 #ifndef LED_PIN
-  #define LED_PIN          13
+  #define LED_PIN                             13
 #endif
 
-#define SPINDLE_LASER_PWM_PIN    -1   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     4   // Pullup!
+#define SPINDLE_LASER_PWM_PIN                 -1  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
 
 // Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
-#define FILWIDTH_PIN        5   // Analog Input
+#define FILWIDTH_PIN                           5  // Analog Input
 
 //
 // LCD / Controller
@@ -154,20 +152,20 @@
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
   #ifndef KILL_PIN
-    #define KILL_PIN       41
+    #define KILL_PIN                          41
   #endif
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN     37
+    #define BEEPER_PIN                        37
   #endif
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 475551ad6bc1..19238bc5f867 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -29,91 +29,87 @@
   #error "Oops! Select 'FYSETC F6' in 'Tools > Board.'"
 #endif
 
-#if ENABLED(SD_DETECT_INVERTED)
-  //#error "SD_DETECT_INVERTED must be disabled for the FYSETC_F6_13 board."
-#endif
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "FYSETC F6 1.3"
 #endif
 
-#define RESET_PIN          30
-#define SPI_FLASH_CS       83
+#define RESET_PIN                             30
+#define SPI_FLASH_CS                          83
 
 //
 // Servos
 //
-#define SERVO0_PIN         13
-#define SERVO1_PIN         11    // (PS_ON_PIN)
-#define SERVO2_PIN         10    // (FIL_RUNOUT_PIN)
-#define SERVO3_PIN          4    // (RGB_LED_G_PIN)
+#define SERVO0_PIN                            13
+#define SERVO1_PIN                            11  // (PS_ON_PIN)
+#define SERVO2_PIN                            10  // (FIL_RUNOUT_PIN)
+#define SERVO3_PIN                             4  // (RGB_LED_G_PIN)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          63
-#define X_MAX_PIN          64
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          12
+#define X_MIN_PIN                             63
+#define X_MAX_PIN                             64
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             12
 #ifndef Z_MAX_PIN
-  #define Z_MAX_PIN         9
+  #define Z_MAX_PIN                            9
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   SERVO2_PIN
+  #define FIL_RUNOUT_PIN              SERVO2_PIN
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN   9   // Servos pin
+  #define Z_MIN_PROBE_PIN                      9  // Servos pin
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         70
+  #define X_CS_PIN                            70
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         39
+  #define Y_CS_PIN                            39
 #endif
 
-#define Z_STEP_PIN         43
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       58
+#define Z_STEP_PIN                            43
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          58
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         74
+  #define Z_CS_PIN                            74
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        47
+  #define E0_CS_PIN                           47
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        32
+  #define E1_CS_PIN                           32
 #endif
 
-#define E2_STEP_PIN        59
-#define E2_DIR_PIN         57
-#define E2_ENABLE_PIN      40
+#define E2_STEP_PIN                           59
+#define E2_DIR_PIN                            57
+#define E2_ENABLE_PIN                         40
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        42
+  #define E2_CS_PIN                           42
 #endif
 
 //
@@ -121,7 +117,7 @@
 // the jumper next to the limit switch socket when using sensorless homing.
 //
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -129,76 +125,76 @@
    * At the moment, F6 rx pins are not pc interrupt pins
    */
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  -1   // 71
+    #define X_SERIAL_RX_PIN                   -1  // 71
   #endif
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  72
+    #define X_SERIAL_TX_PIN                   72
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  -1   // 73
+    #define Y_SERIAL_RX_PIN                   -1  // 73
   #endif
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  75
+    #define Y_SERIAL_TX_PIN                   75
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  -1   // 78
+    #define Z_SERIAL_RX_PIN                   -1  // 78
   #endif
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  79
+    #define Z_SERIAL_TX_PIN                   79
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN -1   // 76
+    #define E0_SERIAL_RX_PIN                  -1  // 76
   #endif
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 77
+    #define E0_SERIAL_TX_PIN                  77
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1   // 80
+    #define E1_SERIAL_RX_PIN                  -1  // 80
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN 81
+    #define E1_SERIAL_TX_PIN                  81
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1   // 22
+    #define E2_SERIAL_RX_PIN                  -1  // 22
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN 82
+    #define E2_SERIAL_TX_PIN                  82
   #endif
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         12   // Analog Input
-#define TEMP_1_PIN         13   // Analog Input
-#define TEMP_2_PIN         14   // Analog Input
-#define TEMP_BED_PIN       15   // Analog Input
+#define TEMP_0_PIN                            12  // Analog Input
+#define TEMP_1_PIN                            13  // Analog Input
+#define TEMP_2_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          15  // Analog Input
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      9   // Analog Input on X+ endstop
+  #define FILWIDTH_PIN                         9  // Analog Input on X+ endstop
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        5
-#define HEATER_1_PIN        6
-#define HEATER_2_PIN        7
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                           5
+#define HEATER_1_PIN                           6
+#define HEATER_2_PIN                           7
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN            44
-#define FAN1_PIN           45
-#define FAN2_PIN           46
+#define FAN_PIN                               44
+#define FAN1_PIN                              45
+#define FAN2_PIN                              46
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define KILL_PIN           41
+#define SDSS                                  53
+#define LED_PIN                               13
+#define KILL_PIN                              41
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        SERVO1_PIN
+  #define PS_ON_PIN                   SERVO1_PIN
 #endif
 
 /**
@@ -215,69 +211,69 @@
 //
 // LCDs and Controllers
 //
-#define BEEPER_PIN         37
-#define SD_DETECT_PIN      49
+#define BEEPER_PIN                            37
+#define SD_DETECT_PIN                         49
 
 #if ENABLED(FYSETC_MINI_12864)
   //
   // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
   //
-  #define DOGLCD_A0        16
-  #define DOGLCD_CS        17
+  #define DOGLCD_A0                           16
+  #define DOGLCD_CS                           17
 
   #if ENABLED(FYSETC_GENERIC_12864_1_1)
-    #define LCD_BACKLIGHT_PIN 27
+    #define LCD_BACKLIGHT_PIN                 27
   #endif
 
-  #define KILL_PIN         41
-  #define LCD_RESET_PIN    23   // Must be high or open for LCD to operate normally.
+  #define KILL_PIN                            41
+  #define LCD_RESET_PIN                       23  // Must be high or open for LCD to operate normally.
                                 // Seems to work best if left open.
 
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN 25
+      #define RGB_LED_R_PIN                   25
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN 27
+      #define RGB_LED_G_PIN                   27
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN 29
+      #define RGB_LED_B_PIN                   29
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN    25
+    #define NEOPIXEL_PIN                      25
   #endif
 
 #elif HAS_GRAPHICAL_LCD
 
-  #define LCD_PINS_RS      16
-  #define LCD_PINS_ENABLE  17
-  #define LCD_PINS_D4      23
-  #define LCD_PINS_D5      25
-  #define LCD_PINS_D6      27
-  #define LCD_PINS_D7      29
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 
   #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      25
-    #define DOGLCD_A0      27
+    #define DOGLCD_CS                         25
+    #define DOGLCD_A0                         27
   #endif
 
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          31
-  #define BTN_EN2          33
-  #define BTN_ENC          35
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
 #endif
 
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN     3
+  #define RGB_LED_R_PIN                        3
 #endif
 #ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN     4
+  #define RGB_LED_G_PIN                        4
 #endif
 #ifndef RGB_LED_B_PIN
-  #define RGB_LED_B_PIN     9
+  #define RGB_LED_B_PIN                        9
 #endif
 #ifndef RGB_LED_W_PIN
-  #define RGB_LED_W_PIN    -1
+  #define RGB_LED_W_PIN                       -1
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index be5b92d4c17f..f0eb0bf4c643 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -27,24 +27,24 @@
 
 #define BOARD_NAME "FYSETC F6 1.4"
 
-#define Z_MAX_PIN           2
+#define Z_MAX_PIN                              2
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    */
-  #define X_SERIAL_RX_PIN  72
-  #define X_SERIAL_TX_PIN  71
-  #define Y_SERIAL_RX_PIN  73
-  #define Y_SERIAL_TX_PIN  78
-  #define Z_SERIAL_RX_PIN  75
-  #define Z_SERIAL_TX_PIN  79
-  #define E0_SERIAL_RX_PIN 77
-  #define E0_SERIAL_TX_PIN 81
-  #define E1_SERIAL_RX_PIN 76
-  #define E1_SERIAL_TX_PIN 80
-  #define E2_SERIAL_RX_PIN 62
-  #define E2_SERIAL_TX_PIN 82
+  #define X_SERIAL_RX_PIN                     72
+  #define X_SERIAL_TX_PIN                     71
+  #define Y_SERIAL_RX_PIN                     73
+  #define Y_SERIAL_TX_PIN                     78
+  #define Z_SERIAL_RX_PIN                     75
+  #define Z_SERIAL_TX_PIN                     79
+  #define E0_SERIAL_RX_PIN                    77
+  #define E0_SERIAL_TX_PIN                    81
+  #define E1_SERIAL_RX_PIN                    76
+  #define E1_SERIAL_TX_PIN                    80
+  #define E2_SERIAL_RX_PIN                    62
+  #define E2_SERIAL_TX_PIN                    82
 #endif
 
 #include "pins_FYSETC_F6_13.h"
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index f0928b0ed11f..4c5ba7eca198 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -40,8 +40,8 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN  3
-#define Y_STOP_PIN 14
+#define X_STOP_PIN                            3
+#define Y_STOP_PIN                           14
 
 #undef X_MIN_PIN
 #undef X_MAX_PIN
@@ -52,13 +52,13 @@
 // Steppers
 //
 #undef E1_STEP_PIN
-#define E1_STEP_PIN 32
+#define E1_STEP_PIN                          32
 
 //
 // Heaters / Fans
 //
 #undef HEATER_1_PIN
-#define HEATER_1_PIN 11
+#define HEATER_1_PIN                         11
 
 //
 // Misc. Functions
@@ -69,5 +69,5 @@
 
 #if Z_STEP_PIN == 26
   #undef Z_STEP_PIN
-  #define Z_STEP_PIN 32
+  #define Z_STEP_PIN                         32
 #endif
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index 8c426af17c5b..09f35b1fe0f8 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -37,73 +37,73 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN         14
-#define Z_MIN_PIN          68  // Used for bed leveling
-#define Z_MAX_PIN          66
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                            14
+#define Z_MIN_PIN                             68  // Used for bed leveling
+#define Z_MAX_PIN                             66
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       63
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          63
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 
-#define E1_STEP_PIN        32
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           32
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
+#define TEMP_0_PIN                            13
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define FAN_PIN             8
-#define CONTROLLER_FAN_PIN  9
+#define HEATER_0_PIN                          10
+#define FAN_PIN                                8
+#define CONTROLLER_FAN_PIN                     9
 
 //
 // Misc. Functions
 //
-#define SDSS               25
+#define SDSS                                  25
 
-#define FIL_RUNOUT_PIN     69   // PK7
-#define KILL_PIN           20   // PD1
+#define FIL_RUNOUT_PIN                        69  // PK7
+#define KILL_PIN                              20  // PD1
 
 //
 // LCD / Controller
 //
-#define SD_DETECT_PIN      21   // PD0
-#define LCD_SDSS           53
-#define BEEPER_PIN          6
+#define SD_DETECT_PIN                         21  // PD0
+#define LCD_SDSS                              53
+#define BEEPER_PIN                             6
 
-#define DOGLCD_CS          29
-#define DOGLCD_A0          27
+#define DOGLCD_CS                             29
+#define DOGLCD_A0                             27
 
-#define LCD_PINS_RS        27
-#define LCD_PINS_ENABLE    29
-#define LCD_PINS_D4        37
-#define LCD_PINS_D5        35
-#define LCD_PINS_D6        33
-#define LCD_PINS_D7        31
+#define LCD_PINS_RS                           27
+#define LCD_PINS_ENABLE                       29
+#define LCD_PINS_D4                           37
+#define LCD_PINS_D5                           35
+#define LCD_PINS_D6                           33
+#define LCD_PINS_D7                           31
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          17
-  #define BTN_EN2          16
-  #define BTN_ENC          23
+  #define BTN_EN1                             17
+  #define BTN_EN2                             16
+  #define BTN_ENC                             23
 #endif
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index b1564ea2c326..057b51a5845c 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -30,28 +30,28 @@
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.4"
-#define MKS_BASE_VERSION 14
+#define MKS_BASE_VERSION                      14
 
 //
 // Heaters / Fans
 //
-#define FAN_PIN             9   // PH6 ** Pin18 ** PWM9
+#define FAN_PIN                                9  // PH6 ** Pin18 ** PWM9
 
 // Other Mods
-#define CASE_LIGHT_PIN     11   // PB5 ** Pin24 ** PWM11
-#define SERVO3_PIN         12   // PB6 ** Pin25 ** D12
-#define PS_ON_PIN           2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
-#define FILWIDTH_PIN       15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
-#define FIL_RUNOUT_PIN     19   // Z+ // PD2 ** Pin45 ** USART1_RX
+#define CASE_LIGHT_PIN                        11  // PB5 ** Pin24 ** PWM11
+#define SERVO3_PIN                            12  // PB6 ** Pin25 ** D12
+#define PS_ON_PIN                              2  // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
+#define FILWIDTH_PIN                          15  // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
+#define FIL_RUNOUT_PIN                        19  // Z+ // PD2 ** Pin45 ** USART1_RX
 
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN    50
+  #define RGB_LED_R_PIN                       50
 #endif
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_G_PIN    51
+  #define RGB_LED_G_PIN                       51
 #endif
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_B_PIN    52
+  #define RGB_LED_B_PIN                       52
 #endif
 
 #include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
index 985aa056b81a..b769d655d695 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -30,30 +30,30 @@
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.6"
-#define MKS_BASE_VERSION 16
+#define MKS_BASE_VERSION                     16
 
 //
 // Servos
 //
-#define SERVO1_PIN         12   // Digital 12 / Pin 25
+#define SERVO1_PIN                           12   // Digital 12 / Pin 25
 
 //
 // Omitted RAMPS pins
 //
 #ifndef SERVO2_PIN
-  #define SERVO2_PIN       -1
+  #define SERVO2_PIN                         -1
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN       -1
+  #define SERVO3_PIN                         -1
 #endif
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN     -1
+  #define FILWIDTH_PIN                       -1
 #endif
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   -1
+  #define FIL_RUNOUT_PIN                     -1
 #endif
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        -1
+  #define PS_ON_PIN                          -1
 #endif
 
 #include "pins_MKS_BASE_common.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
index 0406da560503..2d0617190657 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
@@ -29,24 +29,24 @@
   #define BOARD_INFO_NAME "MKS BASE"
 #endif
 
-#if MKS_BASE_VERSION == 14 || MKS_BASE_VERSION == 15
+#if MKS_BASE_VERSION >= 14
   //
   // Heaters / Fans
   //
   // Power outputs EFBF or EFBE
-  #define MOSFET_D_PIN      7
+  #define MOSFET_D_PIN                         7
 
   //
   // M3/M4/M5 - Spindle/Laser Control
   //
   #if HAS_CUTTER
-    #define SPINDLE_LASER_PWM_PIN  2   // Hardware PWM
-    #define SPINDLE_LASER_ENA_PIN 15   // Pullup!
-    #define SPINDLE_DIR_PIN       19
+    #define SPINDLE_LASER_PWM_PIN              2  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             15  // Pullup!
+    #define SPINDLE_DIR_PIN                   19
   #endif
 
   #ifndef CASE_LIGHT_PIN
-    #define CASE_LIGHT_PIN  2
+    #define CASE_LIGHT_PIN                     2
   #endif
 
 #endif
@@ -54,22 +54,22 @@
 //
 // Microstepping pins
 //
-#if MKS_BASE_VERSION >= 14      //     |===== 1.4 =====|===== 1.5+ =====|
-  #define X_MS1_PIN         5   // PE3 | Pin  5 | PWM5 |        | D3    | SERVO2_PIN
-  #define X_MS2_PIN         6   // PH3 | Pin 15 | PWM6 | Pin 14 | D6    | SERVO1_PIN
-  #define Y_MS1_PIN        59   // PF5 | Pin 92 | A5   |        |       |
-  #define Y_MS2_PIN        58   // PF4 | Pin 93 | A4   |        |       |
-  #define Z_MS1_PIN        22   // PA0 | Pin 78 | D22  |        |       |
-  #define Z_MS2_PIN        39   // PG2 | Pin 70 | D39  |        |       |
+#if MKS_BASE_VERSION >= 14                        //     |===== 1.4 =====|===== 1.5+ =====|
+  #define X_MS1_PIN                            5  // PE3 | Pin  5 | PWM5 |        | D3    | SERVO2_PIN
+  #define X_MS2_PIN                            6  // PH3 | Pin 15 | PWM6 | Pin 14 | D6    | SERVO1_PIN
+  #define Y_MS1_PIN                           59  // PF5 | Pin 92 | A5   |        |       |
+  #define Y_MS2_PIN                           58  // PF4 | Pin 93 | A4   |        |       |
+  #define Z_MS1_PIN                           22  // PA0 | Pin 78 | D22  |        |       |
+  #define Z_MS2_PIN                           39  // PG2 | Pin 70 | D39  |        |       |
   #if MKS_BASE_VERSION == 14
-    #define E0_MS1_PIN     64   // PK2 | Pin 87 | A10  |        |       |
-    #define E0_MS2_PIN     63   // PK1 | Pin 88 | A9   |        |       |
+    #define E0_MS1_PIN                        64  // PK2 | Pin 87 | A10  |        |       |
+    #define E0_MS2_PIN                        63  // PK1 | Pin 88 | A9   |        |       |
   #else
-    #define E0_MS1_PIN     63   // PK1 |        |      | Pin 86 | A9    |
-    #define E0_MS2_PIN     64   // PK2 |        |      | Pin 87 | A10   |
+    #define E0_MS1_PIN                        63  // PK1 |        |      | Pin 86 | A9    |
+    #define E0_MS2_PIN                        64  // PK2 |        |      | Pin 87 | A10   |
   #endif
-  #define E1_MS1_PIN       57   // PF3 | Pin 94 | A3   | Pin 93 | A3    |
-  #define E1_MS2_PIN        4   // PG5 | Pin  1 | PWM4 |        | D4    | SERVO3_PIN
+  #define E1_MS1_PIN                          57  // PF3 | Pin 94 | A3   | Pin 93 | A3    |
+  #define E1_MS2_PIN                           4  // PG5 | Pin  1 | PWM4 |        | D4    | SERVO3_PIN
 #endif
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 82a21118100a..c4c90ba6fa03 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -40,7 +40,7 @@
 // Heaters / Fans
 //
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN        7
+#define MOSFET_D_PIN                           7
 
 //
 // PSU / SERVO
@@ -48,8 +48,8 @@
 // If PSU_CONTROL is specified, always hijack Servo 3
 //
 #if ENABLED(PSU_CONTROL)
-  #define SERVO3_PIN       -1
-  #define PS_ON_PIN         4
+  #define SERVO3_PIN                          -1
+  #define PS_ON_PIN                            4
 #endif
 
 #include "pins_RAMPS.h"
@@ -104,44 +104,44 @@
   //
 
   // orange/white          SDCD
-  #define SD_DETECT_PIN    49
+  #define SD_DETECT_PIN                       49
 
   // white                 ENCA
-  #define BTN_EN1          35
+  #define BTN_EN1                             35
 
   // green                 ENCB
-  #define BTN_EN2          37
+  #define BTN_EN2                             37
 
   // purple                ENCBTN
-  #define BTN_ENC          31
+  #define BTN_ENC                             31
 
   // brown                 A0
-  #define DOGLCD_A0        27
+  #define DOGLCD_A0                           27
 
   // green/white           LCS
-  #define DOGLCD_CS        29
+  #define DOGLCD_CS                           29
 
                         // 50    gray   MISO
                         // 51    yellow MOSI
                         // 52    orange SCK
 
   // blue                  SDCS
-  //#define SDSS           53
+  //#define SDSS                              53
 
   //
   // VIKI2 4-wire lead
   //
 
   // blue                  BTN
-  #define KILL_PIN         23
+  #define KILL_PIN                            23
 
   // green                 BUZZER
-  #define BEEPER_PIN       25
+  #define BEEPER_PIN                          25
 
   // yellow                RED-LED
-  #define STAT_LED_RED_PIN 16
+  #define STAT_LED_RED_PIN                    16
 
   // white                 BLUE-LED
-  #define STAT_LED_BLUE_PIN 17
+  #define STAT_LED_BLUE_PIN                   17
 
 #endif
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
index d56bbd1e45c1..3236627c3b52 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
@@ -35,7 +35,7 @@
 // Heaters / Fans
 //
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN           7
+#define MOSFET_D_PIN                           7
 
 //
 // CS Pins wired to avoid conflict with the LCD
@@ -43,47 +43,47 @@
 //
 
 #ifndef X_CS_PIN
-  #define X_CS_PIN            63
+  #define X_CS_PIN                            63
 #endif
 
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN            64
+  #define Y_CS_PIN                            64
 #endif
 
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN            65
+  #define Z_CS_PIN                            65
 #endif
 
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN           66
+  #define E0_CS_PIN                           66
 #endif
 
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN           21
+  #define E1_CS_PIN                           21
 #endif
 
 // TMC2130 Diag Pins (currently just for reference)
-#define X_DIAG_PIN             3
-#define Y_DIAG_PIN            14
-#define Z_DIAG_PIN            18
-#define E0_DIAG_PIN            2
-#define E1_DIAG_PIN           15
+#define X_DIAG_PIN                             3
+#define Y_DIAG_PIN                            14
+#define Z_DIAG_PIN                            18
+#define E0_DIAG_PIN                            2
+#define E1_DIAG_PIN                           15
 
 #ifndef SERVO1_PIN
-  #define SERVO1_PIN          12
+  #define SERVO1_PIN                          12
 #endif
 #ifndef SERVO2_PIN
-  #define SERVO2_PIN          39
+  #define SERVO2_PIN                          39
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN          32
+  #define SERVO3_PIN                          32
 #endif
 
 #ifndef E1_SERIAL_TX_PIN
-  #define E1_SERIAL_TX_PIN    20
+  #define E1_SERIAL_TX_PIN                    20
 #endif
 #ifndef E1_SERIAL_RX_PIN
-  #define E1_SERIAL_RX_PIN    21
+  #define E1_SERIAL_RX_PIN                    21
 #endif
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 82c19dd1535f..ffe7f7bb1ec8 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -66,19 +66,19 @@
 //
 #ifndef SERVO0_PIN
   #ifdef IS_RAMPS_13
-    #define SERVO0_PIN      7
+    #define SERVO0_PIN                         7
   #else
-    #define SERVO0_PIN     11
+    #define SERVO0_PIN                        11
   #endif
 #endif
 #ifndef SERVO1_PIN
-  #define SERVO1_PIN        6
+  #define SERVO1_PIN                           6
 #endif
 #ifndef SERVO2_PIN
-  #define SERVO2_PIN        5
+  #define SERVO2_PIN                           5
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN        4
+  #define SERVO3_PIN                           4
 #endif
 
 //
@@ -86,26 +86,26 @@
 //
 #ifndef X_STOP_PIN
   #ifndef X_MIN_PIN
-    #define X_MIN_PIN       3
+    #define X_MIN_PIN                          3
   #endif
   #ifndef X_MAX_PIN
-    #define X_MAX_PIN       2
+    #define X_MAX_PIN                          2
   #endif
 #endif
 #ifndef Y_STOP_PIN
   #ifndef Y_MIN_PIN
-    #define Y_MIN_PIN      14
+    #define Y_MIN_PIN                         14
   #endif
   #ifndef Y_MAX_PIN
-    #define Y_MAX_PIN      15
+    #define Y_MAX_PIN                         15
   #endif
 #endif
 #ifndef Z_STOP_PIN
   #ifndef Z_MIN_PIN
-    #define Z_MIN_PIN      18
+    #define Z_MIN_PIN                         18
   #endif
   #ifndef Z_MAX_PIN
-    #define Z_MAX_PIN      19
+    #define Z_MAX_PIN                         19
   #endif
 #endif
 
@@ -113,65 +113,67 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#ifndef Z_STEP_PIN
+  #define Z_STEP_PIN                          46
+#endif
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
 //
 // Temperature Sensors
 //
 #ifndef TEMP_0_PIN
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
 #ifndef TEMP_1_PIN
-  #define TEMP_1_PIN       15   // Analog Input
+  #define TEMP_1_PIN                          15  // Analog Input
 #endif
 #ifndef TEMP_BED_PIN
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
+//
 // SPI for Max6675 or Max31855 Thermocouple
-#if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
-#else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+//
+#ifndef MAX6675_SS_PIN
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -195,74 +197,74 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                        -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN      8
+  #define RAMPS_D8_PIN                         8
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN      9
+  #define RAMPS_D9_PIN                         9
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    10
-#endif
-
-#define HEATER_0_PIN       RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN1_PIN         RAMPS_D8_PIN
-#elif DISABLED(IS_RAMPS_SF)                    // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
+  #define RAMPS_D10_PIN                       10
+#endif
+
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN       MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN   MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF)          // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D9_PIN
   #elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF)         // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        RAMPS_D8_PIN
-  #elif ENABLED(IS_RAMPS_EEB)                  // Hotend, Hotend, Bed
-    #define FAN_PIN         4                  // IO pin. Buffer needed
-  #else                                        // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D8_PIN
+  #elif ENABLED(IS_RAMPS_EEB)                     // Hotend, Hotend, Bed
+    #define FAN_PIN                            4  // IO pin. Buffer needed
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+    #define FAN_PIN                 RAMPS_D9_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // RAMPS 1.4 DIO 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #elif HAS_FREE_AUX2_PINS
-    #define CASE_LIGHT_PIN 44   // Hardware PWM
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -270,14 +272,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !NUM_SERVOS                         // Use servo connector if possible
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
+  #if !NUM_SERVOS                                 // Use servo connector if possible
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #else
     #error "No auto-assignable Spindle/Laser pins available."
   #endif
@@ -288,28 +290,28 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    66
+    #define TMC_SW_MOSI                       66
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     64
+    #define TMC_SW_SCK                        64
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
    * Hardware serial communication ports.
    * If undefined software serial is used according to the pins below
    */
-  //#define X_HARDWARE_SERIAL  Serial1
+  //#define X_HARDWARE_SERIAL Serial1
   //#define X2_HARDWARE_SERIAL Serial1
-  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y_HARDWARE_SERIAL Serial1
   //#define Y2_HARDWARE_SERIAL Serial1
-  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z_HARDWARE_SERIAL Serial1
   //#define Z2_HARDWARE_SERIAL Serial1
   //#define E0_HARDWARE_SERIAL Serial1
   //#define E1_HARDWARE_SERIAL Serial1
@@ -322,91 +324,91 @@
   //
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  40
+    #define X_SERIAL_TX_PIN                   40
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  63
+    #define X_SERIAL_RX_PIN                   63
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  59
+    #define Y_SERIAL_TX_PIN                   59
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  64
+    #define Y_SERIAL_RX_PIN                   64
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  42
+    #define Z_SERIAL_TX_PIN                   42
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  65
+    #define Z_SERIAL_RX_PIN                   65
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN -1
+    #define Z2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN -1
+    #define Z2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 44
+    #define E0_SERIAL_TX_PIN                  44
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 66
+    #define E0_SERIAL_RX_PIN                  66
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
@@ -414,13 +416,13 @@
 // Průša i3 MK2 Multiplexer Support
 //
 #ifndef E_MUX0_PIN
-  #define E_MUX0_PIN 40   // Z_CS_PIN
+  #define E_MUX0_PIN                          40  // Z_CS_PIN
 #endif
 #ifndef E_MUX1_PIN
-  #define E_MUX1_PIN 42   // E0_CS_PIN
+  #define E_MUX1_PIN                          42  // E0_CS_PIN
 #endif
 #ifndef E_MUX2_PIN
-  #define E_MUX2_PIN 44   // E1_CS_PIN
+  #define E_MUX2_PIN                          44  // E1_CS_PIN
 #endif
 
 //////////////////////////
@@ -434,62 +436,62 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 
-    #define LCD_PINS_RS         40
-    #define LCD_PINS_ENABLE     42
-    #define LCD_PINS_D4         65
-    #define LCD_PINS_D5         66
-    #define LCD_PINS_D6         44
-    #define LCD_PINS_D7         64
+    #define LCD_PINS_RS                       40
+    #define LCD_PINS_ENABLE                   42
+    #define LCD_PINS_D4                       65
+    #define LCD_PINS_D5                       66
+    #define LCD_PINS_D6                       44
+    #define LCD_PINS_D7                       64
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS       27
-      #define LCD_PINS_ENABLE   29
-      #define LCD_PINS_D4       25
+      #define LCD_PINS_RS                     27
+      #define LCD_PINS_ENABLE                 29
+      #define LCD_PINS_D4                     25
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      37
+        #define BEEPER_PIN                    37
       #endif
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define LCD_PINS_RS       64
-      #define LCD_PINS_ENABLE   44
-      #define LCD_PINS_D4       63
-      #define LCD_PINS_D5       40
-      #define LCD_PINS_D6       42
-      #define LCD_PINS_D7       65
+      #define LCD_PINS_RS                     64
+      #define LCD_PINS_ENABLE                 44
+      #define LCD_PINS_D4                     63
+      #define LCD_PINS_D5                     40
+      #define LCD_PINS_D6                     42
+      #define LCD_PINS_D7                     65
 
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC     25   // Set as output on init
-        #define LCD_PINS_RS     27   // Pull low for 1s to init
+        #define LCD_PINS_DC                   25  // Set as output on init
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
         // DOGM SPI LCD Support
-        #define DOGLCD_CS       16
-        #define DOGLCD_MOSI     17
-        #define DOGLCD_SCK      23
-        #define DOGLCD_A0       LCD_PINS_DC
+        #define DOGLCD_CS                     16
+        #define DOGLCD_MOSI                   17
+        #define DOGLCD_SCK                    23
+        #define DOGLCD_A0            LCD_PINS_DC
       #else
-        #define LCD_PINS_RS     16
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4     23
-        #define LCD_PINS_D5     25
-        #define LCD_PINS_D6     27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7       29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -497,10 +499,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -512,99 +514,99 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1         17
-        #define BTN_EN2         23
+        #define BTN_EN1                       17
+        #define BTN_EN2                       23
       #else
-        #define BTN_EN1         31
-        #define BTN_EN2         33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC           35
+      #define BTN_ENC                         35
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN   49
+        #define SD_DETECT_PIN                 49
       #endif
       #ifndef KILL_PIN
-        #define KILL_PIN        41
+        #define KILL_PIN                      41
       #endif
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1                         64
+      #define BTN_EN2                         59
+      #define BTN_ENC                         63
+      #define SD_DETECT_PIN                   42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          SDSS
-      #define KILL_PIN          41
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
+      #define LCD_SDSS                      SDSS
+      #define KILL_PIN                        41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           40   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2           42
-      #define BTN_ENC           -1
+      #define BTN_EN1                         40  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                         42
+      #define BTN_ENC                         -1
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS         45
-      #define DOGLCD_A0         44
+      #define DOGLCD_CS                       45
+      #define DOGLCD_A0                       44
       #define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN        33
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define BEEPER_PIN                      33
+      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_BLUE_PIN               35
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1                         22
+      #define BTN_EN2                          7
+      #define BTN_ENC                         39
 
-      #define SD_DETECT_PIN     -1   // Pin 49 for display SD interface, 72 for easy adapter board
-      #define KILL_PIN          31
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
+      #define KILL_PIN                        31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
+      #define DOGLCD_CS                       29
+      #define DOGLCD_A0                       27
 
-      #define BEEPER_PIN        23
-      #define LCD_BACKLIGHT_PIN 33
+      #define BEEPER_PIN                      23
+      #define LCD_BACKLIGHT_PIN               33
 
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
+      #define BTN_EN1                         35
+      #define BTN_EN2                         37
+      #define BTN_ENC                         31
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 
-      #define BEEPER_PIN        37
-      #define BTN_ENC           35
-      #define SD_DETECT_PIN     49
+      #define BEEPER_PIN                      37
+      #define BTN_ENC                         35
+      #define SD_DETECT_PIN                   49
 
       #ifndef KILL_PIN
-        #define KILL_PIN        41
+        #define KILL_PIN                      41
       #endif
 
-      #if ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
+      #if ENABLED(MKS_MINI_12864)                 // Added in Marlin 1.1.6
 
-        #define DOGLCD_A0       27
-        #define DOGLCD_CS       25
+        #define DOGLCD_A0                     27
+        #define DOGLCD_CS                     25
 
         // GLCD features
         // Uncomment screen orientation
@@ -613,50 +615,50 @@
         //#define LCD_SCREEN_ROT_270
 
         // not connected to a pin
-        #define LCD_BACKLIGHT_PIN -1  // 65 (MKS mini12864 can't adjust backlight by software!)
+        #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
 
-        #define BTN_EN1         31
-        #define BTN_EN2         33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
 
       #elif ENABLED(FYSETC_MINI_12864)
 
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
 
-        #define DOGLCD_A0       16
-        #define DOGLCD_CS       17
+        #define DOGLCD_A0                     16
+        #define DOGLCD_CS                     17
 
-        #define BTN_EN1         33
-        #define BTN_EN2         31
+        #define BTN_EN1                       33
+        #define BTN_EN2                       31
 
-        //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+        //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-        #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN                 23  // Must be high or open for LCD to operate normally.
 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
           #ifndef RGB_LED_R_PIN
-            #define RGB_LED_R_PIN 25
+            #define RGB_LED_R_PIN             25
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN 27
+            #define RGB_LED_G_PIN             27
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN 29
+            #define RGB_LED_B_PIN             29
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN    25
+          #define NEOPIXEL_PIN                25
         #endif
 
-    #endif
+      #endif
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN                      42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
+      #define DOGLCD_A0                       44
+      #define DOGLCD_CS                       66
 
       // GLCD features
       // Uncomment screen orientation
@@ -664,16 +666,16 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1                         40
+      #define BTN_EN2                         63
+      #define BTN_ENC                         59
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define ADC_KEYPAD_PIN    12
+      #define ADC_KEYPAD_PIN                  12
 
     #elif ENABLED(AZSMZ_12864)
 
@@ -682,32 +684,40 @@
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
-      #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-      #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+      #if ENABLED(PANEL_ONE)
+        #define BTN_EN1                       59  // AUX2 PIN 3
+        #define BTN_EN2                       63  // AUX2 PIN 4
+        #define BTN_ENC                       49  // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1                       37
+        #define BTN_EN2                       35
+        #define BTN_ENC                       31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN                 49
+        #define KILL_PIN                      41
       #endif
 
     #endif
   #endif // NEWPANEL
 
 #endif // HAS_SPI_LCD
+
+#if ENABLED(REPRAPWORLD_KEYPAD)
+  #define SHIFT_OUT                           40
+  #define SHIFT_CLK                           44
+  #define SHIFT_LD                            42
+  #ifndef BTN_EN1
+    #define BTN_EN1                           64
+  #endif
+  #ifndef BTN_EN2
+    #define BTN_EN2                           59
+  #endif
+  #ifndef BTN_ENC
+    #define BTN_ENC                           63
+  #endif
+#endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index ea2ace7e86fd..f6847feb4bf5 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -32,31 +32,31 @@
 //
 
 // Power outputs EFBF or EFBE
-#define MOSFET_D_PIN 7
+#define MOSFET_D_PIN                           7
 
-#define FIL_RUNOUT_PIN 2
+#define FIL_RUNOUT_PIN                         2
 #if NUM_RUNOUT_SENSORS > 1
-  #define FIL_RUNOUT2_PIN  15 // Creality CR-X can use dual runout sensors
+  #define FIL_RUNOUT2_PIN                     15  // Creality CR-X can use dual runout sensors
 #endif
 
-#define SD_DETECT_PIN      49  // Always define onboard SD detect
+#define SD_DETECT_PIN                         49  // Always define onboard SD detect
 
-#define PS_ON_PIN          40 // Used by CR2020 Industrial series
+#define PS_ON_PIN                             40  // Used by CR2020 Industrial series
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN)
-  #define CASE_LIGHT_PIN   65
+  #define CASE_LIGHT_PIN                      65
 #endif
 
 #include "pins_RAMPS.h"
 
 #ifndef BEEPER_PIN
-  #define BEEPER_PIN       37  // Always define beeper pin so Play Tone works with ExtUI
+  #define BEEPER_PIN                          37  // Always define beeper pin so Play Tone works with ExtUI
 #endif
 
-#define EXP1_PIN           65   // A11 - Used by CR2020 Industrial series for case
-#define EXP2_PIN           66   // A12
-#define EXP3_PIN           11   // SERVO0_PIN
-#define EXP4_PIN           12   // PS_ON_PIN
+#define EXP1_PIN                              65  // A11 - Used by CR2020 Industrial series for case
+#define EXP2_PIN                              66  // A12
+#define EXP3_PIN                              11  // SERVO0_PIN
+#define EXP4_PIN                              12  // PS_ON_PIN
 
-#define SUICIDE_PIN        12 // Used by CR2020 Industrial series
-#define SUICIDE_PIN_INVERTING true // Used by CR2020 Industrial series
+#define SUICIDE_PIN                           12  // Used by CR2020 Industrial series
+#define SUICIDE_PIN_INVERTING true                // Used by CR2020 Industrial series
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
index 39aecb0bc77a..b0ba7822ef62 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
@@ -27,12 +27,12 @@
 
 #define BOARD_INFO_NAME "Dagoma3D F5 RAMPS"
 
-#define X_STOP_PIN          2
-#define Y_STOP_PIN          3
-#define Z_STOP_PIN         15
-#define FIL_RUNOUT_PIN     39
+#define X_STOP_PIN                            2
+#define Y_STOP_PIN                            3
+#define Z_STOP_PIN                           15
+#define FIL_RUNOUT_PIN                       39
 
-#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                  7
 
 //
 // Import RAMPS 1.4 pins
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
index aa45370e6a07..0323366944d4 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
@@ -37,80 +37,80 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          16
-#define Y_MAX_PIN          17
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             16
+#define Y_MAX_PIN                             17
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          28
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         38
-#define Y_DIR_PIN          40
-#define Y_ENABLE_PIN       36
+#define Y_STEP_PIN                            38
+#define Y_DIR_PIN                             40
+#define Y_ENABLE_PIN                          36
 
-#define Z_STEP_PIN         44
-#define Z_DIR_PIN          46
-#define Z_ENABLE_PIN       42
+#define Z_STEP_PIN                            44
+#define Z_DIR_PIN                             46
+#define Z_ENABLE_PIN                          42
 
-#define E0_STEP_PIN        32
-#define E0_DIR_PIN         34
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           32
+#define E0_DIR_PIN                            34
+#define E0_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             2  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
 // Heaters / Fans
 //
 #if ENABLED(RAMPS_V_1_0)
-  #define HEATER_0_PIN     12
-  #define HEATER_BED_PIN   -1
+  #define HEATER_0_PIN                        12
+  #define HEATER_BED_PIN                      -1
   #ifndef FAN_PIN
-    #define FAN_PIN        11
+    #define FAN_PIN                           11
   #endif
-#else // RAMPS_V_1_1 or RAMPS_V_1_2
-  #define HEATER_0_PIN     10
-  #define HEATER_BED_PIN    8
+#else                                             // RAMPS_V_1_1 or RAMPS_V_1_2
+  #define HEATER_0_PIN                        10
+  #define HEATER_BED_PIN                       8
   #ifndef FAN_PIN
-    #define FAN_PIN         9
+    #define FAN_PIN                            9
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define SDPOWER_PIN        48
-#define SDSS               53
-#define LED_PIN            13
-#define CASE_LIGHT_PIN     45   // Hardware PWM
+#define SDPOWER_PIN                           48
+#define SDSS                                  53
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                        45  // Hardware PWM
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    41   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
-#define SPINDLE_DIR_PIN          43
+#define SPINDLE_LASER_ENA_PIN                 41  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 45  // Hardware PWM
+#define SPINDLE_DIR_PIN                       43
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index 24aa7b9c9032..f93b6dcc86fe 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -44,8 +44,8 @@
 
 #define BOARD_INFO_NAME "RAMPS 1.4 Plus"
 
-#define RAMPS_D8_PIN  10
-#define RAMPS_D10_PIN  8
+#define RAMPS_D8_PIN                          10
+#define RAMPS_D10_PIN                          8
 
 #include "pins_RAMPS.h"
 
@@ -60,13 +60,13 @@
 #undef E1_DIR_PIN
 #undef E1_ENABLE_PIN
 
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         34
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            34
+#define E0_ENABLE_PIN                         30
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         28
-#define E1_ENABLE_PIN      24
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            28
+#define E1_ENABLE_PIN                         24
 
 #undef X_CS_PIN
 #undef Y_CS_PIN
@@ -77,10 +77,10 @@
 #if ENABLED(ULTRA_LCD, REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
   #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
     #undef LCD_PINS_RS
-    #define LCD_PINS_RS     42   // 3DYMY boards pin 16 -> 42
+    #define LCD_PINS_RS                       42  // 3DYMY boards pin 16 -> 42
     #undef LCD_PINS_ENABLE
-    #define LCD_PINS_ENABLE 44   // 3DYMY boards pin 17 -> 44
+    #define LCD_PINS_ENABLE                   44  // 3DYMY boards pin 17 -> 44
   #endif
   #undef LCD_PINS_D7
-  #define LCD_PINS_D7       53   // 3DYMY boards pin 29 -> 53
+  #define LCD_PINS_D7                         53  // 3DYMY boards pin 29 -> 53
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index da6b6e4187fb..8e8428175484 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -33,15 +33,15 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19    // Z-MAX pin J14 End Stops
+  #define Z_MIN_PROBE_PIN                     19  // Z-MAX pin J14 End Stops
 #endif
 
 //
 // MOSFET changes
 //
-#define RAMPS_D9_PIN        8   // FAN (by default)
-#define RAMPS_D10_PIN       9   // EXTRUDER 1
-#define MOSFET_D_PIN       12   // EXTRUDER 2 or FAN
+#define RAMPS_D9_PIN                           8  // FAN (by default)
+#define RAMPS_D10_PIN                          9  // EXTRUDER 1
+#define MOSFET_D_PIN                          12  // EXTRUDER 2 or FAN
 
 #include "pins_RAMPS.h"
 
@@ -52,18 +52,18 @@
 #undef E0_STEP_PIN
 #undef E0_DIR_PIN
 #undef E0_ENABLE_PIN
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         34
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            34
+#define E0_ENABLE_PIN                         30
 
 #undef E1_STEP_PIN
 #undef E1_DIR_PIN
 #undef E1_ENABLE_PIN
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         28
-#define E1_ENABLE_PIN      24
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            28
+#define E1_ENABLE_PIN                         24
 
-#define STEPPER_RESET_PIN  41   // Stepper drivers have a reset on RigidBot
+#define STEPPER_RESET_PIN                     41  // Stepper drivers have a reset on RigidBot
 
 //
 // Temperature Sensors
@@ -71,33 +71,33 @@
 #undef TEMP_0_PIN
 #undef TEMP_1_PIN
 #undef TEMP_BED_PIN
-#define TEMP_0_PIN         14   // Analog Input
-#define TEMP_1_PIN         13   // Analog Input
-#define TEMP_BED_PIN       15   // Analog Input
+#define TEMP_0_PIN                            14  // Analog Input
+#define TEMP_1_PIN                            13  // Analog Input
+#define TEMP_BED_PIN                          15  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53   // Don't use pin 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS_PIN                      53  // Don't use pin 53 if there is even the remote possibility of using Display/SD card
 #else
-  #define MAX6675_SS_PIN   49   // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS_PIN                      49  // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
 #endif
 
 //
 // Heaters / Fans
 //
 #undef HEATER_BED_PIN
-#define HEATER_BED_PIN     10
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           8   // Same as RAMPS_13_EEF
+  #define FAN_PIN                              8  // Same as RAMPS_13_EEF
 #endif
 
 //
 // Misc. Functions
 //
 #undef PS_ON_PIN
-#define PS_ON_PIN          -1
+#define PS_ON_PIN                             -1
 
 //
 // LCD / Controller
@@ -106,33 +106,33 @@
 #if ENABLED(RIGIDBOT_PANEL)
 
   #undef BEEPER_PIN
-  #define BEEPER_PIN -1
+  #define BEEPER_PIN                          -1
 
   // Direction buttons
-  #define BTN_UP           37
-  #define BTN_DWN          35
-  #define BTN_LFT          33
-  #define BTN_RT           32
+  #define BTN_UP                              37
+  #define BTN_DWN                             35
+  #define BTN_LFT                             33
+  #define BTN_RT                              32
 
   // 'R' button
   #undef BTN_ENC
-  #define BTN_ENC 31
+  #define BTN_ENC                             31
 
   // Disable encoder
   #undef BTN_EN1
-  #define BTN_EN1 -1
+  #define BTN_EN1                             -1
   #undef BTN_EN2
-  #define BTN_EN2 -1
+  #define BTN_EN2                             -1
 
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN 22
+  #define SD_DETECT_PIN                       22
 
 #elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN 22
+  #define SD_DETECT_PIN                       22
 
   #undef KILL_PIN
-  #define KILL_PIN 32
+  #define KILL_PIN                            32
 
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
index eb46ec9eaafc..d56ab1bb7f27 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
@@ -40,12 +40,12 @@
 #define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
 
 #define DAC_STEPPER_SENSE    0.05   // sense resistors on rigidboard stepper chips are .05 value
-#define DAC_STEPPER_ADDRESS  0
-#define DAC_STEPPER_MAX   4096   // was 5000 but max allowable value is actually 4096
-#define DAC_STEPPER_VREF     1   // internal Vref, gain 2x = 4.096V
-#define DAC_STEPPER_GAIN     1   // value of 1 here sets gain of 2
-#define DAC_DISABLE_PIN     42   // set low to enable DAC
-#define DAC_OR_ADDRESS    0x01
+#define DAC_STEPPER_ADDRESS                   0
+#define DAC_STEPPER_MAX                     4096  // was 5000 but max allowable value is actually 4096
+#define DAC_STEPPER_VREF                      1   // internal Vref, gain 2x = 4.096V
+#define DAC_STEPPER_GAIN                      1   // value of 1 here sets gain of 2
+#define DAC_DISABLE_PIN                      42   // set low to enable DAC
+#define DAC_OR_ADDRESS 0x01
 
 #ifndef DAC_MOTOR_CURRENT_DEFAULT
   #define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
diff --git a/Marlin/src/pins/ramps/pins_RL200.h b/Marlin/src/pins/ramps/pins_RL200.h
index 570a9c26f94b..7b0303476b08 100644
--- a/Marlin/src/pins/ramps/pins_RL200.h
+++ b/Marlin/src/pins/ramps/pins_RL200.h
@@ -37,16 +37,16 @@
   #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
 #endif
 
-#define E0_STEP_PIN        26   // (RUMBA E1 pins)
-#define E0_DIR_PIN         25
-#define E0_ENABLE_PIN      27
+#define E0_STEP_PIN                          26   // (RUMBA E1 pins)
+#define E0_DIR_PIN                           25
+#define E0_ENABLE_PIN                        27
 
-#define E1_STEP_PIN        29   // (RUMBA E2 pins)
-#define E1_DIR_PIN         28
-#define E1_ENABLE_PIN      39
+#define E1_STEP_PIN                          29   // (RUMBA E2 pins)
+#define E1_DIR_PIN                           28
+#define E1_ENABLE_PIN                        39
 
-#define Z2_STEP_PIN        23   // (RUMBA E0 pins)
-#define Z2_DIR_PIN         22
-#define Z2_ENABLE_PIN      24
+#define Z2_STEP_PIN                          23   // (RUMBA E0 pins)
+#define Z2_DIR_PIN                           22
+#define Z2_ENABLE_PIN                        24
 
 #include "pins_RUMBA.h"
diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index e613b9cb6c03..4bf10d73994e 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -41,56 +41,56 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
+#define SERVO0_PIN                             5
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37
-#define X_MAX_PIN          36
-#define Y_MIN_PIN          35
-#define Y_MAX_PIN          34
-#define Z_MIN_PIN          33
-#define Z_MAX_PIN          32
+#define X_MIN_PIN                             37
+#define X_MAX_PIN                             36
+#define Y_MIN_PIN                             35
+#define Y_MAX_PIN                             34
+#define Z_MIN_PIN                             33
+#define Z_MAX_PIN                             32
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         17
-#define X_DIR_PIN          16
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            17
+#define X_DIR_PIN                             16
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         54
-#define Y_DIR_PIN          47
-#define Y_ENABLE_PIN       55
+#define Y_STEP_PIN                            54
+#define Y_DIR_PIN                             47
+#define Y_ENABLE_PIN                          55
 
-#define Z_STEP_PIN         57
-#define Z_DIR_PIN          56
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            57
+#define Z_DIR_PIN                             56
+#define Z_ENABLE_PIN                          62
 
 #ifndef E0_STEP_PIN
-  #define E0_STEP_PIN      23
-  #define E0_DIR_PIN       22
-  #define E0_ENABLE_PIN    24
+  #define E0_STEP_PIN                         23
+  #define E0_DIR_PIN                          22
+  #define E0_ENABLE_PIN                       24
 #endif
 
 #ifndef E1_STEP_PIN
-  #define E1_STEP_PIN      26
-  #define E1_DIR_PIN       25
-  #define E1_ENABLE_PIN    27
+  #define E1_STEP_PIN                         26
+  #define E1_DIR_PIN                          25
+  #define E1_ENABLE_PIN                       27
 #endif
 
 #if E1_STEP_PIN != 29
-  #define E2_STEP_PIN      29
-  #define E2_DIR_PIN       28
-  #define E2_ENABLE_PIN    39
+  #define E2_STEP_PIN                         29
+  #define E2_DIR_PIN                          28
+  #define E2_ENABLE_PIN                       39
 #endif
 
 //
@@ -98,134 +98,134 @@
 //
 #ifndef TEMP_0_PIN
   #if TEMP_SENSOR_0 == -1
-    #define TEMP_0_PIN      6   // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
+    #define TEMP_0_PIN                         6  // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
   #else
-    #define TEMP_0_PIN     15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
+    #define TEMP_0_PIN                        15  // Analog Input (default connector for thermistor *T0* on rumba board is used)
   #endif
 #endif
 
 #ifndef TEMP_1_PIN
   #if TEMP_SENSOR_1 == -1
-    #define TEMP_1_PIN      5   // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
+    #define TEMP_1_PIN                         5  // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
   #else
-    #define TEMP_1_PIN     14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
+    #define TEMP_1_PIN                        14  // Analog Input (default connector for thermistor *T1* on rumba board is used)
   #endif
 #endif
 
 #if TEMP_SENSOR_2 == -1
-  #define TEMP_2_PIN        7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
+  #define TEMP_2_PIN                           7  // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
 #else
-  #define TEMP_2_PIN       13   // Analog Input (default connector for thermistor *T2* on rumba board is used)
+  #define TEMP_2_PIN                          13  // Analog Input (default connector for thermistor *T2* on rumba board is used)
 #endif
 
 // Optional for extruder 4 or chamber:
-//#define TEMP_X_PIN         12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
+//#define TEMP_X_PIN                          12  // Analog Input (default connector for thermistor *T3* on rumba board is used)
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
+  //#define TEMP_CHAMBER_PIN                  12  // Analog Input (default connector for thermistor *T3* on rumba board is used)
 #endif
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
+  #define TEMP_BED_PIN                         7  // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
 #else
-  #define TEMP_BED_PIN     11   // Analog Input (default connector for thermistor *THB* on rumba board is used)
+  #define TEMP_BED_PIN                        11  // Analog Input (default connector for thermistor *THB* on rumba board is used)
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_2_PIN        6
-#define HEATER_3_PIN        8
-#define HEATER_BED_PIN      9
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_2_PIN                           6
+#define HEATER_3_PIN                           8
+#define HEATER_BED_PIN                         9
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 #ifndef FAN1_PIN
-  #define FAN1_PIN          8
+  #define FAN1_PIN                             8
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13
-#define PS_ON_PIN          45
-#define KILL_PIN           46
-#define CASE_LIGHT_PIN     45
+#define LED_PIN                               13
+#define PS_ON_PIN                             45
+#define KILL_PIN                              46
+#define CASE_LIGHT_PIN                        45
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #ifndef SPINDLE_LASER_PWM_PIN
-  #define SPINDLE_LASER_PWM_PIN 4   // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
+  #define SPINDLE_LASER_PWM_PIN                4  // Hardware PWM. Pin 4 interrupts OC0* and OC1* always in use?
 #endif
 #ifndef SPINDLE_LASER_ENA_PIN
-  #define SPINDLE_LASER_ENA_PIN 14   // Pullup!
+  #define SPINDLE_LASER_ENA_PIN               14  // Pullup!
 #endif
 #ifndef SPINDLE_DIR_PIN
-  #define SPINDLE_DIR_PIN  15
+  #define SPINDLE_DIR_PIN                     15
 #endif
 
 //
 // LCD / Controller
 //
 #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-  #define LCD_PINS_DC      38   // Set as output on init
-  #define LCD_PINS_RS      41   // Pull low for 1s to init
+  #define LCD_PINS_DC                         38  // Set as output on init
+  #define LCD_PINS_RS                         41  // Pull low for 1s to init
   // DOGM SPI LCD Support
-  #define DOGLCD_CS        19
-  #define DOGLCD_MOSI      42
-  #define DOGLCD_SCK       18
-  #define DOGLCD_A0        LCD_PINS_DC
+  #define DOGLCD_CS                           19
+  #define DOGLCD_MOSI                         42
+  #define DOGLCD_SCK                          18
+  #define DOGLCD_A0                  LCD_PINS_DC
 #elif ENABLED(FYSETC_MINI_12864)
-  #define DOGLCD_CS        42
-  #define DOGLCD_A0        19
-  #define DOGLCD_MOSI      51
-  #define DOGLCD_SCK       52
+  #define DOGLCD_CS                           42
+  #define DOGLCD_A0                           19
+  #define DOGLCD_MOSI                         51
+  #define DOGLCD_SCK                          52
 
-  //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                              //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+  //#define FORCE_SOFT_SPI                        // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-  #define LCD_RESET_PIN  18   // Must be high or open for LCD to operate normally.
+  #define LCD_RESET_PIN                       18  // Must be high or open for LCD to operate normally.
 
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN 41
+      #define RGB_LED_R_PIN                   41
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN 38
+      #define RGB_LED_G_PIN                   38
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN 40
+      #define RGB_LED_B_PIN                   40
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN   25
+    #define NEOPIXEL_PIN                      25
   #endif
 
 #else
-  #define LCD_PINS_RS      19
-  #define LCD_PINS_ENABLE  42
-  #define LCD_PINS_D4      18
-  #define LCD_PINS_D5      38
-  #define LCD_PINS_D6      41
+  #define LCD_PINS_RS                         19
+  #define LCD_PINS_ENABLE                     42
+  #define LCD_PINS_D4                         18
+  #define LCD_PINS_D5                         38
+  #define LCD_PINS_D6                         41
 #endif
 
-#define LCD_PINS_D7        40
+#define LCD_PINS_D7                           40
 
 //
 // Beeper, SD Card, Encoder
 //
-#define BEEPER_PIN         44
+#define BEEPER_PIN                            44
 
 #if ENABLED(SDSUPPORT)
-  #define SDSS             53
-  #define SD_DETECT_PIN    49
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       49
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          11
-  #define BTN_EN2          12
-  #define BTN_ENC          43
+  #define BTN_EN1                             11
+  #define BTN_EN2                             12
+  #define BTN_ENC                             43
 #endif
diff --git a/Marlin/src/pins/ramps/pins_TANGO.h b/Marlin/src/pins/ramps/pins_TANGO.h
index d3b7413fa282..221b30b0cb8f 100644
--- a/Marlin/src/pins/ramps/pins_TANGO.h
+++ b/Marlin/src/pins/ramps/pins_TANGO.h
@@ -27,24 +27,24 @@
 
 #define BOARD_INFO_NAME "Tango"
 
-#define FAN_PIN             8
-#define FAN1_PIN           -1
+#define FAN_PIN                               8
+#define FAN1_PIN                             -1
 
-#define ORIG_E0_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                  7
 
 #ifndef TEMP_0_PIN
   #if TEMP_SENSOR_0 == -1
-    #define TEMP_0_PIN     10   // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
+    #define TEMP_0_PIN                       10   // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
   #else
-    #define TEMP_0_PIN     15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
+    #define TEMP_0_PIN                       15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
   #endif
 #endif
 
 #ifndef TEMP_1_PIN
   #if TEMP_SENSOR_1 == -1
-    #define TEMP_1_PIN      9   // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
+    #define TEMP_1_PIN                        9   // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
   #else
-    #define TEMP_1_PIN     14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
+    #define TEMP_1_PIN                       14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 1c5ea39279d5..f32f006e9268 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -31,10 +31,10 @@
 // Servos
 //
 #if MB(TRIGORILLA_14_11)
-  #define SERVO0_PIN        5
-  #define SERVO1_PIN        4
-  #define SERVO2_PIN       11
-  #define SERVO3_PIN        6
+  #define SERVO0_PIN                           5
+  #define SERVO1_PIN                           4
+  #define SERVO2_PIN                          11
+  #define SERVO3_PIN                           6
 #endif
 
 //
@@ -42,48 +42,48 @@
 //
 //#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
 #if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
-  #define X_MAX_PIN        43
-  #define Y_MIN_PIN        19
+  #define X_MAX_PIN                           43
+  #define Y_MIN_PIN                           19
 #endif
 
 // Labeled pins
-#define TRIGORILLA_HEATER_BED_PIN  8
-#define TRIGORILLA_HEATER_0_PIN   10
-#define TRIGORILLA_HEATER_1_PIN   45   // Anycubic Kossel: Unused
+#define TG_HEATER_BED_PIN                      8
+#define TG_HEATER_0_PIN                       10
+#define TG_HEATER_1_PIN                       45  // Anycubic Kossel: Unused
 
-#define TRIGORILLA_FAN0_PIN        9   // Anycubic Kossel: Usually the part cooling fan
-#define TRIGORILLA_FAN1_PIN        7   // Anycubic Kossel: Unused
-#define TRIGORILLA_FAN2_PIN       44   // Anycubic Kossel: Hotend fan
+#define TG_FAN0_PIN                            9  // Anycubic Kossel: Usually the part cooling fan
+#define TG_FAN1_PIN                            7  // Anycubic Kossel: Unused
+#define TG_FAN2_PIN                           44  // Anycubic Kossel: Hotend fan
 
 // Remap MOSFET pins to common usages:
 
-#define RAMPS_D10_PIN    TRIGORILLA_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
+#define RAMPS_D10_PIN            TG_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
 
-#if HOTENDS > 1   // EEF and EEB
-  #define RAMPS_D9_PIN   TRIGORILLA_HEATER_1_PIN
+#if HOTENDS > 1                                   // EEF and EEB
+  #define RAMPS_D9_PIN           TG_HEATER_1_PIN
   #if !TEMP_SENSOR_BED
     // EEF
-    #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN
+    #define RAMPS_D8_PIN             TG_FAN0_PIN
   #else
     // EEB
-    #define RAMPS_D8_PIN TRIGORILLA_HEATER_BED_PIN
-    #define FAN_PIN      TRIGORILLA_FAN0_PIN    // Override pin 4 in pins_RAMPS.h
+    #define RAMPS_D8_PIN       TG_HEATER_BED_PIN
+    #define FAN_PIN                  TG_FAN0_PIN  // Override pin 4 in pins_RAMPS.h
   #endif
 #elif TEMP_SENSOR_BED
   // EFB (Anycubic Kossel default)
-  #define RAMPS_D9_PIN   TRIGORILLA_FAN0_PIN
-  #define RAMPS_D8_PIN   TRIGORILLA_HEATER_BED_PIN
+  #define RAMPS_D9_PIN               TG_FAN0_PIN
+  #define RAMPS_D8_PIN         TG_HEATER_BED_PIN
 #else
   // EFF
-  #define RAMPS_D9_PIN   TRIGORILLA_FAN1_PIN
-  #define RAMPS_D8_PIN   TRIGORILLA_FAN0_PIN
+  #define RAMPS_D9_PIN               TG_FAN1_PIN
+  #define RAMPS_D8_PIN               TG_FAN0_PIN
 #endif
 
-#if HOTENDS > 1 || TEMP_SENSOR_BED      // EEF, EEB, EFB
-  #define FAN1_PIN       TRIGORILLA_FAN1_PIN
+#if HOTENDS > 1 || TEMP_SENSOR_BED                // EEF, EEB, EFB
+  #define FAN1_PIN                   TG_FAN1_PIN
 #endif
-#define FAN2_PIN         TRIGORILLA_FAN2_PIN
-#define ORIG_E0_AUTO_FAN_PIN TRIGORILLA_FAN2_PIN  // Used in Anycubic Kossel example config
+#define FAN2_PIN                     TG_FAN2_PIN
+#define ORIG_E0_AUTO_FAN_PIN         TG_FAN2_PIN  // Used in Anycubic Kossel example config
 
 #include "pins_RAMPS.h"
 
@@ -96,25 +96,25 @@
   // LCD Display output pins
   #if BOTH(NEWPANEL, PANEL_ONE)
     #undef LCD_PINS_D6
-    #define LCD_PINS_D6    57
+    #define LCD_PINS_D6                       57
   #endif
 
   // LCD Display input pins
   #if ENABLED(NEWPANEL)
     #if ANY(VIKI2, miniVIKI)
       #undef DOGLCD_A0
-      #define DOGLCD_A0    23
+      #define DOGLCD_A0                       23
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
       #undef BEEPER_PIN
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN                      33
       #undef LCD_BACKLIGHT_PIN
-      #define LCD_BACKLIGHT_PIN 67
+      #define LCD_BACKLIGHT_PIN               67
     #endif
   #elif ENABLED(MINIPANEL)
     #undef BEEPER_PIN
-    #define BEEPER_PIN     33
+    #define BEEPER_PIN                        33
     #undef DOGLCD_A0
-    #define DOGLCD_A0      42
+    #define DOGLCD_A0                         42
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 3b2d3c8b8d92..f5c79d0b574b 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -34,72 +34,72 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN         12
-#define SERVO2_PIN          5
-#define SERVO3_PIN          4
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                            12
+#define SERVO2_PIN                             5
+#define SERVO3_PIN                             4
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  SERVO3_PIN
+  #define Z_MIN_PROBE_PIN             SERVO3_PIN
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
-#define X_CS_PIN           57
-
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
-#define Y_CS_PIN           58
-
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
-#define Z_CS_PIN           53
-
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
-#define E0_CS_PIN          49
-
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
-#define E1_CS_PIN          E0_CS_PIN
-
-#define E2_STEP_PIN        63
-#define E2_DIR_PIN         22
-#define E2_ENABLE_PIN      59
-#define E2_CS_PIN          E0_CS_PIN
-
-#define E3_STEP_PIN        32
-#define E3_DIR_PIN         40
-#define E3_ENABLE_PIN      39
-#define E3_CS_PIN          E0_CS_PIN
-
-#define E4_STEP_PIN        43
-#define E4_DIR_PIN         42
-#define E4_ENABLE_PIN      47
-#define E4_CS_PIN          E0_CS_PIN
-
-#if HAS_TMC220x
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
+#define X_CS_PIN                              57
+
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
+#define Y_CS_PIN                              58
+
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
+#define Z_CS_PIN                              53
+
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
+#define E0_CS_PIN                             49
+
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
+#define E1_CS_PIN                      E0_CS_PIN
+
+#define E2_STEP_PIN                           63
+#define E2_DIR_PIN                            22
+#define E2_ENABLE_PIN                         59
+#define E2_CS_PIN                      E0_CS_PIN
+
+#define E3_STEP_PIN                           32
+#define E3_DIR_PIN                            40
+#define E3_ENABLE_PIN                         39
+#define E3_CS_PIN                      E0_CS_PIN
+
+#define E4_STEP_PIN                           43
+#define E4_DIR_PIN                            42
+#define E4_ENABLE_PIN                         47
+#define E4_CS_PIN                      E0_CS_PIN
+
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -122,34 +122,34 @@
   // Software serial
   //
 
-  #define X_SERIAL_TX_PIN  -1   // 59
-  #define X_SERIAL_RX_PIN  -1   // 63
-  #define X2_SERIAL_TX_PIN -1
-  #define X2_SERIAL_RX_PIN -1
-
-  #define Y_SERIAL_TX_PIN  -1   // 64
-  #define Y_SERIAL_RX_PIN  -1   // 40
-  #define Y2_SERIAL_TX_PIN -1
-  #define Y2_SERIAL_RX_PIN -1
-
-  #define Z_SERIAL_TX_PIN  -1   // 44
-  #define Z_SERIAL_RX_PIN  -1   // 42
-  #define Z2_SERIAL_TX_PIN -1
-  #define Z2_SERIAL_RX_PIN -1
-
-  #define E0_SERIAL_TX_PIN -1   // 66
-  #define E0_SERIAL_RX_PIN -1   // 65
-  #define E1_SERIAL_TX_PIN -1
-  #define E1_SERIAL_RX_PIN -1
-  #define E2_SERIAL_TX_PIN -1
-  #define E2_SERIAL_RX_PIN -1
-  #define E3_SERIAL_TX_PIN -1
-  #define E3_SERIAL_RX_PIN -1
-  #define E4_SERIAL_TX_PIN -1
-  #define E4_SERIAL_RX_PIN -1
-  #define E5_SERIAL_RX_PIN -1
-  #define E6_SERIAL_RX_PIN -1
-  #define E7_SERIAL_RX_PIN -1
+  #define X_SERIAL_TX_PIN                     -1  // 59
+  #define X_SERIAL_RX_PIN                     -1  // 63
+  #define X2_SERIAL_TX_PIN                    -1
+  #define X2_SERIAL_RX_PIN                    -1
+
+  #define Y_SERIAL_TX_PIN                     -1  // 64
+  #define Y_SERIAL_RX_PIN                     -1  // 40
+  #define Y2_SERIAL_TX_PIN                    -1
+  #define Y2_SERIAL_RX_PIN                    -1
+
+  #define Z_SERIAL_TX_PIN                     -1  // 44
+  #define Z_SERIAL_RX_PIN                     -1  // 42
+  #define Z2_SERIAL_TX_PIN                    -1
+  #define Z2_SERIAL_RX_PIN                    -1
+
+  #define E0_SERIAL_TX_PIN                    -1  // 66
+  #define E0_SERIAL_RX_PIN                    -1  // 65
+  #define E1_SERIAL_TX_PIN                    -1
+  #define E1_SERIAL_RX_PIN                    -1
+  #define E2_SERIAL_TX_PIN                    -1
+  #define E2_SERIAL_RX_PIN                    -1
+  #define E3_SERIAL_TX_PIN                    -1
+  #define E3_SERIAL_RX_PIN                    -1
+  #define E4_SERIAL_TX_PIN                    -1
+  #define E4_SERIAL_RX_PIN                    -1
+  #define E5_SERIAL_RX_PIN                    -1
+  #define E6_SERIAL_RX_PIN                    -1
+  #define E7_SERIAL_RX_PIN                    -1
 #endif
 
 //
@@ -170,16 +170,16 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
-#define TEMP_1_PIN         15
-#define TEMP_2_PIN         10
-#define TEMP_3_PIN         11
-#define TEMP_BED_PIN       14
+#define TEMP_0_PIN                            13
+#define TEMP_1_PIN                            15
+#define TEMP_2_PIN                            10
+#define TEMP_3_PIN                            11
+#define TEMP_BED_PIN                          14
 
 #if TEMP_SENSOR_CHAMBER > 0
-  #define TEMP_CHAMBER_PIN 12
+  #define TEMP_CHAMBER_PIN                    12
 #else
-  #define TEMP_4_PIN       12
+  #define TEMP_4_PIN                          12
 #endif
 
 // SPI for Max6675 or Max31855 Thermocouple
@@ -192,50 +192,50 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN       44
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                          44
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN             9
+#define FAN_PIN                                9
 
 #if EXTRUDERS >= 5
-  #define HEATER_4_PIN      6
+  #define HEATER_4_PIN                         6
 #else
-  #define FAN1_PIN          6
+  #define FAN1_PIN                             6
 #endif
 
 #if EXTRUDERS >= 4
-  #define HEATER_3_PIN     45
+  #define HEATER_3_PIN                        45
 #else
-  #define FAN2_PIN         45
+  #define FAN2_PIN                            45
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 //#ifndef FILWIDTH_PIN
 //  #define FILWIDTH_PIN      5   // Analog Input
 //#endif
 
 // DIO 4 (Servos plug) for the runout sensor.
-//#define FIL_RUNOUT_PIN   SERVO3_PIN
+//#define FIL_RUNOUT_PIN              SERVO3_PIN
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 //
 // Case Light
 //
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
-  #if !NUM_SERVOS               // Prefer the servo connector
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
-  #elif HAS_FREE_AUX2_PINS      // Try to use AUX 2
-    #define CASE_LIGHT_PIN 44   // Hardware PWM
+  #if !NUM_SERVOS                                 // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -243,14 +243,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
-  #if !NUM_SERVOS                         // Prefer the servo connector
-    #define SPINDLE_LASER_ENABLE_PIN  4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
-  #elif HAS_FREE_AUX2_PINS                // Try to use AUX 2
-    #define SPINDLE_LASER_ENABLE_PIN 40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+  #if !NUM_SERVOS                                 // Prefer the servo connector
+    #define SPINDLE_LASER_ENABLE_PIN           4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif HAS_FREE_AUX2_PINS                        // Try to use AUX 2
+    #define SPINDLE_LASER_ENABLE_PIN          40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
@@ -278,63 +278,63 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS    49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE 51  // SID (MOSI)
-    #define LCD_PINS_D4    52   // SCK (CLK) clock
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 
-    #define LCD_PINS_RS    40
-    #define LCD_PINS_ENABLE 42
-    #define LCD_PINS_D4    65
-    #define LCD_PINS_D5    66
-    #define LCD_PINS_D6    44
-    #define LCD_PINS_D7    64
+    #define LCD_PINS_RS                       40
+    #define LCD_PINS_ENABLE                   42
+    #define LCD_PINS_D4                       65
+    #define LCD_PINS_D5                       66
+    #define LCD_PINS_D6                       44
+    #define LCD_PINS_D7                       64
 
   #elif ENABLED(ZONESTAR_LCD)
 
-    #define LCD_PINS_RS    64
-    #define LCD_PINS_ENABLE 44
-    #define LCD_PINS_D4    63
-    #define LCD_PINS_D5    40
-    #define LCD_PINS_D6    42
-    #define LCD_PINS_D7    65
-    #define ADC_KEYPAD_PIN 12
+    #define LCD_PINS_RS                       64
+    #define LCD_PINS_ENABLE                   44
+    #define LCD_PINS_D4                       63
+    #define LCD_PINS_D5                       40
+    #define LCD_PINS_D6                       42
+    #define LCD_PINS_D7                       65
+    #define ADC_KEYPAD_PIN                    12
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS  27
-      #define LCD_PINS_ENABLE 29
-      #define LCD_PINS_D4  25
+      #define LCD_PINS_RS                     27
+      #define LCD_PINS_ENABLE                 29
+      #define LCD_PINS_D4                     25
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN 37
+        #define BEEPER_PIN                    37
       #endif
 
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC 25   // Set as output on init
-        #define LCD_PINS_RS 27   // Pull low for 1s to init
+        #define LCD_PINS_DC                   25  // Set as output on init
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
         // DOGM SPI LCD Support
-        #define DOGLCD_CS  16
-        #define DOGLCD_MOSI 17
-        #define DOGLCD_SCK 23
-        #define DOGLCD_A0  LCD_PINS_DC
+        #define DOGLCD_CS                     16
+        #define DOGLCD_MOSI                   17
+        #define DOGLCD_SCK                    23
+        #define DOGLCD_A0            LCD_PINS_DC
       #else
-        #define LCD_PINS_RS 16
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4 23
-        #define LCD_PINS_D5 25
-        #define LCD_PINS_D6 27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7  29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN 33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -342,10 +342,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK    38
-      //#define SHIFT_LD     42
-      //#define SHIFT_OUT    40
-      //#define SHIFT_EN     17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -357,155 +357,155 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN   37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1    17
-        #define BTN_EN2    23
+        #define BTN_EN1                       17
+        #define BTN_EN2                       23
       #else
-        #define BTN_EN1    31
-        #define BTN_EN2    33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC      35
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     41
+      #define BTN_ENC                         35
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1      64
-      #define BTN_EN2      59
-      #define BTN_ENC      63
-      #define SD_DETECT_PIN 42
+      #define BTN_EN1                         64
+      #define BTN_EN2                         59
+      #define BTN_ENC                         63
+      #define SD_DETECT_PIN                   42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1      47
-      #define BTN_EN2      43
-      #define BTN_ENC      32
-      #define LCD_SDSS     53
-      //#define KILL_PIN     41
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
+      #define LCD_SDSS                        53
+      //#define KILL_PIN                      41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1      22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2       7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-      #define BTN_ENC      -1
+      #define BTN_EN1                         22  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_ENC                         -1
 
-      #define LCD_SDSS     53
-      #define SD_DETECT_PIN 49
+      #define LCD_SDSS                        53
+      #define SD_DETECT_PIN                   49
 
     #elif EITHER(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS    45
-      #define DOGLCD_A0    44
+      #define DOGLCD_CS                       45
+      #define DOGLCD_A0                       44
       #define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN   33
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define BEEPER_PIN                      33
+      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_BLUE_PIN               35
 
-      #define BTN_EN1      22
-      #define BTN_EN2       7
-      #define BTN_ENC      39
+      #define BTN_EN1                         22
+      #define BTN_EN2                          7
+      #define BTN_ENC                         39
 
-      #define SDSS         53
-      #define SD_DETECT_PIN -1   // Pin 49 for display SD interface, 72 for easy adapter board
-      //#define KILL_PIN     31
+      #define SDSS                            53
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
+      //#define KILL_PIN                      31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS    29
-      #define DOGLCD_A0    27
+      #define DOGLCD_CS                       29
+      #define DOGLCD_A0                       27
 
-      #define BEEPER_PIN   23
-      #define LCD_BACKLIGHT_PIN 33
+      #define BEEPER_PIN                      23
+      #define LCD_BACKLIGHT_PIN               33
 
-      #define BTN_EN1      35
-      #define BTN_EN2      37
-      #define BTN_ENC      31
+      #define BTN_EN1                         35
+      #define BTN_EN2                         37
+      #define BTN_ENC                         31
 
-      #define LCD_SDSS     53
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     41
+      #define LCD_SDSS                        53
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      41
 
     #elif ENABLED(MKS_MINI_12864)
 
-      #define DOGLCD_A0    27
-      #define DOGLCD_CS    25
+      #define DOGLCD_A0                       27
+      #define DOGLCD_CS                       25
 
       // GLCD features
-      //#define LCD_CONTRAST_INIT 190
+      //#define LCD_CONTRAST_INIT            190
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BEEPER_PIN   37
+      #define BEEPER_PIN                      37
 
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define BTN_EN1      31
-      #define BTN_EN2      33
-      #define BTN_ENC      35
-      //#define SDSS         53
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     64
+      #define BTN_EN1                         31
+      #define BTN_EN2                         33
+      #define BTN_ENC                         35
+      //#define SDSS                          53
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      64
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN   42
+      #define BEEPER_PIN                      42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define DOGLCD_A0    44
-      #define DOGLCD_CS    66
+      #define DOGLCD_A0                       44
+      #define DOGLCD_CS                       66
 
       // GLCD features
-      //#define LCD_CONTRAST_INIT 190
+      //#define LCD_CONTRAST_INIT            190
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1      40
-      #define BTN_EN2      63
-      #define BTN_ENC      59
+      #define BTN_EN1                         40
+      #define BTN_EN2                         63
+      #define BTN_ENC                         59
 
-      #define SDSS         53
-      #define SD_DETECT_PIN 49
-      //#define KILL_PIN     64
+      #define SDSS                            53
+      #define SD_DETECT_PIN                   49
+      //#define KILL_PIN                      64
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define SHIFT_OUT  40
-        #define SHIFT_CLK  44
-        #define SHIFT_LD   42
-        #define BTN_EN1    64
-        #define BTN_EN2    59
-        #define BTN_ENC    63
+        #define SHIFT_OUT                     40
+        #define SHIFT_CLK                     44
+        #define SHIFT_LD                      42
+        #define BTN_EN1                       64
+        #define BTN_EN2                       59
+        #define BTN_ENC                       63
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1    59   // AUX2 PIN 3
-        #define BTN_EN2    63   // AUX2 PIN 4
-        #define BTN_ENC    49   // AUX3 PIN 7
+        #define BTN_EN1                       59  // AUX2 PIN 3
+        #define BTN_EN2                       63  // AUX2 PIN 4
+        #define BTN_ENC                       49  // AUX3 PIN 7
       #else
-        #define BTN_EN1    37
-        #define BTN_EN2    35
-        #define BTN_ENC    31
+        #define BTN_EN1                       37
+        #define BTN_EN2                       35
+        #define BTN_ENC                       31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN 49
-        //#define KILL_PIN     41
+        #define SD_DETECT_PIN                 49
+        //#define KILL_PIN                    41
       #endif
 
     #endif
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index 2af64bb2a065..776dfcc3da34 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -44,97 +44,97 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         22
-#define Y_STOP_PIN         26
-#define Z_STOP_PIN         29
+#define X_STOP_PIN                            22
+#define Y_STOP_PIN                            26
+#define Z_STOP_PIN                            29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         32
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            32
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          36
-#define Z_ENABLE_PIN       34
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             36
+#define Z_ENABLE_PIN                          34
 
-#define E0_STEP_PIN        42
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           42
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define MOTOR_CURRENT_PWM_XY_PIN 44
-#define MOTOR_CURRENT_PWM_Z_PIN 45
-#define MOTOR_CURRENT_PWM_E_PIN 46
+#define MOTOR_CURRENT_PWM_XY_PIN              44
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               46
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE 2000
+  #define MOTOR_CURRENT_PWM_RANGE            2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  {1300, 1300, 1250}
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 77
+#define ORIG_E0_AUTO_FAN_PIN                  77
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      39
-#define LED_PIN             8
-#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
-#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+#define SDSS                                  53
+#define SD_DETECT_PIN                         39
+#define LED_PIN                                8
+#define SAFETY_TRIGGERED_PIN                  28  // PIN to detect the safety circuit has triggered
+#define MAIN_VOLTAGE_MEASURE_PIN              14  // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         18
+#define BEEPER_PIN                            18
 
-#define LCD_PINS_RS        20
-#define LCD_PINS_ENABLE    15
-#define LCD_PINS_D4        14
-#define LCD_PINS_D5        21
-#define LCD_PINS_D6         5
-#define LCD_PINS_D7         6
+#define LCD_PINS_RS                           20
+#define LCD_PINS_ENABLE                       15
+#define LCD_PINS_D4                           14
+#define LCD_PINS_D5                           21
+#define LCD_PINS_D6                            5
+#define LCD_PINS_D7                            6
 
 // Buttons are directly attached
-#define BTN_EN1            40
-#define BTN_EN2            41
-#define BTN_ENC            19
+#define BTN_EN1                               40
+#define BTN_EN2                               41
+#define BTN_ENC                               19
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if HAS_CUTTER   // use the LED_PIN for spindle speed control or case light
+#if HAS_CUTTER                                    // use the LED_PIN for spindle speed control or case light
   #undef LED_PIN
-  #define SPINDLE_DIR_PIN          16
-  #define SPINDLE_LASER_ENA_PIN    17   // Pullup!
-  #define SPINDLE_LASER_PWM_PIN     8   // Hardware PWM
+  #define SPINDLE_DIR_PIN                     16
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
+  #define SPINDLE_LASER_PWM_PIN                8  // Hardware PWM
 #else
   #undef LED_PIN
-  #define CASE_LIGHT_PIN            8
+  #define CASE_LIGHT_PIN                       8
 #endif
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER.h b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
index 8a48b07de76b..8cc588a2f991 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER.h
@@ -44,114 +44,114 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
+#define SERVO0_PIN                            11
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          32
+#define X_MIN_PIN                             22
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             26
+#define Y_MAX_PIN                             28
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             32
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // PIN that has to be turned on right after start, to keep power flowing.
-#define CASE_LIGHT_PIN      8
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // PIN that has to be turned on right after start, to keep power flowing.
+#define CASE_LIGHT_PIN                         8
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN 18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS    20
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4    16
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6     5
-    #define LCD_PINS_D7     6
+    #define LCD_PINS_RS                       20
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       16
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                        5
+    #define LCD_PINS_D7                        6
 
     // Buttons directly attached
-    #define BTN_EN1 40
-    #define BTN_EN2 42
-    #define BTN_ENC 19
+    #define BTN_EN1                           40
+    #define BTN_EN2                           42
+    #define BTN_ENC                           19
 
-    #define SD_DETECT_PIN 38
+    #define SD_DETECT_PIN                     38
 
-  #else // !NEWPANEL - Old style panel with shift register
+  #else                                           // !NEWPANEL - Old style panel with shift register
 
     // Buttons attached to a shift register
-    #define SHIFT_CLK 38
-    #define SHIFT_LD 42
-    #define SHIFT_OUT 40
-    #define SHIFT_EN 17
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
 
-    #define LCD_PINS_RS 16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4 6
-    #define LCD_PINS_D5 21
-    #define LCD_PINS_D6 20
-    #define LCD_PINS_D7 19
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
-    #define SD_DETECT_PIN -1
+    #define SD_DETECT_PIN                     -1
 
   #endif // !NEWPANEL
 
@@ -160,6 +160,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     9   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    10   // Pullup!
-#define SPINDLE_DIR_PIN          11   // use the EXP3 PWM header
+#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 10  // Pullup!
+#define SPINDLE_DIR_PIN                       11  // use the EXP3 PWM header
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index e128dc98d276..dc1244222465 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -80,134 +80,134 @@
 // Limit Switches
 //
 #if ENABLED(BOARD_REV_1_1_TO_1_3)
-  #define X_MIN_PIN        15   // SW1
-  #define X_MAX_PIN        14   // SW2
-  #define Y_MIN_PIN        17   // SW3
-  #define Y_MAX_PIN        16   // SW4
-  #define Z_MIN_PIN        19   // SW5
-  #define Z_MAX_PIN        18   // SW6
+  #define X_MIN_PIN                           15  // SW1
+  #define X_MAX_PIN                           14  // SW2
+  #define Y_MIN_PIN                           17  // SW3
+  #define Y_MAX_PIN                           16  // SW4
+  #define Z_MIN_PIN                           19  // SW5
+  #define Z_MAX_PIN                           18  // SW6
 #endif
 
 #if ENABLED(BOARD_REV_1_0)
   #if HAS_CUTTER
-    #define X_STOP_PIN     13   // SW1  (didn't change) - also has a useable hardware PWM
-    #define Y_STOP_PIN     12   // SW2
-    #define Z_STOP_PIN     11   // SW3
+    #define X_STOP_PIN                        13  // SW1  (didn't change) - also has a useable hardware PWM
+    #define Y_STOP_PIN                        12  // SW2
+    #define Z_STOP_PIN                        11  // SW3
   #else
-    #define X_MIN_PIN      13   // SW1
-    #define X_MAX_PIN      12   // SW2
-    #define Y_MIN_PIN      11   // SW3
-    #define Y_MAX_PIN      10   // SW4
-    #define Z_MIN_PIN       9   // SW5
-    #define Z_MAX_PIN       8   // SW6
+    #define X_MIN_PIN                         13  // SW1
+    #define X_MAX_PIN                         12  // SW2
+    #define Y_MIN_PIN                         11  // SW3
+    #define Y_MAX_PIN                         10  // SW4
+    #define Z_MIN_PIN                          9  // SW5
+    #define Z_MAX_PIN                          8  // SW6
   #endif
 #endif
 
 #if ENABLED(BOARD_REV_1_5)
-  #define X_MIN_PIN        22
-  #define X_MAX_PIN        24
-  #define Y_MIN_PIN        26
-  #define Y_MAX_PIN        28
-  #define Z_MIN_PIN        30
-  #define Z_MAX_PIN        32
+  #define X_MIN_PIN                           22
+  #define X_MAX_PIN                           24
+  #define Y_MIN_PIN                           26
+  #define Y_MAX_PIN                           28
+  #define Z_MIN_PIN                           30
+  #define Z_MAX_PIN                           32
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #if !defined(Z_MIN_PROBE_PIN) && !(HAS_CUTTER && ENABLED(BOARD_REV_1_0))
-  #define Z_MIN_PROBE_PIN  Z_MAX_PIN
+  #define Z_MIN_PROBE_PIN              Z_MAX_PIN
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
 #if HAS_CUTTER && ENABLED(BOARD_REV_1_1_TO_1_3) && EXTRUDERS == 1
   // Move E0 to the spare and get Spindle/Laser signals from E0
-  #define E0_STEP_PIN      49
-  #define E0_DIR_PIN       47
-  #define E0_ENABLE_PIN    48
+  #define E0_STEP_PIN                         49
+  #define E0_DIR_PIN                          47
+  #define E0_ENABLE_PIN                       48
 #else
-  #define E0_STEP_PIN      43
-  #define E0_DIR_PIN       45
-  #define E0_ENABLE_PIN    41
+  #define E0_STEP_PIN                         43
+  #define E0_DIR_PIN                          45
+  #define E0_ENABLE_PIN                       41
 
-  #define E1_STEP_PIN      49
-  #define E1_DIR_PIN       47
-  #define E1_ENABLE_PIN    48
+  #define E1_STEP_PIN                         49
+  #define E1_DIR_PIN                          47
+  #define E1_ENABLE_PIN                       48
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-//#define HEATER_1_PIN        3   // used for case light   Rev A said "1"
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+//#define HEATER_1_PIN                         3  // used for case light   Rev A said "1"
+#define HEATER_BED_PIN                         4
 
 //
 // LCD / Controller
 //
 #if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
 
-  #define LCD_PINS_RS      24
-  #define LCD_PINS_ENABLE  22
-  #define LCD_PINS_D4      36
-  #define LCD_PINS_D5      34
-  #define LCD_PINS_D6      32
-  #define LCD_PINS_D7      30
+  #define LCD_PINS_RS                         24
+  #define LCD_PINS_ENABLE                     22
+  #define LCD_PINS_D4                         36
+  #define LCD_PINS_D5                         34
+  #define LCD_PINS_D6                         32
+  #define LCD_PINS_D7                         30
 
 #elif ENABLED(BOARD_REV_1_5, ULTRA_LCD)
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS    20
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4    16
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6     5
-    #define LCD_PINS_D7     6
+    #define LCD_PINS_RS                       20
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       16
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                        5
+    #define LCD_PINS_D7                        6
 
     // Buttons directly attached
-    #define BTN_EN1        40
-    #define BTN_EN2        42
-    #define BTN_ENC        19
+    #define BTN_EN1                           40
+    #define BTN_EN2                           42
+    #define BTN_ENC                           19
 
-    #define SD_DETECT_PIN  38
+    #define SD_DETECT_PIN                     38
 
-  #else // !NEWPANEL - Old style panel with shift register
+  #else                                           // !NEWPANEL - Old style panel with shift register
 
     // Buttons attached to a shift register
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
-
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
+
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
   #endif // !NEWPANEL
 
@@ -217,17 +217,17 @@
 // case light  - see spindle section for more info on available hardware PWMs
 //
 #if !PIN_EXISTS(CASE_LIGHT) && ENABLED(BOARD_REV_1_5)
-  #define CASE_LIGHT_PIN        7   // use PWM -  MUST BE HARDWARE PWM
+  #define CASE_LIGHT_PIN                       7  // use PWM -  MUST BE HARDWARE PWM
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
-  #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5) // Use the last three SW positions
-    #define SPINDLE_DIR_PIN          10   // 1.0: SW4  1.5: EXP3-6 ("10")
-    #define SPINDLE_LASER_PWM_PIN     9   // 1.0: SW5  1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
-    #define SPINDLE_LASER_ENA_PIN     8   // 1.0: SW6  1.5: EXP3-8 ( "8") .. Pin should have a pullup!
+  #if EITHER(BOARD_REV_1_0, BOARD_REV_1_5)        // Use the last three SW positions
+    #define SPINDLE_DIR_PIN                   10  // 1.0: SW4  1.5: EXP3-6 ("10")
+    #define SPINDLE_LASER_PWM_PIN              9  // 1.0: SW5  1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENA_PIN              8  // 1.0: SW6  1.5: EXP3-8 ( "8") .. Pin should have a pullup!
   #elif ENABLED(BOARD_REV_1_1_TO_1_3)
     /**
      * Only four hardware PWMs physically connected to anything on these boards:
@@ -241,14 +241,14 @@
      * They have an LED and resistor pullup to +24V which could damage 3.3V-5V ICs.
      */
     #if EXTRUDERS == 1
-      #define SPINDLE_DIR_PIN          43
-      #define SPINDLE_LASER_PWM_PIN    45   // Hardware PWM
-      #define SPINDLE_LASER_ENA_PIN    41   // Pullup!
-    #elif TEMP_SENSOR_BED == 0  // Can't use E0 so see if HEATER_BED_PIN is available
+      #define SPINDLE_DIR_PIN                 43
+      #define SPINDLE_LASER_PWM_PIN           45  // Hardware PWM
+      #define SPINDLE_LASER_ENA_PIN           41  // Pullup!
+    #elif TEMP_SENSOR_BED == 0                    // Can't use E0 so see if HEATER_BED_PIN is available
       #undef HEATER_BED_PIN
-      #define SPINDLE_DIR_PIN          38   // Probably pin 4 on 10 pin connector closest to the E0 socket
-      #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM - Special precautions usually needed.
-      #define SPINDLE_LASER_ENA_PIN    40   // Pullup! (Probably pin 6 on the 10-pin
+      #define SPINDLE_DIR_PIN                 38  // Probably pin 4 on 10 pin connector closest to the E0 socket
+      #define SPINDLE_LASER_PWM_PIN            4  // Hardware PWM - Special precautions usually needed.
+      #define SPINDLE_LASER_ENA_PIN           40  // Pullup! (Probably pin 6 on the 10-pin
                                             // connector closest to the E0 socket)
     #endif
   #endif
diff --git a/Marlin/src/pins/ramps/pins_VORON.h b/Marlin/src/pins/ramps/pins_VORON.h
index a6cb05928aa4..12c0a36db1d4 100644
--- a/Marlin/src/pins/ramps/pins_VORON.h
+++ b/Marlin/src/pins/ramps/pins_VORON.h
@@ -28,7 +28,7 @@
 
 #define BOARD_INFO_NAME "VORON Design v2"
 
-#define RAMPS_D8_PIN       11
+#define RAMPS_D8_PIN                         11
 
 #include "pins_RAMPS.h"
 
@@ -36,10 +36,10 @@
 // Heaters / Fans
 //
 #undef FAN_PIN
-#define FAN_PIN             5   // Using the pin for the controller fan since controller fan is always on.
-#define CONTROLLER_FAN_PIN  8
-#define ORIG_E0_AUTO_FAN_PIN 6  // Servo pin 6 for E3D Fan
-#define ORIG_E1_AUTO_FAN_PIN 6  // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
+#define FAN_PIN                               5   // Using the pin for the controller fan since controller fan is always on.
+#define CONTROLLER_FAN_PIN                    8
+#define ORIG_E0_AUTO_FAN_PIN                  6   // Servo pin 6 for E3D Fan
+#define ORIG_E1_AUTO_FAN_PIN                  6   // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
 
 //
 // LCDs and Controllers
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index 450ad1f82548..5aee07c96f75 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -28,24 +28,24 @@
 
 #include "pins_MKS_GEN_13.h"
 
-#define ZRIB_V20_D6_PIN      6   // Fan
-#define ZRIB_V20_D9_PIN      9   // Fan2
-#define ZRIB_V20_A10_PIN    10
-#define ZRIB_V20_D16_PIN    16
-#define ZRIB_V20_D17_PIN    17
-#define ZRIB_V20_D23_PIN    23
-#define ZRIB_V20_D25_PIN    25
-#define ZRIB_V20_D27_PIN    27
-#define ZRIB_V20_D29_PIN    29
-#define ZRIB_V20_D37_PIN    37
+#define ZRIB_V20_D6_PIN                        6  // Fan
+#define ZRIB_V20_D9_PIN                        9  // Fan2
+#define ZRIB_V20_A10_PIN                      10
+#define ZRIB_V20_D16_PIN                      16
+#define ZRIB_V20_D17_PIN                      17
+#define ZRIB_V20_D23_PIN                      23
+#define ZRIB_V20_D25_PIN                      25
+#define ZRIB_V20_D27_PIN                      27
+#define ZRIB_V20_D29_PIN                      29
+#define ZRIB_V20_D37_PIN                      37
 
-#define ORIG_E0_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E1_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E2_AUTO_FAN_PIN ZRIB_V20_D6_PIN
-#define ORIG_E3_AUTO_FAN_PIN ZRIB_V20_D6_PIN
+#define ORIG_E0_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
+#define ORIG_E1_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
+#define ORIG_E2_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
+#define ORIG_E3_AUTO_FAN_PIN     ZRIB_V20_D6_PIN
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      11   // Analog Input
+  #define FILWIDTH_PIN                        11  // Analog Input
 #endif
 
 #if ENABLED(ZONESTAR_LCD)
@@ -58,12 +58,12 @@
   #undef ADC_KEYPAD_PIN
   #undef BEEPER_PIN
 
-  #define LCD_PINS_RS     ZRIB_V20_D16_PIN
-  #define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
-  #define LCD_PINS_D4     ZRIB_V20_D23_PIN
-  #define LCD_PINS_D5     ZRIB_V20_D25_PIN
-  #define LCD_PINS_D6     ZRIB_V20_D27_PIN
-  #define LCD_PINS_D7     ZRIB_V20_D29_PIN
-  #define ADC_KEYPAD_PIN  ZRIB_V20_A10_PIN
-  #define BEEPER_PIN      ZRIB_V20_D37_PIN
+  #define LCD_PINS_RS           ZRIB_V20_D16_PIN
+  #define LCD_PINS_ENABLE       ZRIB_V20_D17_PIN
+  #define LCD_PINS_D4           ZRIB_V20_D23_PIN
+  #define LCD_PINS_D5           ZRIB_V20_D25_PIN
+  #define LCD_PINS_D6           ZRIB_V20_D27_PIN
+  #define LCD_PINS_D7           ZRIB_V20_D29_PIN
+  #define ADC_KEYPAD_PIN        ZRIB_V20_A10_PIN
+  #define BEEPER_PIN            ZRIB_V20_D37_PIN
 #endif
diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
index 9808646d32db..f55ec51567a3 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -37,129 +37,129 @@
 // Servos
 //
 #ifndef SERVO0_PIN
-  #define SERVO0_PIN       11
+  #define SERVO0_PIN                          11
 #endif
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN        4
+  #define SERVO3_PIN                           4
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         -1
+  #define X_CS_PIN                            -1
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         -1
+  #define Y_CS_PIN                            -1
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         -1
+  #define Z_CS_PIN                            -1
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        -1
+  #define E0_CS_PIN                           -1
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                           -1
 #endif
 
 // Red
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         40
-#define E2_ENABLE_PIN      65
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            40
+#define E2_ENABLE_PIN                         65
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        -1
+  #define E2_CS_PIN                           -1
 #endif
 
 // Black
-#define E3_STEP_PIN        44
-#define E3_DIR_PIN         64
-#define E3_ENABLE_PIN      66
+#define E3_STEP_PIN                           44
+#define E3_DIR_PIN                            64
+#define E3_ENABLE_PIN                         66
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        -1
+  #define E3_CS_PIN                           -1
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_2_PIN          5   // Analog Input (BLACK)
-#define TEMP_3_PIN          9   // Analog Input (RED)
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                            13  // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_2_PIN                             5  // Analog Input (BLACK)
+#define TEMP_3_PIN                             9  // Analog Input (RED)
+#define TEMP_BED_PIN                          14  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN        6
-#define HEATER_3_PIN        5
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                           6
+#define HEATER_3_PIN                           5
+#define HEATER_BED_PIN                         8
 
-#define FAN_PIN             9
+#define FAN_PIN                                9
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // Оn the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN    6   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #elif HAS_FREE_AUX2_PINS
-    #define CASE_LIGHT_PIN   44   // Hardware PWM
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -167,14 +167,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
+  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
@@ -183,13 +183,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    66
+    #define TMC_SW_MOSI                       66
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     64
+    #define TMC_SW_SCK                        64
   #endif
 #endif
 
@@ -217,90 +217,90 @@
   //
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  40
+    #define X_SERIAL_TX_PIN                   40
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  63
+    #define X_SERIAL_RX_PIN                   63
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  59
+    #define Y_SERIAL_TX_PIN                   59
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  64
+    #define Y_SERIAL_RX_PIN                   64
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  42
+    #define Z_SERIAL_TX_PIN                   42
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  65
+    #define Z_SERIAL_RX_PIN                   65
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN -1
+    #define Z2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN -1
+    #define Z2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 44
+    #define E0_SERIAL_TX_PIN                  44
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 66
+    #define E0_SERIAL_RX_PIN                  66
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
diff --git a/Marlin/src/pins/sam/pins_ADSK.h b/Marlin/src/pins/sam/pins_ADSK.h
index 3a38e5ce1668..61c2e1b494e6 100644
--- a/Marlin/src/pins/sam/pins_ADSK.h
+++ b/Marlin/src/pins/sam/pins_ADSK.h
@@ -81,55 +81,55 @@ A stepper for E0 extruder
 //
 // Servos
 //
-#define SERVO0_PIN         61   // Analog pin 7, Digital pin 61
+#define SERVO0_PIN                            61  // Analog pin 7, Digital pin 61
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           9
-#define Y_MIN_PIN          10
-#define Z_MIN_PIN          11
+#define X_MIN_PIN                              9
+#define Y_MIN_PIN                             10
+#define Z_MIN_PIN                             11
 
-#define Z_MIN_PROBE_PIN    62   // Analog pin 8, Digital pin 62
+#define Z_MIN_PROBE_PIN                       62  // Analog pin 8, Digital pin 62
 
 //
 // Steppers
 //
-#define X_STEP_PIN          2
-#define X_DIR_PIN           5
-#define X_ENABLE_PIN        8
+#define X_STEP_PIN                             2
+#define X_DIR_PIN                              5
+#define X_ENABLE_PIN                           8
 
-#define Y_STEP_PIN          3
-#define Y_DIR_PIN           6
-#define Y_ENABLE_PIN        8
+#define Y_STEP_PIN                             3
+#define Y_DIR_PIN                              6
+#define Y_ENABLE_PIN                           8
 
-#define Z_STEP_PIN          4
-#define Z_DIR_PIN           7
-#define Z_ENABLE_PIN        8
+#define Z_STEP_PIN                             4
+#define Z_DIR_PIN                              7
+#define Z_ENABLE_PIN                           8
 
-#define E0_STEP_PIN        12
-#define E0_DIR_PIN         13
-#define E0_ENABLE_PIN       8
+#define E0_STEP_PIN                           12
+#define E0_DIR_PIN                            13
+#define E0_ENABLE_PIN                          8
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       55   // "Hold":   Analog pin 1, Digital pin 55
-#define HEATER_BED_PIN     57   // "CoolEn": Analog pin 3, Digital pin 57
-#define FAN_PIN            54   // "Abort":  Analog pin 0, Digital pin 54
+#define HEATER_0_PIN                          55  // "Hold":   Analog pin 1, Digital pin 55
+#define HEATER_BED_PIN                        57  // "CoolEn": Analog pin 3, Digital pin 57
+#define FAN_PIN                               54  // "Abort":  Analog pin 0, Digital pin 54
 #undef E0_AUTO_FAN_PIN
-#define E0_AUTO_FAN_PIN    56   // "Resume": Analog pin 2, Digital pin 56
+#define E0_AUTO_FAN_PIN                       56  // "Resume": Analog pin 2, Digital pin 56
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          4   // "SDA":    Analog pin 4, Digital pin 58
-#define TEMP_BED_PIN        5   // "SCL":    Analog pin 5, Digital pin 59
+#define TEMP_0_PIN                             4  // "SDA":    Analog pin 4, Digital pin 58
+#define TEMP_BED_PIN                           5  // "SCL":    Analog pin 5, Digital pin 59
 
 //
 // Misc. Functions
 //
-#define SDSS               52
+#define SDSS                                  52
 
 #if ENABLED(ZONESTAR_LCD)
 
@@ -160,13 +160,13 @@ A stepper for E0 extruder
   //
   // LCD / Controller
   //
-  #define LCD_PINS_ENABLE  14
-  #define LCD_PINS_RS      15
-  #define LCD_PINS_D4      16
-  #define LCD_PINS_D5      17
-  #define LCD_PINS_D6      18
-  #define LCD_PINS_D7      19
-  #define ADC_KEYPAD_PIN    6   //60 // Analog pin 6, Digital pin 60
+  #define LCD_PINS_ENABLE                     14
+  #define LCD_PINS_RS                         15
+  #define LCD_PINS_D4                         16
+  #define LCD_PINS_D5                         17
+  #define LCD_PINS_D6                         18
+  #define LCD_PINS_D7                         19
+  #define ADC_KEYPAD_PIN                       6  //60 // Analog pin 6, Digital pin 60
 
   /**
    * The below defines will scale all the values to work properly on both
diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
index 619d7f62c747..8b035e887604 100644
--- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
+++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
@@ -35,126 +35,126 @@
 //
 // Servos
 //
-#define SERVO0_PIN         36
-#define SERVO1_PIN         40
-#define SERVO2_PIN         41
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                            36
+#define SERVO1_PIN                            40
+#define SERVO2_PIN                            41
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          33   // PC1
-#define X_MAX_PIN          34   // PC2
-#define Y_MIN_PIN          35   // PC3
-#define Y_MAX_PIN          37   // PC5
-#define Z_MIN_PIN          38   // PC6
-#define Z_MAX_PIN          39   // PC7
+#define X_MIN_PIN                             33  // PC1
+#define X_MAX_PIN                             34  // PC2
+#define Y_MIN_PIN                             35  // PC3
+#define Y_MAX_PIN                             37  // PC5
+#define Z_MIN_PIN                             38  // PC6
+#define Z_MAX_PIN                             39  // PC7
 
 //
 // Steppers
 //
-#define X_STEP_PIN         96   // PB24
-#define X_DIR_PIN           2   // PB25
-#define X_ENABLE_PIN       24   // PA15, motor RESET pin
+#define X_STEP_PIN                            96  // PB24
+#define X_DIR_PIN                              2  // PB25
+#define X_ENABLE_PIN                          24  // PA15, motor RESET pin
 
-#define Y_STEP_PIN         94   // PB22
-#define Y_DIR_PIN          95   // PB23
-#define Y_ENABLE_PIN       24   // PA15, motor RESET pin
+#define Y_STEP_PIN                            94  // PB22
+#define Y_DIR_PIN                             95  // PB23
+#define Y_ENABLE_PIN                          24  // PA15, motor RESET pin
 
-#define Z_STEP_PIN         98   // PC27
-#define Z_DIR_PIN           3   // PC28
-#define Z_ENABLE_PIN       24   // PA15, motor RESET pin
+#define Z_STEP_PIN                            98  // PC27
+#define Z_DIR_PIN                              3  // PC28
+#define Z_ENABLE_PIN                          24  // PA15, motor RESET pin
 
-#define E0_STEP_PIN         5   // PC25
-#define E0_DIR_PIN          4   // PC26
-#define E0_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E0_STEP_PIN                            5  // PC25
+#define E0_DIR_PIN                             4  // PC26
+#define E0_ENABLE_PIN                         24  // PA15, motor RESET pin
 
-#define E1_STEP_PIN        28   // PD3 on piggy
-#define E1_DIR_PIN         27   // PD2 on piggy
-#define E1_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E1_STEP_PIN                           28  // PD3 on piggy
+#define E1_DIR_PIN                            27  // PD2 on piggy
+#define E1_ENABLE_PIN                         24  // PA15, motor RESET pin
 
-#define E2_STEP_PIN        11   // PD7 on piggy
-#define E2_DIR_PIN         29   // PD6 on piggy
-#define E2_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E2_STEP_PIN                           11  // PD7 on piggy
+#define E2_DIR_PIN                            29  // PD6 on piggy
+#define E2_ENABLE_PIN                         24  // PA15, motor RESET pin
 
-#define E3_STEP_PIN        30   // PD9 on piggy
-#define E3_DIR_PIN         12   // PD8 on piggy
-#define E3_ENABLE_PIN      24   // PA15, motor RESET pin
+#define E3_STEP_PIN                           30  // PD9 on piggy
+#define E3_DIR_PIN                            12  // PD8 on piggy
+#define E3_ENABLE_PIN                         24  // PA15, motor RESET pin
 
 // Microstepping pins - Mapping not from fastio.h (?)
-#define X_MS1_PIN          99   // PC10
-#define Y_MS1_PIN          10   // PC29
-#define Z_MS1_PIN          44   // PC19
-#define E0_MS1_PIN         45   // PC18
+#define X_MS1_PIN                             99  // PC10
+#define Y_MS1_PIN                             10  // PC29
+#define Z_MS1_PIN                             44  // PC19
+#define E0_MS1_PIN                            45  // PC18
 
-//#define MOTOR_FAULT_PIN  22   // PB26 , motor X-Y-Z-E0 motor FAULT
+//#define MOTOR_FAULT_PIN                     22  // PB26 , motor X-Y-Z-E0 motor FAULT
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input (PA24)
-#define TEMP_1_PIN          2   // Analog Input (PA23 on piggy)
-#define TEMP_2_PIN          3   // Analog Input (PA22 on piggy)
-#define TEMP_3_PIN          4   // Analog Input (PA6 on piggy)
-#define TEMP_BED_PIN        0   // Analog Input (PA16)
+#define TEMP_0_PIN                             1  // Analog Input (PA24)
+#define TEMP_1_PIN                             2  // Analog Input (PA23 on piggy)
+#define TEMP_2_PIN                             3  // Analog Input (PA22 on piggy)
+#define TEMP_3_PIN                             4  // Analog Input (PA6 on piggy)
+#define TEMP_BED_PIN                           0  // Analog Input (PA16)
 
 //
 // Heaters / Fans
 //
 // Note that on the Due pin A0 on the board is channel 2 on the ARM chip
-#define HEATER_0_PIN       68   // PA1
-#define HEATER_1_PIN        8   // PC22 on piggy
-#define HEATER_2_PIN        9   // PC21 on piggy
-#define HEATER_3_PIN       97   // PC20 on piggy
-#define HEATER_BED_PIN     69   // PA0
+#define HEATER_0_PIN                          68  // PA1
+#define HEATER_1_PIN                           8  // PC22 on piggy
+#define HEATER_2_PIN                           9  // PC21 on piggy
+#define HEATER_3_PIN                          97  // PC20 on piggy
+#define HEATER_BED_PIN                        69  // PA0
 
 #ifndef FAN_PIN
-  #define FAN_PIN          92   // PA5
+  #define FAN_PIN                             92  // PA5
 #endif
-#define FAN1_PIN           31   // PA7
+#define FAN1_PIN                              31  // PA7
 
 //
 // Misc. Functions
 //
-#define SDSS               77   // PA28
-#define SD_DETECT_PIN      87   // PA29
-#define LED_RED_PIN        40   // PC8
-#define LED_GREEN_PIN      41   // PC9
+#define SDSS                                  77  // PA28
+#define SD_DETECT_PIN                         87  // PA29
+#define LED_RED_PIN                           40  // PC8
+#define LED_GREEN_PIN                         41  // PC9
 
-#define EXP_VOLTAGE_LEVEL_PIN 65
+#define EXP_VOLTAGE_LEVEL_PIN                 65
 
-#define SPI_CHAN_DAC        1
+#define SPI_CHAN_DAC                           1
 
-#define DAC0_SYNC          53   // PB14
-#define DAC1_SYNC           6   // PC24
+#define DAC0_SYNC                             53  // PB14
+#define DAC1_SYNC                              6  // PC24
 
 // 64K SPI EEPROM
 #define SPI_EEPROM
-#define SPI_CHAN_EEPROM1    2
-#define SPI_EEPROM1_CS     25   // PD0
+#define SPI_CHAN_EEPROM1                       2
+#define SPI_EEPROM1_CS                        25  // PD0
 
 // 2K SPI EEPROM
-#define SPI_EEPROM2_CS     26   // PD1
+#define SPI_EEPROM2_CS                        26  // PD1
 
 // FLASH SPI
 // 32Mb
-#define SPI_FLASH_CS       23   // PA14
+#define SPI_FLASH_CS                          23  // PA14
 
 //
 // LCD / Controller
 //
 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-  #define LCD_PINS_RS      18
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      19
-  #define BEEPER_PIN       64
+  #define LCD_PINS_RS                         18
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         19
+  #define BEEPER_PIN                          64
 
-  #define BTN_EN1          14
-  #define BTN_EN2          16
-  #define BTN_ENC          17
+  #define BTN_EN1                             14
+  #define BTN_EN2                             16
+  #define BTN_ENC                             17
 
   #undef UI_VOLTAGE_LEVEL
-  #define UI_VOLTAGE_LEVEL 1
+  #define UI_VOLTAGE_LEVEL                     1
 
 #endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
diff --git a/Marlin/src/pins/sam/pins_ARCHIM1.h b/Marlin/src/pins/sam/pins_ARCHIM1.h
index ddc9f407ecd6..606e0246978f 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM1.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM1.h
@@ -46,7 +46,7 @@
 //
 // Timers
 //
-#define STEP_TIMER_NUM 3
+#define STEP_TIMER_NUM                         3
 #define HAL_STEP_TIMER_ISR()  void TC3_Handler()
 
 //
@@ -56,147 +56,145 @@
 //
 // Servos
 //
-#define SERVO0_PIN         20   // D20 PB12 (Header J20 20)
-#define SERVO1_PIN         21   // D21 PB13 (Header J20 19)
-
+#define SERVO0_PIN                            20  // D20 PB12 (Header J20 20)
+#define SERVO1_PIN                            21  // D21 PB13 (Header J20 19)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          14   // PD4 MIN ES1
-#define X_MAX_PIN          32   // PD10 MAX ES1
-#define Y_MIN_PIN          29   // PD6 MIN ES2
-#define Y_MAX_PIN          15   // PD5 MAX ES2
-#define Z_MIN_PIN          31   // PA7 MIN ES3
-#define Z_MAX_PIN          30   // PD9 MAX ES3
+#define X_MIN_PIN                             14  // PD4 MIN ES1
+#define X_MAX_PIN                             32  // PD10 MAX ES1
+#define Y_MIN_PIN                             29  // PD6 MIN ES2
+#define Y_MAX_PIN                             15  // PD5 MAX ES2
+#define Z_MIN_PIN                             31  // PA7 MIN ES3
+#define Z_MAX_PIN                             30  // PD9 MAX ES3
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   66   // D66 PB15 (Header J20 15)
+  #define FIL_RUNOUT_PIN                      66  // D66 PB15 (Header J20 15)
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  67   // D67 PB16 (Header J20 16)
+  #define FIL_RUNOUT2_PIN                     67  // D67 PB16 (Header J20 16)
 #endif
 
-
 //
 // Steppers
 //
-#define X_STEP_PIN         40   // PC8 STEP1 *
-#define X_DIR_PIN          59   // PA4 DIR1 *
-#define X_ENABLE_PIN       41   // PC9 EN1
+#define X_STEP_PIN                            40  // PC8 STEP1 *
+#define X_DIR_PIN                             59  // PA4 DIR1 *
+#define X_ENABLE_PIN                          41  // PC9 EN1
 
-#define Y_STEP_PIN         49   // PC14 STEP2 *
-#define Y_DIR_PIN          47   // PC16 DIR2 *
-#define Y_ENABLE_PIN       48   // PC15 EN2 *
+#define Y_STEP_PIN                            49  // PC14 STEP2 *
+#define Y_DIR_PIN                             47  // PC16 DIR2 *
+#define Y_ENABLE_PIN                          48  // PC15 EN2 *
 
-#define Z_STEP_PIN         36   // PC4 STEP Z *
-#define Z_DIR_PIN         107   // PB10 DIR Z *
-#define Z_ENABLE_PIN       96   // PC10 EN Z -AddOns *
+#define Z_STEP_PIN                            36  // PC4 STEP Z *
+#define Z_DIR_PIN                            107  // PB10 DIR Z *
+#define Z_ENABLE_PIN                          96  // PC10 EN Z -AddOns *
 
-#define E0_STEP_PIN        78   // PB23 STEP3 *
-#define E0_DIR_PIN         22   // PB26 DIR3 *
-#define E0_ENABLE_PIN      97   // PB24 EN3 -Addons *
+#define E0_STEP_PIN                           78  // PB23 STEP3 *
+#define E0_DIR_PIN                            22  // PB26 DIR3 *
+#define E0_ENABLE_PIN                         97  // PB24 EN3 -Addons *
 
-#define E1_STEP_PIN        26   // PD1 STEP4 *
-#define E1_DIR_PIN         27   // PD2 DIR4 *
-#define E1_ENABLE_PIN      28   // PD3 EN4 *
+#define E1_STEP_PIN                           26  // PD1 STEP4 *
+#define E1_DIR_PIN                            27  // PD2 DIR4 *
+#define E1_ENABLE_PIN                         28  // PD3 EN4 *
 
 // Microstepping mode pins *
-#define X_MS1_PIN          39   // PC7 MOD0E1 - As listed in schematic
-#define X_MS2_PIN          38   // PC6 MOD1E1
-#define X_MS3_PIN          37   // PC5 MOD2E1
+#define X_MS1_PIN                             39  // PC7 MOD0E1 - As listed in schematic
+#define X_MS2_PIN                             38  // PC6 MOD1E1
+#define X_MS3_PIN                             37  // PC5 MOD2E1
 
-#define Y_MS1_PIN          50   // PC13 MODE0E2
-#define Y_MS2_PIN          51   // PC12 MODE1E2
-#define Y_MS3_PIN          92   // PC11 MODE2E2 - AddOns
+#define Y_MS1_PIN                             50  // PC13 MODE0E2
+#define Y_MS2_PIN                             51  // PC12 MODE1E2
+#define Y_MS3_PIN                             92  // PC11 MODE2E2 - AddOns
 
-#define Z_MS1_PIN          44   // PC19 MOD0E Z
-#define Z_MS2_PIN          45   // PC18 MOD1E Z
-#define Z_MS3_PIN          46   // PC17 MOD2E Z
+#define Z_MS1_PIN                             44  // PC19 MOD0E Z
+#define Z_MS2_PIN                             45  // PC18 MOD1E Z
+#define Z_MS3_PIN                             46  // PC17 MOD2E Z
 
-#define E0_MS1_PIN        105   // PB22 MOD0E3 - AddOns
-#define E0_MS2_PIN        106   // PC27 MOD1E3 - AddOns
-#define E0_MS3_PIN        104   // PC20 MOD2E3 - AddOns
+#define E0_MS1_PIN                           105  // PB22 MOD0E3 - AddOns
+#define E0_MS2_PIN                           106  // PC27 MOD1E3 - AddOns
+#define E0_MS3_PIN                           104  // PC20 MOD2E3 - AddOns
 
-#define E1_MS1_PIN         25   // PD0 MOD0E4
-#define E1_MS2_PIN         18   // PA11 MOD1E4
-#define E1_MS3_PIN         19   // PA10 MOD2E4
+#define E1_MS1_PIN                            25  // PD0 MOD0E4
+#define E1_MS2_PIN                            18  // PA11 MOD1E4
+#define E1_MS3_PIN                            19  // PA10 MOD2E4
 
 // Motor current PWM pins *
-#define MOTOR_CURRENT_PWM_X_PIN   58   // PA6   X-REF TIOB2
-#define MOTOR_CURRENT_PWM_Y_PIN   12   // PD8   Y-REF TIOB8
-#define MOTOR_CURRENT_PWM_Z_PIN   10   // PC29  Z-REF TIOB7
-#define MOTOR_CURRENT_PWM_E0_PIN   3   // PC28 E1-REF TIOA7
-#define MOTOR_CURRENT_PWM_E1_PIN  11   // PD7  E2-REF TIOA8
+#define MOTOR_CURRENT_PWM_X_PIN               58  // PA6   X-REF TIOB2
+#define MOTOR_CURRENT_PWM_Y_PIN               12  // PD8   Y-REF TIOB8
+#define MOTOR_CURRENT_PWM_Z_PIN               10  // PC29  Z-REF TIOB7
+#define MOTOR_CURRENT_PWM_E0_PIN               3  // PC28 E1-REF TIOA7
+#define MOTOR_CURRENT_PWM_E1_PIN              11  // PD7  E2-REF TIOA8
 
-#define MOTOR_CURRENT_PWM_RANGE 2750   // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
+#define MOTOR_CURRENT_PWM_RANGE              2750 // (3.3 Volts * 100000 Ohms) / (100000 Ohms + 20000 Ohms) = 2.75 Volts (max vref)
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1000, 1000, 1000 } //, 1000, 1000}   // X Y Z E0 E1, 1000 = 1000mAh
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         10   // D10 PB19 THERM AN1 *
-#define TEMP_1_PIN          9   // D9 PB18 THERM AN2 *
-#define TEMP_2_PIN          8   // D8 PB17 THERM AN4 *
-#define TEMP_BED_PIN       11   // D11 PB20 THERM AN3 *
+#define TEMP_0_PIN                            10  // D10 PB19 THERM AN1 *
+#define TEMP_1_PIN                             9  // D9 PB18 THERM AN2 *
+#define TEMP_2_PIN                             8  // D8 PB17 THERM AN4 *
+#define TEMP_BED_PIN                          11  // D11 PB20 THERM AN3 *
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        6   // D6 PC24 FET_PWM3
-#define HEATER_1_PIN        7   // D7 PC23 FET_PWM4
-#define HEATER_2_PIN        8   // D8 PC22 FET_PWM5
-#define HEATER_BED_PIN      9   // D9 PC21 BED_PWM
+#define HEATER_0_PIN                           6  // D6 PC24 FET_PWM3
+#define HEATER_1_PIN                           7  // D7 PC23 FET_PWM4
+#define HEATER_2_PIN                           8  // D8 PC22 FET_PWM5
+#define HEATER_BED_PIN                         9  // D9 PC21 BED_PWM
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4   // D4 PC26 FET_PWM1
+  #define FAN_PIN                              4  // D4 PC26 FET_PWM1
 #endif
-#define FAN1_PIN            5   // D5 PC25 FET_PWM2
+#define FAN1_PIN                               5  // D5 PC25 FET_PWM2
 
 //
 // Misc. Functions
 //
 
 // Internal MicroSD card reader on the PCB
-#define INT_SCK_PIN        42   // D42 PA19/MCCK
-#define INT_MISO_PIN       43   // D43 PA20/MCCDA
-#define INT_MOSI_PIN       73   // D73 PA21/MCDA0
-#define INT_SDSS           55   // D55 PA24/MCDA3
+#define INT_SCK_PIN                           42  // D42 PA19/MCCK
+#define INT_MISO_PIN                          43  // D43 PA20/MCCDA
+#define INT_MOSI_PIN                          73  // D73 PA21/MCDA0
+#define INT_SDSS                              55  // D55 PA24/MCDA3
 
 // External SD card reader on SC2
-#define SCK_PIN            76   // D76 PA27
-#define MISO_PIN           74   // D74 PA25
-#define MOSI_PIN           75   // D75 PA26
-#define SDSS               87   // D87 PA29
+#define SCK_PIN                               76  // D76 PA27
+#define MISO_PIN                              74  // D74 PA25
+#define MOSI_PIN                              75  // D75 PA26
+#define SDSS                                  87  // D87 PA29
 
 // 2MB SPI Flash
-#define SPI_FLASH_SS       52   // D52 PB21
+#define SPI_FLASH_SS                          52  // D52 PB21
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       23   // D24 PA15_CTS1
-  #define LCD_PINS_RS      17   // D17 PA12_RXD1
-  #define LCD_PINS_ENABLE  24   // D23 PA14_RTS1
-  #define LCD_PINS_D4      69   // D69 PA0_CANTX0
-  #define LCD_PINS_D5      54   // D54 PA16_SCK1
-  #define LCD_PINS_D6      68   // D68 PA1_CANRX0
-  #define LCD_PINS_D7      34   // D34 PC2_PWML0
+  #define BEEPER_PIN                          23  // D24 PA15_CTS1
+  #define LCD_PINS_RS                         17  // D17 PA12_RXD1
+  #define LCD_PINS_ENABLE                     24  // D23 PA14_RTS1
+  #define LCD_PINS_D4                         69  // D69 PA0_CANTX0
+  #define LCD_PINS_D5                         54  // D54 PA16_SCK1
+  #define LCD_PINS_D6                         68  // D68 PA1_CANRX0
+  #define LCD_PINS_D7                         34  // D34 PC2_PWML0
 
-  #define SD_DETECT_PIN     2   // D2  PB25_TIOA0
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
 
   #if ENABLED(NEWPANEL)
     // Buttons on AUX-2
-    #define BTN_EN1        60   // D60 PA3_TIOB1
-    #define BTN_EN2        13   // D13 PB27_TIOB0
-    #define BTN_ENC        16   // D16 PA13_TXD1
+    #define BTN_EN1                           60  // D60 PA3_TIOB1
+    #define BTN_EN2                           13  // D13 PB27_TIOB0
+    #define BTN_ENC                           16  // D16 PA13_TXD1
   #endif // NEWPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h
index acd515d8c156..d2114ea4333f 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM2.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM2.h
@@ -52,8 +52,8 @@
 //
 // Servos
 //
-#define SERVO0_PIN         20   // D20 PB12 (Header J20 20)
-#define SERVO1_PIN         21   // D21 PB13 (Header J20 19)
+#define SERVO0_PIN                            20  // D20 PB12 (Header J20 20)
+#define SERVO1_PIN                            21  // D21 PB13 (Header J20 19)
 
 //
 // Limit Switches
@@ -65,83 +65,83 @@
   // Otherwise use a physical endstop based configuration.
 
   // TMC2130 Diag Pins
-  #define X_DIAG_PIN       59   // PA4
-  #define Y_DIAG_PIN       48   // PC15
-  #define Z_DIAG_PIN       36   // PC4
-  #define E0_DIAG_PIN      78   // PB23
-  #define E1_DIAG_PIN      25   // PD0
+  #define X_DIAG_PIN                          59  // PA4
+  #define Y_DIAG_PIN                          48  // PC15
+  #define Z_DIAG_PIN                          36  // PC4
+  #define E0_DIAG_PIN                         78  // PB23
+  #define E1_DIAG_PIN                         25  // PD0
 
   #if X_HOME_DIR < 0
-    #define X_MIN_PIN      X_DIAG_PIN
-    #define X_MAX_PIN      32
+    #define X_MIN_PIN                 X_DIAG_PIN
+    #define X_MAX_PIN                         32
   #else
-    #define X_MIN_PIN      14
-    #define X_MAX_PIN      X_DIAG_PIN
+    #define X_MIN_PIN                         14
+    #define X_MAX_PIN                 X_DIAG_PIN
   #endif
 
   #if Y_HOME_DIR < 0
-    #define Y_MIN_PIN      Y_DIAG_PIN
-    #define Y_MAX_PIN      15
+    #define Y_MIN_PIN                 Y_DIAG_PIN
+    #define Y_MAX_PIN                         15
   #else
-    #define Y_MIN_PIN      29
-    #define Y_MAX_PIN      Y_DIAG_PIN
+    #define Y_MIN_PIN                         29
+    #define Y_MAX_PIN                 Y_DIAG_PIN
   #endif
 
 #else
 
-  #define X_MIN_PIN        14   // PD4 MIN ES1
-  #define X_MAX_PIN        32   // PD10 MAX ES1
-  #define Y_MIN_PIN        29   // PD6 MIN ES2
-  #define Y_MAX_PIN        15   // PD5 MAX ES2
+  #define X_MIN_PIN                           14  // PD4 MIN ES1
+  #define X_MAX_PIN                           32  // PD10 MAX ES1
+  #define Y_MIN_PIN                           29  // PD6 MIN ES2
+  #define Y_MAX_PIN                           15  // PD5 MAX ES2
 
 #endif
 
-#define Z_MIN_PIN          31   // PA7 MIN ES3
-#define Z_MAX_PIN          30   // PD9 MAX ES3
+#define Z_MIN_PIN                             31  // PA7 MIN ES3
+#define Z_MAX_PIN                             30  // PD9 MAX ES3
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         38   // PC6 X-STEP *
-#define X_DIR_PIN          37   // PC5 X-DIR *
-#define X_ENABLE_PIN       41   // PC9 EN1
+#define X_STEP_PIN                            38  // PC6 X-STEP *
+#define X_DIR_PIN                             37  // PC5 X-DIR *
+#define X_ENABLE_PIN                          41  // PC9 EN1
 #ifndef X_CS_PIN
-  #define X_CS_PIN         39   // PC7 X_nCS
+  #define X_CS_PIN                            39  // PC7 X_nCS
 #endif
 
-#define Y_STEP_PIN         51   // PC12 Y-STEP *
-#define Y_DIR_PIN          92   // PC11 Y-DIR -AddOns *
-#define Y_ENABLE_PIN       49   // PC14 Y-EN *
+#define Y_STEP_PIN                            51  // PC12 Y-STEP *
+#define Y_DIR_PIN                             92  // PC11 Y-DIR -AddOns *
+#define Y_ENABLE_PIN                          49  // PC14 Y-EN *
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         50   // PC13 Y_nCS
+  #define Y_CS_PIN                            50  // PC13 Y_nCS
 #endif
 
-#define Z_STEP_PIN         46   // PC17 Z-STEP *
-#define Z_DIR_PIN          47   // PC16 Z-DIR *
-#define Z_ENABLE_PIN       44   // PC19 Z-END *
+#define Z_STEP_PIN                            46  // PC17 Z-STEP *
+#define Z_DIR_PIN                             47  // PC16 Z-DIR *
+#define Z_ENABLE_PIN                          44  // PC19 Z-END *
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         45   // PC18 Z_nCS
+  #define Z_CS_PIN                            45  // PC18 Z_nCS
 #endif
 
-#define E0_STEP_PIN       107   // PB10 E1-STEP -AddOns *
-#define E0_DIR_PIN         96   // PC10 E1-DIR -AddOns *
-#define E0_ENABLE_PIN     105   // PB22 E1-EN -AddOns *
+#define E0_STEP_PIN                          107  // PB10 E1-STEP -AddOns *
+#define E0_DIR_PIN                            96  // PC10 E1-DIR -AddOns *
+#define E0_ENABLE_PIN                        105  // PB22 E1-EN -AddOns *
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN       104   // PC20 E1_nCS -AddOns *
+  #define E0_CS_PIN                          104  // PC20 E1_nCS -AddOns *
 #endif
 
-#define E1_STEP_PIN        22   // PB26 E2_STEP *
-#define E1_DIR_PIN         97   // PB24 E2_DIR -AddOns *
-#define E1_ENABLE_PIN      18   // PA11 E2-EN
+#define E1_STEP_PIN                           22  // PB26 E2_STEP *
+#define E1_DIR_PIN                            97  // PB24 E2_DIR -AddOns *
+#define E1_ENABLE_PIN                         18  // PA11 E2-EN
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        19   // PA10 E2_nCS
+  #define E1_CS_PIN                           19  // PA10 E2_nCS
 #endif
 
 //
@@ -150,106 +150,106 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    28   // PD3
+    #define TMC_SW_MOSI                       28  // PD3
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    26   // PD1
+    #define TMC_SW_MISO                       26  // PD1
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     27   // PD2
+    #define TMC_SW_SCK                        27  // PD2
   #endif
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         10   // D10 PB19 THERM AN1 *
-#define TEMP_1_PIN          9   // D9 PB18 THERM AN2 *
-#define TEMP_2_PIN          8   // D8 PB17 THERM AN4 *
-#define TEMP_BED_PIN       11   // D11 PB20 THERM AN3 *
+#define TEMP_0_PIN                            10  // D10 PB19 THERM AN1 *
+#define TEMP_1_PIN                             9  // D9 PB18 THERM AN2 *
+#define TEMP_2_PIN                             8  // D8 PB17 THERM AN4 *
+#define TEMP_BED_PIN                          11  // D11 PB20 THERM AN3 *
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        6   // D6 PC24 FET_PWM3
-#define HEATER_1_PIN        7   // D7 PC23 FET_PWM4
-#define HEATER_2_PIN        8   // D8 PC22 FET_PWM5
-#define HEATER_BED_PIN      9   // D9 PC21 BED_PWM
+#define HEATER_0_PIN                           6  // D6 PC24 FET_PWM3
+#define HEATER_1_PIN                           7  // D7 PC23 FET_PWM4
+#define HEATER_2_PIN                           8  // D8 PC22 FET_PWM5
+#define HEATER_BED_PIN                         9  // D9 PC21 BED_PWM
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4   // D4 PC26 FET_PWM1
+  #define FAN_PIN                              4  // D4 PC26 FET_PWM1
 #endif
-#define FAN1_PIN            5   // D5 PC25 FET_PWM2
+#define FAN1_PIN                               5  // D5 PC25 FET_PWM2
 
 //
 // Misc. Functions
 //
 
 // Internal MicroSD card reader on the PCB
-#define INT_SCK_PIN        42   // D42 PA19/MCCK
-#define INT_MISO_PIN       43   // D43 PA20/MCCDA
-#define INT_MOSI_PIN       73   // D73 PA21/MCDA0
-#define INT_SDSS           55   // D55 PA24/MCDA3
+#define INT_SCK_PIN                           42  // D42 PA19/MCCK
+#define INT_MISO_PIN                          43  // D43 PA20/MCCDA
+#define INT_MOSI_PIN                          73  // D73 PA21/MCDA0
+#define INT_SDSS                              55  // D55 PA24/MCDA3
 
 // External SD card reader on SC2
-#define SCK_PIN            76   // D76 PA27
-#define MISO_PIN           74   // D74 PA25
-#define MOSI_PIN           75   // D75 PA26
-#define SDSS               87   // D87 PA29
+#define SCK_PIN                               76  // D76 PA27
+#define MISO_PIN                              74  // D74 PA25
+#define MOSI_PIN                              75  // D75 PA26
+#define SDSS                                  87  // D87 PA29
 
 // Unused Digital GPIO J20 Pins
-#define GPIO_PB1_J20_5     94   // D94 PB1 (Header J20 5)
-#define GPIO_PB0_J20_6     95   // D95 PB0 (Header J20 6)
-#define GPIO_PB3_J20_7    103   // D103 PB3 (Header J20 7)
-#define GPIO_PB2_J20_8     93   // D93 PB2 (Header J20 8)
-#define GPIO_PB6_J20_9     99   // D99 PB6 (Header J20 9)
-#define GPIO_PB5_J20_10   101   // D101 PB5 (Header J20 10)
-#define GPIO_PB8_J20_11   100   // D100 PB8 (Header J20 11)
-#define GPIO_PB4_J20_12   102   // D102 PB4 (Header J20 12)
-#define GPIO_PB9_J20_13   108   // D108 PB9 (Header J20 13)
-#define GPIO_PB7_J20_14    98   // D98 PB7 (Header J20 14)
-#define GPIO_PB15_J20_15   66   // D66 PB15 (Header J20 15)
-#define GPIO_PB16_J20_16   67   // D67 PB16 (Header J20 16)
-#define GPIO_PB14_J20_17   53   // D53 PB14 (Header J20 17)
-#define GPIO_PA18_J20_21   71   // D71 PA17 (Header J20 21)
-#define GPIO_PA17_J20_22   70   // D70 PA17 (Header J20 22)
+#define GPIO_PB1_J20_5                        94  // D94 PB1 (Header J20 5)
+#define GPIO_PB0_J20_6                        95  // D95 PB0 (Header J20 6)
+#define GPIO_PB3_J20_7                       103  // D103 PB3 (Header J20 7)
+#define GPIO_PB2_J20_8                        93  // D93 PB2 (Header J20 8)
+#define GPIO_PB6_J20_9                        99  // D99 PB6 (Header J20 9)
+#define GPIO_PB5_J20_10                      101  // D101 PB5 (Header J20 10)
+#define GPIO_PB8_J20_11                      100  // D100 PB8 (Header J20 11)
+#define GPIO_PB4_J20_12                      102  // D102 PB4 (Header J20 12)
+#define GPIO_PB9_J20_13                      108  // D108 PB9 (Header J20 13)
+#define GPIO_PB7_J20_14                       98  // D98 PB7 (Header J20 14)
+#define GPIO_PB15_J20_15                      66  // D66 PB15 (Header J20 15)
+#define GPIO_PB16_J20_16                      67  // D67 PB16 (Header J20 16)
+#define GPIO_PB14_J20_17                      53  // D53 PB14 (Header J20 17)
+#define GPIO_PA18_J20_21                      71  // D71 PA17 (Header J20 21)
+#define GPIO_PA17_J20_22                      70  // D70 PA17 (Header J20 22)
 
 // Case Light
 
-#define CASE_LIGHT_PIN     GPIO_PB1_J20_5
+#define CASE_LIGHT_PIN            GPIO_PB1_J20_5
 
 // 2MB SPI Flash
-#define SPI_FLASH_SS       52   // D52 PB21
+#define SPI_FLASH_SS                          52  // D52 PB21
 
 //
 // Filament Runout Sensor
 //
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN GPIO_PB15_J20_15
+  #define FIL_RUNOUT_PIN        GPIO_PB15_J20_15
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN GPIO_PB16_J20_16
+  #define FIL_RUNOUT2_PIN       GPIO_PB16_J20_16
 #endif
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
-  #define BEEPER_PIN       23   // D24 PA15_CTS1
-  #define LCD_PINS_RS      17   // D17 PA12_RXD1
-  #define LCD_PINS_ENABLE  24   // D23 PA14_RTS1
-  #define LCD_PINS_D4      69   // D69 PA0_CANTX0
-  #define LCD_PINS_D5      54   // D54 PA16_SCK1
-  #define LCD_PINS_D6      68   // D68 PA1_CANRX0
-  #define LCD_PINS_D7      34   // D34 PC2_PWML0
+  #define BEEPER_PIN                          23  // D24 PA15_CTS1
+  #define LCD_PINS_RS                         17  // D17 PA12_RXD1
+  #define LCD_PINS_ENABLE                     24  // D23 PA14_RTS1
+  #define LCD_PINS_D4                         69  // D69 PA0_CANTX0
+  #define LCD_PINS_D5                         54  // D54 PA16_SCK1
+  #define LCD_PINS_D6                         68  // D68 PA1_CANRX0
+  #define LCD_PINS_D7                         34  // D34 PC2_PWML0
 
-  #define SD_DETECT_PIN     2   // D2  PB25_TIOA0
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
 
   #if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL || ENABLED(TOUCH_UI_FTDI_EVE)
     // Buttons on AUX-2
-    #define BTN_EN1        60   // D60 PA3_TIOB1
-    #define BTN_EN2        13   // D13 PB27_TIOB0
-    #define BTN_ENC        16   // D16 PA13_TXD1 // the click
+    #define BTN_EN1                           60  // D60 PA3_TIOB1
+    #define BTN_EN2                           13  // D13 PB27_TIOB0
+    #define BTN_ENC                           16  // D16 PA13_TXD1 // the click
   #endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
index 69fb2a3dfc52..f23d008bec50 100644
--- a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
+++ b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
@@ -33,91 +33,91 @@
 //
 // Servos
 //
-#define SERVO0_PIN          6
+#define SERVO0_PIN                             6
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         39
-#define Z_STOP_PIN         62
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            39
+#define Z_STOP_PIN                            62
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          25
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             25
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN          12
-#define Y_ENABLE_PIN       15
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                             12
+#define Y_ENABLE_PIN                          15
 
-#define Z_STEP_PIN         24
-#define Z_DIR_PIN          27
-#define Z_ENABLE_PIN       28
+#define Z_STEP_PIN                            24
+#define Z_DIR_PIN                             27
+#define Z_ENABLE_PIN                          28
 
-#define E0_STEP_PIN        64
-#define E0_DIR_PIN         65
-#define E0_ENABLE_PIN      63
+#define E0_STEP_PIN                           64
+#define E0_DIR_PIN                            65
+#define E0_ENABLE_PIN                         63
 
-#define E1_STEP_PIN         8
-#define E1_DIR_PIN          7
-#define E1_ENABLE_PIN      29
+#define E1_STEP_PIN                            8
+#define E1_DIR_PIN                             7
+#define E1_ENABLE_PIN                         29
 
 //
 // Temperature Sensors
 // Analog Inputs
 //
-#define TEMP_0_PIN          1
-#define TEMP_1_PIN          2
-#define TEMP_BED_PIN        4
+#define TEMP_0_PIN                             1
+#define TEMP_1_PIN                             2
+#define TEMP_BED_PIN                           4
 
 #ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN  5
+  #define TEMP_CHAMBER_PIN                     5
 #endif
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        3
-#define HEATER_1_PIN        4
-#define HEATER_BED_PIN     32
-#define HEATER_CHAMBER_PIN 33
+#define HEATER_0_PIN                           3
+#define HEATER_1_PIN                           4
+#define HEATER_BED_PIN                        32
+#define HEATER_CHAMBER_PIN                    33
 
 //
 // Fans
 //
-//#define FAN0_PIN              8
-#define ORIG_E0_AUTO_FAN_PIN 30
-#define ORIG_E1_AUTO_FAN_PIN 30
-#define ORIG_E2_AUTO_FAN_PIN 30
-#define ORIG_E3_AUTO_FAN_PIN 30
-#define ORIG_CHAMBER_AUTO_FAN_PIN 10
+//#define FAN0_PIN                             8
+#define ORIG_E0_AUTO_FAN_PIN                  30
+#define ORIG_E1_AUTO_FAN_PIN                  30
+#define ORIG_E2_AUTO_FAN_PIN                  30
+#define ORIG_E3_AUTO_FAN_PIN                  30
+#define ORIG_CHAMBER_AUTO_FAN_PIN             10
 
 //
 // SD card
 //
-#define SCK_PIN            76
-#define MISO_PIN           74
-#define MOSI_PIN           75
-#define SDSS               53
-#define SD_DETECT_PIN      40
+#define SCK_PIN                               76
+#define MISO_PIN                              74
+#define MOSI_PIN                              75
+#define SDSS                                  53
+#define SD_DETECT_PIN                         40
 
 // Common I/O
 
-//#define PWM_1_PIN           6 // probe
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
-#define BEEPER_PIN         13
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   31
+//#define PWM_1_PIN                            6  // probe
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
+#define BEEPER_PIN                            13
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      31
 
 // G425 CALIBRATION_GCODE default pin
 #ifndef CALIBRATION_PIN
-  #define CALIBRATION_PIN  66
+  #define CALIBRATION_PIN                     66
 #endif
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h
index 4f352ff1523e..8f1fb750122f 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM.h
@@ -34,138 +34,138 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          6
-#define SERVO2_PIN         13
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                            13
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          38
-#define X_MAX_PIN          36
-#define Y_MIN_PIN          34
-#define Y_MAX_PIN          32
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          28
+#define X_MIN_PIN                             38
+#define X_MAX_PIN                             36
+#define Y_MIN_PIN                             34
+#define Y_MAX_PIN                             32
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             28
 
 //
 // Steppers
 //
-#define X_STEP_PIN          2
-#define X_DIR_PIN           3
-#define X_ENABLE_PIN       22
+#define X_STEP_PIN                             2
+#define X_DIR_PIN                              3
+#define X_ENABLE_PIN                          22
 
-#define Y_STEP_PIN         17
-#define Y_DIR_PIN          16
-#define Y_ENABLE_PIN       26
+#define Y_STEP_PIN                            17
+#define Y_DIR_PIN                             16
+#define Y_ENABLE_PIN                          26
 
-#define Z_STEP_PIN         61   // Z1 STP
-#define Z_DIR_PIN          60   // Z1 DIR
-#define Z_ENABLE_PIN       15   // Z1 ENA
+#define Z_STEP_PIN                            61  // Z1 STP
+#define Z_DIR_PIN                             60  // Z1 DIR
+#define Z_ENABLE_PIN                          15  // Z1 ENA
 
-#define E0_STEP_PIN        64   // Z2 STP
-#define E0_DIR_PIN         63   // Z2 DIR
-#define E0_ENABLE_PIN      62   // Z2 ENA
+#define E0_STEP_PIN                           64  // Z2 STP
+#define E0_DIR_PIN                            63  // Z2 DIR
+#define E0_ENABLE_PIN                         62  // Z2 ENA
 
-#define E1_STEP_PIN        51   // E1 STP
-#define E1_DIR_PIN         53   // E1 DIR
-#define E1_ENABLE_PIN      65   // E1 ENA
+#define E1_STEP_PIN                           51  // E1 STP
+#define E1_DIR_PIN                            53  // E1 DIR
+#define E1_ENABLE_PIN                         65  // E1 ENA
 
-#define E2_STEP_PIN        24   // E2 STP
-#define E2_DIR_PIN         23   // E2 DIR
-#define E2_ENABLE_PIN      49   // E2 ENA
+#define E2_STEP_PIN                           24  // E2 STP
+#define E2_DIR_PIN                            23  // E2 DIR
+#define E2_ENABLE_PIN                         49  // E2 ENA
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (HOTEND0 thermistor)
-#define TEMP_1_PIN          2   // Analog Input (HOTEND1 thermistor)
-#define TEMP_2_PIN          5   // Analog Input (unused)
-#define TEMP_BED_PIN        1   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                             0  // Analog Input (HOTEND0 thermistor)
+#define TEMP_1_PIN                             2  // Analog Input (HOTEND1 thermistor)
+#define TEMP_2_PIN                             5  // Analog Input (unused)
+#define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   -1
+  #define MAX6675_SS_PIN                      -1
 #else
-  #define MAX6675_SS_PIN   -1
+  #define MAX6675_SS_PIN                      -1
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        7   // HOTEND0 MOSFET
-#define HEATER_1_PIN        8   // HOTEND1 MOSFET
-#define HEATER_BED_PIN     39   // BED MOSFET
+#define HEATER_0_PIN                           7  // HOTEND0 MOSFET
+#define HEATER_1_PIN                           8  // HOTEND1 MOSFET
+#define HEATER_BED_PIN                        39  // BED MOSFET
 
 #ifndef FAN_PIN
-  #define FAN_PIN          11   // FAN1 header on board - PRINT FAN
+  #define FAN_PIN                             11  // FAN1 header on board - PRINT FAN
 #endif
-#define FAN1_PIN            9   // FAN2 header on board - CONTROLLER FAN
-#define FAN2_PIN           12   // FAN3 header on board - EXTRUDER0 FAN
+#define FAN1_PIN                               9  // FAN2 header on board - CONTROLLER FAN
+#define FAN2_PIN                              12  // FAN3 header on board - EXTRUDER0 FAN
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define PS_ON_PIN          40
+#define SDSS                                   4
+#define PS_ON_PIN                             40
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
 
-  #define LCD_PINS_RS       42
-  #define LCD_PINS_ENABLE   43
-  #define LCD_PINS_D4       44
-  #define LCD_PINS_D5       45
-  #define LCD_PINS_D6       46
-  #define LCD_PINS_D7       47
+  #define LCD_PINS_RS                         42
+  #define LCD_PINS_ENABLE                     43
+  #define LCD_PINS_D4                         44
+  #define LCD_PINS_D5                         45
+  #define LCD_PINS_D6                         46
+  #define LCD_PINS_D7                         47
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(RADDS_DISPLAY)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define BTN_BACK        71
+    #define BTN_BACK                          71
 
     #undef SDSS
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
-    #define BEEPER_PIN      41
-    #define LCD_SDSS         4
-    #define SD_DETECT_PIN   14
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
+    #define BEEPER_PIN                        41
+    #define LCD_SDSS                           4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
-    #define LCD_PINS_D4     29
-    #define LCD_PINS_ENABLE 27
-    #define LCD_PINS_RS     25
+    #define LCD_PINS_D4                       29
+    #define LCD_PINS_ENABLE                   27
+    #define LCD_PINS_RS                       25
 
-    #define BTN_EN1         35
-    #define BTN_EN2         33
-    #define BTN_ENC         37
+    #define BTN_EN1                           35
+    #define BTN_EN2                           33
+    #define BTN_ENC                           37
 
-    #define BEEPER_PIN      -1
+    #define BEEPER_PIN                        -1
   #endif // SPARK_FULL_GRAPHICS
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index 240204ced958..34706d5e90ac 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -34,141 +34,141 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          6
-#define SERVO2_PIN          8   // 4-pin header FAN0
-#define SERVO3_PIN         -1
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             8  // 4-pin header FAN0
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          38
-#define X_MAX_PIN          -1
-#define Y_MIN_PIN          34
-#define Y_MAX_PIN          -1
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                             38
+#define X_MAX_PIN                             -1
+#define Y_MIN_PIN                             34
+#define Y_MAX_PIN                             -1
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         17
-#define X_DIR_PIN          16
-#define X_ENABLE_PIN       22
+#define X_STEP_PIN                            17
+#define X_DIR_PIN                             16
+#define X_ENABLE_PIN                          22
 
-#define Y_STEP_PIN          2
-#define Y_DIR_PIN           3
-#define Y_ENABLE_PIN       26
+#define Y_STEP_PIN                             2
+#define Y_DIR_PIN                              3
+#define Y_ENABLE_PIN                          26
 
-#define Z_STEP_PIN         64
-#define Z_DIR_PIN          63
-#define Z_ENABLE_PIN       15
+#define Z_STEP_PIN                            64
+#define Z_DIR_PIN                             63
+#define Z_ENABLE_PIN                          15
 
-#define E0_STEP_PIN        61
-#define E0_DIR_PIN         60
-#define E0_ENABLE_PIN      62
+#define E0_STEP_PIN                           61
+#define E0_DIR_PIN                            60
+#define E0_ENABLE_PIN                         62
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (HOTEND0 thermistor)
-#define TEMP_1_PIN          2   // Analog Input (unused)
-#define TEMP_2_PIN          5   // Analog Input (OnBoard thermistor beta 3950)
-#define TEMP_BED_PIN        1   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                             0  // Analog Input (HOTEND0 thermistor)
+#define TEMP_1_PIN                             2  // Analog Input (unused)
+#define TEMP_2_PIN                             5  // Analog Input (OnBoard thermistor beta 3950)
+#define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13   // HOTEND0 MOSFET
-#define HEATER_BED_PIN      7   // BED MOSFET
+#define HEATER_0_PIN                          13  // HOTEND0 MOSFET
+#define HEATER_BED_PIN                         7  // BED MOSFET
 
 #ifndef FAN_PIN
-  #define FAN_PIN          11   // FAN1 header on board - PRINT FAN
+  #define FAN_PIN                             11  // FAN1 header on board - PRINT FAN
 #endif
-#define FAN1_PIN           12   // FAN2 header on board - CONTROLLER FAN
-#define FAN2_PIN            9   // FAN3 header on board - EXTRUDER0 FAN
-//#define FAN3_PIN          8   // FAN0 4-pin header on board
+#define FAN1_PIN                              12  // FAN2 header on board - CONTROLLER FAN
+#define FAN2_PIN                               9  // FAN3 header on board - EXTRUDER0 FAN
+//#define FAN3_PIN                             8  // FAN0 4-pin header on board
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define PS_ON_PIN          40
+#define SDSS                                   4
+#define PS_ON_PIN                             40
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
 
-  #define LCD_PINS_RS       42
-  #define LCD_PINS_ENABLE   43
-  #define LCD_PINS_D4       44
-  #define LCD_PINS_D5       45
-  #define LCD_PINS_D6       46
-  #define LCD_PINS_D7       47
+  #define LCD_PINS_RS                         42
+  #define LCD_PINS_ENABLE                     43
+  #define LCD_PINS_D4                         44
+  #define LCD_PINS_D5                         45
+  #define LCD_PINS_D6                         46
+  #define LCD_PINS_D7                         47
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(RADDS_DISPLAY)
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define BTN_BACK        71
+    #define BTN_BACK                          71
 
     #undef SDSS
-    #define SDSS             4
-    #define SD_DETECT_PIN   14
+    #define SDSS                               4
+    #define SD_DETECT_PIN                     14
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
-    #define BEEPER_PIN      41
-    #define LCD_SDSS         4
-    #define SD_DETECT_PIN   14
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
+    #define BEEPER_PIN                        41
+    #define LCD_SDSS                           4
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
-    #define LCD_PINS_D4     29
-    #define LCD_PINS_ENABLE 27
-    #define LCD_PINS_RS     25
+    #define LCD_PINS_D4                       29
+    #define LCD_PINS_ENABLE                   27
+    #define LCD_PINS_RS                       25
 
-    #define BTN_EN1         35
-    #define BTN_EN2         33
-    #define BTN_ENC         37
+    #define BTN_EN1                           35
+    #define BTN_EN2                           33
+    #define BTN_ENC                           37
 
-    #define BEEPER_PIN      -1
+    #define BEEPER_PIN                        -1
 
    #elif ENABLED(MINIPANEL)
-    #define BTN_EN1         52
-    #define BTN_EN2         50
-    #define BTN_ENC         48
-    #define LCD_SDSS        4
-    #define SD_DETECT_PIN   14
-    #define BEEPER_PIN      41
-    #define DOGLCD_A0       46
-    #define DOGLCD_CS       45
+    #define BTN_EN1                           52
+    #define BTN_EN2                           50
+    #define BTN_ENC                           48
+    #define LCD_SDSS                           4
+    #define SD_DETECT_PIN                     14
+    #define BEEPER_PIN                        41
+    #define DOGLCD_A0                         46
+    #define DOGLCD_CS                         45
 
   #endif // SPARK_FULL_GRAPHICS
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
index c05c6169d6d3..b3a9e456a29e 100644
--- a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
+++ b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
@@ -36,38 +36,38 @@
 //
 // Servos
 //
-//#define SERVO0_PIN       -1
-//#define SERVO1_PIN       -1
+//#define SERVO0_PIN                          -1
+//#define SERVO1_PIN                          -1
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22   // PB26
-#define Y_MAX_PIN          18   // PA11
-#define Z_MIN_PIN          19   // PA10
+#define X_MIN_PIN                             22  // PB26
+#define Y_MAX_PIN                             18  // PA11
+#define Z_MIN_PIN                             19  // PA10
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  22
+  #define Z_MIN_PROBE_PIN                     22
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  //#define FIL_RUNOUT_PIN 57   // PA22
+  //#define FIL_RUNOUT_PIN                    57  // PA22
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  //#define FIL_RUNOUT2_PIN 21  // PB13
+  //#define FIL_RUNOUT2_PIN                   21  // PB13
 #endif
 
 //
 // LED defines
 //
-//#define NEOPIXEL_TYPE    NEO_GRBW   // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
-//#define NEOPIXEL_PIN     20   // LED driving pin on motherboard
-//#define NEOPIXEL_PIXELS   3   // Number of LEDs in the strip
-//#define SDA0             20   // PB12 NeoPixel pin I2C data
-//#define SCL0             21   // PB13              I2C clock
+//#define NEOPIXEL_TYPE                 NEO_GRBW  // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
+//#define NEOPIXEL_PIN                        20  // LED driving pin on motherboard
+//#define NEOPIXEL_PIXELS                      3  // Number of LEDs in the strip
+//#define SDA0                                20  // PB12 NeoPixel pin I2C data
+//#define SCL0                                21  // PB13              I2C clock
 
 // D0_12 #REF! (INDICATOR_LED)
 // B28 JTAG-CLK
@@ -79,82 +79,82 @@
 //A15 UART_CTS
 //PB2 Unassigned
 //PB4 to PB9 Unassigned
-//#define UART_RX_PIN         0   // PA8    "RX0"
-//#define UART_TX_PIN         1   // PA9    "TX0"
-//#define UART_RTS_PIN       23   // PA14
-//#define UART_CTS_PIN       24   // PA15
+//#define UART_RX_PIN                          0  // PA8    "RX0"
+//#define UART_TX_PIN                          1  // PA9    "TX0"
+//#define UART_RTS_PIN                        23  // PA14
+//#define UART_CTS_PIN                        24  // PA15
 
 //
 // Steppers
 //
-#define Z_STEP_PIN         73   // PA21      MOTOR 1
-#define Z_DIR_PIN          75   // PA26
-#define Z_ENABLE_PIN       74   // PA25
+#define Z_STEP_PIN                            73  // PA21      MOTOR 1
+#define Z_DIR_PIN                             75  // PA26
+#define Z_ENABLE_PIN                          74  // PA25
 
-#define X_STEP_PIN         66   // PB15      MOTOR 2
-#define X_DIR_PIN          54   // PA16
-#define X_ENABLE_PIN       67   // PB16
+#define X_STEP_PIN                            66  // PB15      MOTOR 2
+#define X_DIR_PIN                             54  // PA16
+#define X_ENABLE_PIN                          67  // PB16
 
-#define Y_STEP_PIN         34   // PA29      MOTOR 3
-#define Y_DIR_PIN          35   // PB1
-#define Y_ENABLE_PIN       36   // PB0
+#define Y_STEP_PIN                            34  // PA29      MOTOR 3
+#define Y_DIR_PIN                             35  // PB1
+#define Y_ENABLE_PIN                          36  // PB0
 
-#define E0_STEP_PIN        53   // PB14      MOTOR 4
-#define E0_DIR_PIN         78   // PB23
-#define E0_ENABLE_PIN      37   // PB22
+#define E0_STEP_PIN                           53  // PB14      MOTOR 4
+#define E0_DIR_PIN                            78  // PB23
+#define E0_ENABLE_PIN                         37  // PB22
 
 // Microstepping mode pins
-#define Z_MS1_PIN          52   // PB21 MODE0     MOTOR 1
-#define Z_MS2_PIN          52   // PB21 MODE1
-#define Z_MS3_PIN          65   // PB20 MODE2
+#define Z_MS1_PIN                             52  // PB21 MODE0     MOTOR 1
+#define Z_MS2_PIN                             52  // PB21 MODE1
+#define Z_MS3_PIN                             65  // PB20 MODE2
 
-#define X_MS1_PIN          43   // PA20 MODE0     MOTOR 2
-#define X_MS2_PIN          43   // PA20 MODE1
-#define X_MS3_PIN          42   // PA19 MODE2
+#define X_MS1_PIN                             43  // PA20 MODE0     MOTOR 2
+#define X_MS2_PIN                             43  // PA20 MODE1
+#define X_MS3_PIN                             42  // PA19 MODE2
 
-#define Y_MS1_PIN          77   // PA28 MODE0     MOTOR 3
-#define Y_MS2_PIN          77   // PA28 MODE1
-#define Y_MS3_PIN          76   // PA27 MODE2
+#define Y_MS1_PIN                             77  // PA28 MODE0     MOTOR 3
+#define Y_MS2_PIN                             77  // PA28 MODE1
+#define Y_MS3_PIN                             76  // PA27 MODE2
 
-#define E0_MS1_PIN         38   // PB11 MODE0     MOTOR 4
-#define E0_MS2_PIN         38   // PB11 MODE1
-#define E0_MS3_PIN         39   // PB10 MODE2
+#define E0_MS1_PIN                            38  // PB11 MODE0     MOTOR 4
+#define E0_MS2_PIN                            38  // PB11 MODE1
+#define E0_MS3_PIN                            39  // PB10 MODE2
 
 // Motor current PWM pins
-#define MOTOR_CURRENT_PWM_X_PIN 62 // PB17        MOTOR 1
-#define MOTOR_CURRENT_PWM_Z_PIN 63 // PB18        MOTOR 2
-#define MOTOR_CURRENT_PWM_Y_PIN 64 // PB19        MOTOR 3
-#define MOTOR_CURRENT_PWM_E_PIN 61 // PA2         MOTOR 4
+#define MOTOR_CURRENT_PWM_X_PIN               62  // PB17        MOTOR 1
+#define MOTOR_CURRENT_PWM_Z_PIN               63  // PB18        MOTOR 2
+#define MOTOR_CURRENT_PWM_Y_PIN               64  // PB19        MOTOR 3
+#define MOTOR_CURRENT_PWM_E_PIN               61  // PA2         MOTOR 4
 
 #define DEFAULT_PWM_MOTOR_CURRENT { 300, 400, 1000}  // XY Z E0, 1000 = 1000mAh
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // digital 56 PA23
-#define TEMP_BED_PIN        5   // digital 59 PA4
+#define TEMP_0_PIN                             2  // digital 56 PA23
+#define TEMP_BED_PIN                           5  // digital 59 PA4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       40   // PA5
-#define HEATER_BED_PIN     41   // PB24
+#define HEATER_0_PIN                          40  // PA5
+#define HEATER_BED_PIN                        41  // PB24
 
 #ifndef FAN_PIN
-  #define FAN_PIN          13   //  PB27 Fan1A
+  #define FAN_PIN                             13  //  PB27 Fan1A
 #endif
-#define FAN1_PIN           58   //  PA6  Fan1B
+#define FAN1_PIN                              58  //  PA6  Fan1B
 
-#define FET_SAFETY_PIN     31   // PA7  must be pulsed low every 50 mS or FETs are turned off
-#define FET_SAFETY_DELAY   50   // 50 mS delay between pulses
-#define FET_SAFETY_INVERTED true // true - negative going pulse of 2 uS
+#define FET_SAFETY_PIN                        31  // PA7  must be pulsed low every 50 mS or FETs are turned off
+#define FET_SAFETY_DELAY                      50  // 50 mS delay between pulses
+#define FET_SAFETY_INVERTED true                  // true - negative going pulse of 2 uS
 
 /////////////////////////////////////////////////////////
 
-#define MISO_PIN           68   // set to unused pins for now
-#define MOSI_PIN           69   // set to unused pins for now
-#define SCK_PIN            70   // set to unused pins for now
-#define SDSS               71   // set to unused pins for now
+#define MISO_PIN                              68  // set to unused pins for now
+#define MOSI_PIN                              69  // set to unused pins for now
+#define SCK_PIN                               70  // set to unused pins for now
+#define SDSS                                  71  // set to unused pins for now
 
 /**
  * G2 uses 8 pins that are not available in the DUE environment:
diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
index 41daba4e8e03..3bc52e9387df 100644
--- a/Marlin/src/pins/sam/pins_RADDS.h
+++ b/Marlin/src/pins/sam/pins_RADDS.h
@@ -35,187 +35,187 @@
 // Servos
 //
 #if !HAS_CUTTER
-  #define SERVO0_PIN        5
+  #define SERVO0_PIN                           5
 #endif
-#define SERVO1_PIN          6
-#define SERVO2_PIN         39
-#define SERVO3_PIN         40
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                            39
+#define SERVO3_PIN                            40
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          28
-#define X_MAX_PIN          34
-#define Y_MIN_PIN          30
-#define Y_MAX_PIN          36
-#define Z_MIN_PIN          32
-#define Z_MAX_PIN          38
+#define X_MIN_PIN                             28
+#define X_MAX_PIN                             34
+#define Y_MIN_PIN                             30
+#define Y_MAX_PIN                             36
+#define Z_MIN_PIN                             32
+#define Z_MAX_PIN                             38
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  38
+  #define Z_MIN_PROBE_PIN                     38
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         24
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            24
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          26
 #ifndef X_CS_PIN
-  #define X_CS_PIN         25
+  #define X_CS_PIN                            25
 #endif
 
-#define Y_STEP_PIN         17
-#define Y_DIR_PIN          16
-#define Y_ENABLE_PIN       22
+#define Y_STEP_PIN                            17
+#define Y_DIR_PIN                             16
+#define Y_ENABLE_PIN                          22
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         27
+  #define Y_CS_PIN                            27
 #endif
 
-#define Z_STEP_PIN          2
-#define Z_DIR_PIN           3
-#define Z_ENABLE_PIN       15
+#define Z_STEP_PIN                             2
+#define Z_DIR_PIN                              3
+#define Z_ENABLE_PIN                          15
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         29
+  #define Z_CS_PIN                            29
 #endif
 
-#define E0_STEP_PIN        61
-#define E0_DIR_PIN         60
-#define E0_ENABLE_PIN      62
+#define E0_STEP_PIN                           61
+#define E0_DIR_PIN                            60
+#define E0_ENABLE_PIN                         62
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        31
+  #define E0_CS_PIN                           31
 #endif
 
-#define E1_STEP_PIN        64
-#define E1_DIR_PIN         63
-#define E1_ENABLE_PIN      65
+#define E1_STEP_PIN                           64
+#define E1_DIR_PIN                            63
+#define E1_ENABLE_PIN                         65
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        33
+  #define E1_CS_PIN                           33
 #endif
 
-#define E2_STEP_PIN        51
-#define E2_DIR_PIN         53
-#define E2_ENABLE_PIN      49
+#define E2_STEP_PIN                           51
+#define E2_DIR_PIN                            53
+#define E2_ENABLE_PIN                         49
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        35
+  #define E2_CS_PIN                           35
 #endif
 
 /**
  * RADDS Extension Board V2 / V3
  * http://doku.radds.org/dokumentation/extension-board
  */
-//#define RADDS_EXTENSION 2
+//#define RADDS_EXTENSION                      2
 #if RADDS_EXTENSION >= 2
-  #define E3_DIR_PIN       33
-  #define E3_STEP_PIN      35
-  #define E3_ENABLE_PIN    37
+  #define E3_DIR_PIN                          33
+  #define E3_STEP_PIN                         35
+  #define E3_ENABLE_PIN                       37
   #ifndef E3_CS_PIN
-    #define E3_CS_PIN       6
+    #define E3_CS_PIN                          6
   #endif
 
   #if RADDS_EXTENSION == 3
 
-    #define E4_DIR_PIN     27
-    #define E4_STEP_PIN    29
-    #define E4_ENABLE_PIN  31
+    #define E4_DIR_PIN                        27
+    #define E4_STEP_PIN                       29
+    #define E4_ENABLE_PIN                     31
     #ifndef E4_CS_PIN
-      #define E4_CS_PIN    39
+      #define E4_CS_PIN                       39
     #endif
 
-    #define E5_DIR_PIN     66
-    #define E5_STEP_PIN    67
-    #define E5_ENABLE_PIN  68
+    #define E5_DIR_PIN                        66
+    #define E5_STEP_PIN                       67
+    #define E5_ENABLE_PIN                     68
     #ifndef E5_CS_PIN
-      #define E5_CS_PIN     6
+      #define E5_CS_PIN                        6
     #endif
 
-    #define RADDS_EXT_MSI_PIN 69
+    #define RADDS_EXT_MSI_PIN                 69
 
     #define BOARD_INIT() OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH)
 
   #else
 
-    #define E4_DIR_PIN     27
-    #define E4_STEP_PIN    29
-    #define E4_ENABLE_PIN  31
+    #define E4_DIR_PIN                        27
+    #define E4_STEP_PIN                       29
+    #define E4_ENABLE_PIN                     31
     #ifndef E4_CS_PIN
-      #define E4_CS_PIN    39
+      #define E4_CS_PIN                       39
     #endif
 
     // E3 and E4 share the same MSx pins
-    #define E3_MS1_PIN     67
-    #define E4_MS1_PIN     67
-    #define E3_MS2_PIN     68
-    #define E4_MS2_PIN     68
-    #define E3_MS3_PIN     69
-    #define E4_MS3_PIN     69
+    #define E3_MS1_PIN                        67
+    #define E4_MS1_PIN                        67
+    #define E3_MS2_PIN                        68
+    #define E4_MS2_PIN                        68
+    #define E3_MS3_PIN                        69
+    #define E4_MS3_PIN                        69
 
-    #define RADDS_EXT_VDD2_PIN 66
+    #define RADDS_EXT_VDD2_PIN                66
 
     #define BOARD_INIT() do{ OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH); OUT_WRITE(RADDS_EXT_VDD2_PIN, HIGH); }while(0)
 
   #endif
 
-  #define RADDS_EXT_VDD_PIN 25
+  #define RADDS_EXT_VDD_PIN                   25
 
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_2_PIN          2   // Analog Input
-#define TEMP_3_PIN          3   // Analog Input
-#define TEMP_4_PIN          5   // dummy so will compile when PINS_DEBUGGING is enabled
-#define TEMP_BED_PIN        4   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_2_PIN                             2  // Analog Input
+#define TEMP_3_PIN                             3  // Analog Input
+#define TEMP_4_PIN                             5  // dummy so will compile when PINS_DEBUGGING is enabled
+#define TEMP_BED_PIN                           4  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13
-#define HEATER_1_PIN       12
-#define HEATER_2_PIN       11
+#define HEATER_0_PIN                          13
+#define HEATER_1_PIN                          12
+#define HEATER_2_PIN                          11
 #if !HAS_CUTTER
-  #define HEATER_BED_PIN    7   // BED
+  #define HEATER_BED_PIN                       7  // BED
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
-#define FAN1_PIN            8
+#define FAN1_PIN                               8
 
 //
 // Misc. Functions
 //
-#define SD_DETECT_PIN      14
-#define PS_ON_PIN          40   // SERVO3_PIN
+#define SD_DETECT_PIN                         14
+#define PS_ON_PIN                             40  // SERVO3_PIN
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   39   // SERVO2_PIN
+  #define FIL_RUNOUT_PIN                      39  // SERVO2_PIN
 #endif
 
 #define I2C_EEPROM
-#define E2END 0x1FFF // 8KB
+#define E2END 0x1FFF                              // 8KB
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
   #if !NUM_SERVOS
-    #define SPINDLE_LASER_PWM_PIN  5   // SERVO0_PIN
+    #define SPINDLE_LASER_PWM_PIN              5  // SERVO0_PIN
   #endif
-  #define SPINDLE_LASER_ENA_PIN    7   // HEATER_BED_PIN - Pullup/down!
+  #define SPINDLE_LASER_ENA_PIN                7  // HEATER_BED_PIN - Pullup/down!
 #endif
 
 //
@@ -225,65 +225,65 @@
 
   #if ENABLED(RADDS_DISPLAY)
 
-    #define LCD_PINS_RS     42
-    #define LCD_PINS_ENABLE 43
-    #define LCD_PINS_D4     44
-    #define LCD_PINS_D5     45
-    #define LCD_PINS_D6     46
-    #define LCD_PINS_D7     47
+    #define LCD_PINS_RS                       42
+    #define LCD_PINS_ENABLE                   43
+    #define LCD_PINS_D4                       44
+    #define LCD_PINS_D5                       45
+    #define LCD_PINS_D6                       46
+    #define LCD_PINS_D7                       47
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define BTN_BACK        71
+    #define BTN_BACK                          71
 
-    #define SDSS            10
-    #define SD_DETECT_PIN   14
+    #define SDSS                              10
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
     // The REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER requires
     // an adapter such as https://www.thingiverse.com/thing:1740725
 
-    #define LCD_PINS_RS     42
-    #define LCD_PINS_ENABLE 43
-    #define LCD_PINS_D4     44
+    #define LCD_PINS_RS                       42
+    #define LCD_PINS_ENABLE                   43
+    #define LCD_PINS_D4                       44
 
-    #define BEEPER_PIN      41
+    #define BEEPER_PIN                        41
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
 
-    #define SDSS            10
-    #define SD_DETECT_PIN   14
+    #define SDSS                              10
+    #define SD_DETECT_PIN                     14
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BTN_EN1         50
-    #define BTN_EN2         52
-    #define BTN_ENC         48
-    #define BEEPER_PIN      41
-    #define LCD_SDSS        10
-    #define SD_DETECT_PIN   14
+    #define BTN_EN1                           50
+    #define BTN_EN2                           52
+    #define BTN_ENC                           48
+    #define BEEPER_PIN                        41
+    #define LCD_SDSS                          10
+    #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
-    #define LCD_PINS_D4     29
-    #define LCD_PINS_ENABLE 27
-    #define LCD_PINS_RS     25
+    #define LCD_PINS_D4                       29
+    #define LCD_PINS_ENABLE                   27
+    #define LCD_PINS_RS                       25
 
-    #define BTN_EN1         35
-    #define BTN_EN2         33
-    #define BTN_ENC         37
+    #define BTN_EN1                           35
+    #define BTN_EN2                           33
+    #define BTN_ENC                           37
 
   #endif // SPARK_FULL_GRAPHICS
 
 #endif // HAS_SPI_LCD
 
 #ifndef SDSS
-  #define SDSS              4
+  #define SDSS                                 4
 #endif
diff --git a/Marlin/src/pins/sam/pins_RAMPS_DUO.h b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
index d25ef9e059ff..916dbf64309e 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_DUO.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
@@ -56,20 +56,20 @@
 // Temperature Sensors
 //
 #undef TEMP_0_PIN
-#define TEMP_0_PIN          9   // Analog Input
+#define TEMP_0_PIN                             9  // Analog Input
 
 #undef TEMP_1_PIN
-#define TEMP_1_PIN         11   // Analog Input
+#define TEMP_1_PIN                            11  // Analog Input
 
 #undef TEMP_BED_PIN
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   69   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      69  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   69   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      69  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -79,13 +79,13 @@
 
   #if BOTH(NEWPANEL, PANEL_ONE)
     #undef LCD_PINS_D4
-    #define LCD_PINS_D4  68
+    #define LCD_PINS_D4                       68
 
     #undef LCD_PINS_D5
-    #define LCD_PINS_D5  69
+    #define LCD_PINS_D5                       69
 
     #undef LCD_PINS_D7
-    #define LCD_PINS_D7  67
+    #define LCD_PINS_D7                       67
   #endif
 
   #if ENABLED(NEWPANEL)
@@ -93,36 +93,36 @@
     #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
       #undef BTN_EN1
-      #define BTN_EN1 67
+      #define BTN_EN1                         67
 
       #undef BTN_ENC
-      #define BTN_ENC 66
+      #define BTN_ENC                         66
 
     #elif ENABLED(MINIPANEL)
 
       #undef DOGLCD_CS
-      #define DOGLCD_CS    69
+      #define DOGLCD_CS                       69
 
       #undef LCD_BACKLIGHT_PIN
-      #define LCD_BACKLIGHT_PIN 68   // backlight LED on A14/D68
+      #define LCD_BACKLIGHT_PIN               68  // backlight LED on A14/D68
 
       #undef KILL_PIN
-      #define KILL_PIN     67
+      #define KILL_PIN                        67
 
       #undef BTN_EN2
-      #define BTN_EN2      66
+      #define BTN_EN2                         66
 
     #else
 
       #if ENABLED(REPRAPWORLD_KEYPAD)
         #undef BTN_EN1
-        #define BTN_EN1    67   // encoder
+        #define BTN_EN1                       67  // encoder
 
         #undef BTN_ENC
-        #define BTN_ENC    66   // enter button
+        #define BTN_ENC                       66  // enter button
       #elif ENABLED(PANEL_ONE)
         #undef BTN_EN2
-        #define BTN_EN2    66   // AUX2 PIN 4
+        #define BTN_EN2                       66  // AUX2 PIN 4
       #endif
     #endif
 
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 2e0350447547..297aaa9cb82c 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -43,98 +43,98 @@
 //
 // Servos
 //
-#define SERVO0_PIN          7
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
-#define SERVO3_PIN          3
+#define SERVO0_PIN                             7
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
+#define SERVO3_PIN                             3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22
-#define X_MAX_PIN          30
-#define Y_MIN_PIN          24
-#define Y_MAX_PIN          38
-#define Z_MIN_PIN          26
-#define Z_MAX_PIN          34
+#define X_MIN_PIN                             22
+#define X_MAX_PIN                             30
+#define Y_MIN_PIN                             24
+#define Y_MAX_PIN                             38
+#define Z_MIN_PIN                             26
+#define Z_MAX_PIN                             34
 
 //
 // Steppers
 //
-#define X_STEP_PIN         63
-#define X_DIR_PIN          62
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            63
+#define X_DIR_PIN                             62
+#define X_ENABLE_PIN                          48
 #ifndef X_CS_PIN
-  #define X_CS_PIN         68
+  #define X_CS_PIN                            68
 #endif
 
-#define Y_STEP_PIN         65
-#define Y_DIR_PIN          64
-#define Y_ENABLE_PIN       46
+#define Y_STEP_PIN                            65
+#define Y_DIR_PIN                             64
+#define Y_ENABLE_PIN                          46
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         60
+  #define Y_CS_PIN                            60
 #endif
 
-#define Z_STEP_PIN         67
-#define Z_DIR_PIN          66
-#define Z_ENABLE_PIN       44
+#define Z_STEP_PIN                            67
+#define Z_DIR_PIN                             66
+#define Z_ENABLE_PIN                          44
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         58
+  #define Z_CS_PIN                            58
 #endif
 
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      42
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         42
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        67
+  #define E0_CS_PIN                           67
 #endif
 
-#define E1_STEP_PIN        43
-#define E1_DIR_PIN         41
-#define E1_ENABLE_PIN      39
+#define E1_STEP_PIN                           43
+#define E1_DIR_PIN                            41
+#define E1_ENABLE_PIN                         39
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        61
+  #define E1_CS_PIN                           61
 #endif
 
-#define E2_STEP_PIN        32
-#define E2_DIR_PIN         47
-#define E2_ENABLE_PIN      45
+#define E2_STEP_PIN                           32
+#define E2_DIR_PIN                            47
+#define E2_ENABLE_PIN                         45
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        59
+  #define E2_CS_PIN                           59
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_1_PIN          2   // Analog Input
-#define TEMP_2_PIN          3   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_1_PIN                             2  // Analog Input
+#define TEMP_2_PIN                             3  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN       10
-#define HEATER_2_PIN       11
-#define HEATER_BED_PIN      8
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                          10
+#define HEATER_2_PIN                          11
+#define HEATER_BED_PIN                         8
 
 #ifndef FAN_PIN
-  #define FAN_PIN          12
+  #define FAN_PIN                             12
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define LED_PIN            13
+#define SDSS                                   4
+#define LED_PIN                               13
 
 //
 // LCD / Controller
@@ -142,70 +142,70 @@
 #if HAS_SPI_LCD
   // ramps-fd lcd adaptor
 
-  #define BEEPER_PIN       37
-  #define BTN_EN1          33
-  #define BTN_EN2          31
-  #define BTN_ENC          35
-  #define SD_DETECT_PIN    49
+  #define BEEPER_PIN                          37
+  #define BTN_EN1                             33
+  #define BTN_EN2                             31
+  #define BTN_ENC                             35
+  #define SD_DETECT_PIN                       49
 
   #if ENABLED(NEWPANEL)
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 17
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                   17
   #endif
 
   #if ENABLED(FYSETC_MINI_12864)
-    #define DOGLCD_CS      LCD_PINS_ENABLE
-    #define DOGLCD_A0      LCD_PINS_RS
-    #define DOGLCD_SCK     76
-    #define DOGLCD_MOSI    75
+    #define DOGLCD_CS            LCD_PINS_ENABLE
+    #define DOGLCD_A0                LCD_PINS_RS
+    #define DOGLCD_SCK                        76
+    #define DOGLCD_MOSI                       75
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-    #define LCD_RESET_PIN  23   // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN                     23  // Must be high or open for LCD to operate normally.
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN 25
+        #define RGB_LED_R_PIN                 25
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN 27
+        #define RGB_LED_G_PIN                 27
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN 29
+        #define RGB_LED_B_PIN                 29
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN    25
+      #define NEOPIXEL_PIN                    25
     #endif
 
   #elif ENABLED(NEWPANEL)
 
-    #define LCD_PINS_D4    23
-    #define LCD_PINS_D5    25
-    #define LCD_PINS_D6    27
-    #define LCD_PINS_D7    29
+    #define LCD_PINS_D4                       23
+    #define LCD_PINS_D5                       25
+    #define LCD_PINS_D6                       27
+    #define LCD_PINS_D7                       29
 
     #if ENABLED(MINIPANEL)
-      #define DOGLCD_CS    25
-      #define DOGLCD_A0    27
+      #define DOGLCD_CS                       25
+      #define DOGLCD_A0                       27
     #endif
 
   #endif
 
   #if ANY(VIKI2, miniVIKI)
-    #define DOGLCD_A0      16
-    #define KILL_PIN       51
-    #define STAT_LED_BLUE_PIN 29
-    #define STAT_LED_RED_PIN 23
-    #define DOGLCD_CS      17
-    #define DOGLCD_SCK     76   // SCK_PIN   - Required for DUE Hardware SPI
-    #define DOGLCD_MOSI    75   // MOSI_PIN
-    #define DOGLCD_MISO    74   // MISO_PIN
+    #define DOGLCD_A0                         16
+    #define KILL_PIN                          51
+    #define STAT_LED_BLUE_PIN                 29
+    #define STAT_LED_RED_PIN                  23
+    #define DOGLCD_CS                         17
+    #define DOGLCD_SCK                        76  // SCK_PIN   - Required for DUE Hardware SPI
+    #define DOGLCD_MOSI                       75  // MOSI_PIN
+    #define DOGLCD_MISO                       74  // MISO_PIN
   #endif
 
 #endif // HAS_SPI_LCD
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -229,7 +229,7 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HOTENDS < 3 && HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #define SPINDLE_LASER_ENA_PIN 45   // Use E2 ENA
-  #define SPINDLE_LASER_PWM_PIN 12   // Hardware PWM
-  #define SPINDLE_DIR_PIN       47   // Use E2 DIR
+  #define SPINDLE_LASER_ENA_PIN               45  // Use E2 ENA
+  #define SPINDLE_LASER_PWM_PIN               12  // Hardware PWM
+  #define SPINDLE_DIR_PIN                     47  // Use E2 DIR
 #endif
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 455d40a99969..0fd4a6b3ead4 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -73,26 +73,26 @@
 #define I2C_EEPROM
 #define E2END 0xFFF
 
-#define RESET_PIN          42   // Resets the board if the jumper is attached
+#define RESET_PIN                             42  // Resets the board if the jumper is attached
 
 //
 // Temperature Sensors
 //
 #undef TEMP_0_PIN
-#define TEMP_0_PIN          9   // Analog Input
+#define TEMP_0_PIN                             9  // Analog Input
 
 #undef TEMP_1_PIN
-#define TEMP_1_PIN         10   // Analog Input
+#define TEMP_1_PIN                            10  // Analog Input
 
 #undef TEMP_BED_PIN
-#define TEMP_BED_PIN       11   // Analog Input
+#define TEMP_BED_PIN                          11  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #undef MAX6675_SS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   67   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      67  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   67   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      67  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -100,12 +100,12 @@
 //
 // Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
 #if ENABLED(AZSMZ_12864)
-  #define BEEPER_PIN       66   // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 65
-  #define DOGLCD_A0        59
-  #define DOGLCD_CS        44
-  #define BTN_EN1          58
-  #define BTN_EN2          40
-  #define BTN_ENC          67   // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 66
-  #define SD_DETECT_PIN    49   // Pin 49 for display sd interface, 72 for easy adapter board
-  #define KILL_PIN         42
+  #define BEEPER_PIN                          66  // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 65
+  #define DOGLCD_A0                           59
+  #define DOGLCD_CS                           44
+  #define BTN_EN1                             58
+  #define BTN_EN2                             40
+  #define BTN_ENC                             67  // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 66
+  #define SD_DETECT_PIN                       49  // Pin 49 for display sd interface, 72 for easy adapter board
+  #define KILL_PIN                            42
 #endif
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 6963a164bbfe..7b844b5be0b5 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -41,76 +41,76 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          3
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          45
-#define X_MAX_PIN          39
-#define Y_MIN_PIN          46
-#define Y_MAX_PIN          41
-#define Z_MIN_PIN          47
-#define Z_MAX_PIN          43
+#define X_MIN_PIN                             45
+#define X_MAX_PIN                             39
+#define Y_MIN_PIN                             46
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             47
+#define Z_MAX_PIN                             43
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  43
+  #define Z_MIN_PROBE_PIN                     43
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37   // Support Extension Board
-#define X_DIR_PIN          36
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            37  // Support Extension Board
+#define X_DIR_PIN                             36
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         -1
+  #define X_CS_PIN                            -1
 #endif
 
-#define Y_STEP_PIN         32   // Support Extension Board
-#define Y_DIR_PIN          35
-#define Y_ENABLE_PIN       34
+#define Y_STEP_PIN                            32  // Support Extension Board
+#define Y_DIR_PIN                             35
+#define Y_ENABLE_PIN                          34
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         -1
+  #define Y_CS_PIN                            -1
 #endif
 
-#define Z_STEP_PIN         30   // Support Extension Board
-#define Z_DIR_PIN           2
-#define Z_ENABLE_PIN       33
+#define Z_STEP_PIN                            30  // Support Extension Board
+#define Z_DIR_PIN                              2
+#define Z_ENABLE_PIN                          33
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         -1
+  #define Z_CS_PIN                            -1
 #endif
 
-#define E0_STEP_PIN        29
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      31
+#define E0_STEP_PIN                           29
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         31
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        -1
+  #define E0_CS_PIN                           -1
 #endif
 
-#define E1_STEP_PIN        22
-#define E1_DIR_PIN         24
-#define E1_ENABLE_PIN      26
+#define E1_STEP_PIN                           22
+#define E1_DIR_PIN                            24
+#define E1_ENABLE_PIN                         26
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                           -1
 #endif
 
-#define E2_STEP_PIN        25
-#define E2_DIR_PIN         23
-#define E2_ENABLE_PIN      27
+#define E2_STEP_PIN                           25
+#define E2_DIR_PIN                            23
+#define E2_ENABLE_PIN                         27
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        -1
+  #define E2_CS_PIN                           -1
 #endif
 
-#define E3_STEP_PIN        15   // Only For Extension Board
-#define E3_DIR_PIN         14
-#define E3_ENABLE_PIN      61
+#define E3_STEP_PIN                           15  // Only For Extension Board
+#define E3_DIR_PIN                            14
+#define E3_ENABLE_PIN                         61
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        -1
+  #define E3_CS_PIN                           -1
 #endif
 
 // For Future: Microstepping pins - Mapping not from fastio.h (?)
@@ -119,77 +119,77 @@
 //#define E3_MS3_PIN         ?
 
 #if HAS_CUSTOM_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 #if HAS_FILAMENT_SENSOR
   #ifndef FIL_RUNOUT_PIN
-    #define FIL_RUNOUT_PIN   Y_MIN_PIN
+    #define FIL_RUNOUT_PIN             Y_MIN_PIN
   #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13
-#define HEATER_1_PIN       12
-#define HEATER_2_PIN       11
-#define HEATER_BED_PIN      7   // BED H1
+#define HEATER_0_PIN                          13
+#define HEATER_1_PIN                          12
+#define HEATER_2_PIN                          11
+#define HEATER_BED_PIN                         7  // BED H1
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
-#define FAN1_PIN            8
-#define CONTROLLER_FAN_PIN -1
+#define FAN1_PIN                               8
+#define CONTROLLER_FAN_PIN                    -1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // ANALOG A0
-#define TEMP_1_PIN          1   // ANALOG A1
-#define TEMP_2_PIN          2   // ANALOG A2
-#define TEMP_3_PIN          3   // ANALOG A3
-#define TEMP_BED_PIN        4   // ANALOG A4
+#define TEMP_0_PIN                             0  // ANALOG A0
+#define TEMP_1_PIN                             1  // ANALOG A1
+#define TEMP_2_PIN                             2  // ANALOG A2
+#define TEMP_3_PIN                             3  // ANALOG A3
+#define TEMP_BED_PIN                           4  // ANALOG A4
 
 // The thermocouple uses Analog pins
-#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
-  #define TEMP_4_PIN        5   // A5
-  #define TEMP_5_PIN        6   // A6 (Marlin 2.0 not support)
+#if ENABLED(VER_WITH_THERMOCOUPLE)                // Defined in Configuration.h
+  #define TEMP_4_PIN                           5  // A5
+  #define TEMP_5_PIN                           6  // A6 (Marlin 2.0 not support)
 #endif
 
 // SPI for Max6675 or Max31855 Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 */
 
 //
 // Misc. Functions
 //
-#define SDSS                4   // 4,10,52 if using HW SPI.
-#define LED_PIN            -1   // 13 - HEATER_0_PIN
-#define PS_ON_PIN          -1   // 65
+#define SDSS                                   4  // 4,10,52 if using HW SPI.
+#define LED_PIN                               -1  // 13 - HEATER_0_PIN
+#define PS_ON_PIN                             -1  // 65
 
 // MKS TFT / Nextion Use internal USART-1
-#define TFT_LCD_MODULE_COM        1
-#define TFT_LCD_MODULE_BAUDRATE   115600
+#define TFT_LCD_MODULE_COM                     1
+#define TFT_LCD_MODULE_BAUDRATE              115600
 
 // ESP WiFi Use internal USART-2
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115600
-#define ESP_WIFI_MODULE_RESET_PIN -1
-#define PIGGY_GPIO_PIN            -1
+#define ESP_WIFI_MODULE_COM                    2
+#define ESP_WIFI_MODULE_BAUDRATE             115600
+#define ESP_WIFI_MODULE_RESET_PIN             -1
+#define PIGGY_GPIO_PIN                        -1
 
 //
 // EEPROM
 //
-#define E2END 0x7FFF  // 32Kb (24lc256)
-#define I2C_EEPROM    // EEPROM on I2C-0
-//#define EEPROM_SD   // EEPROM on SDCARD
-//#define SPI_EEPROM  // EEPROM on SPI-0
+#define E2END 0x7FFF                              // 32Kb (24lc256)
+#define I2C_EEPROM                                // EEPROM on I2C-0
+//#define EEPROM_SD                               // EEPROM on SDCARD
+//#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
 //#define SPI_EEPROM1_CS          ?
 // 2K EEPROM
@@ -203,72 +203,72 @@
 #if HAS_SPI_LCD
 
   #if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BEEPER_PIN      62
-    #define LCD_PINS_D4     48
-    #define LCD_PINS_D5     50
-    #define LCD_PINS_D6     52
-    #define LCD_PINS_D7     53
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_PINS_D4                       48
+    #define LCD_PINS_D5                       50
+    #define LCD_PINS_D6                       52
+    #define LCD_PINS_D7                       53
+    #define SD_DETECT_PIN                     51
   #endif
 
   #if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     63
-    #define LCD_PINS_ENABLE 64
+    #define LCD_PINS_RS                       63
+    #define LCD_PINS_ENABLE                   64
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     52
-    #define LCD_PINS_ENABLE 53
+    #define LCD_PINS_RS                       52
+    #define LCD_PINS_ENABLE                   53
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BEEPER_PIN      62
-    #define LCD_SDSS        10
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_SDSS                          10
+    #define SD_DETECT_PIN                     51
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN      62
-    #define DOGLCD_CS       64
-    #define DOGLCD_A0       63
+    #define BEEPER_PIN                        62
+    #define DOGLCD_CS                         64
+    #define DOGLCD_A0                         63
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-    #define LCD_RESET_PIN   48   // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN                     48  // Must be high or open for LCD to operate normally.
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN 50   // D5
+        #define RGB_LED_R_PIN                 50  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN 52   // D6
+        #define RGB_LED_G_PIN                 52  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN 53   // D7
+        #define RGB_LED_B_PIN                 53  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN    50   // D5
+      #define NEOPIXEL_PIN                    50  // D5
     #endif
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
     //http://doku.radds.org/dokumentation/other-electronics/sparklcd/
     #error "Oops! SPARK_FULL_GRAPHICS not supported with RURAMPS4D."
-    //#define LCD_PINS_D4     29   //?
-    //#define LCD_PINS_ENABLE 27   //?
-    //#define LCD_PINS_RS     25   //?
-    //#define BTN_EN1         35   //?
-    //#define BTN_EN2         33   //?
-    //#define BTN_ENC         37   //?
+    //#define LCD_PINS_D4                     29  //?
+    //#define LCD_PINS_ENABLE                 27  //?
+    //#define LCD_PINS_RS                     25  //?
+    //#define BTN_EN1                         35  //?
+    //#define BTN_EN2                         33  //?
+    //#define BTN_ENC                         37  //?
 
   #endif // SPARK_FULL_GRAPHICS
 
   #if ENABLED(NEWPANEL)
-    #define BTN_EN1         44
-    #define BTN_EN2         42
-    #define BTN_ENC         40
+    #define BTN_EN1                           44
+    #define BTN_EN2                           42
+    #define BTN_ENC                           40
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index d0c24e68a358..3ba6fd17cf74 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -41,141 +41,141 @@
 //
 // Servos
 //
-#define SERVO0_PIN          5
-#define SERVO1_PIN          3
+#define SERVO0_PIN                             5
+#define SERVO1_PIN                             3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          45
-#define X_MAX_PIN          39
-#define Y_MIN_PIN          46
-#define Y_MAX_PIN          41
-#define Z_MIN_PIN          47
-#define Z_MAX_PIN          43
+#define X_MIN_PIN                             45
+#define X_MAX_PIN                             39
+#define Y_MIN_PIN                             46
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             47
+#define Z_MAX_PIN                             43
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37   // Support Extension Board
-#define X_DIR_PIN          36
-#define X_ENABLE_PIN       31
+#define X_STEP_PIN                            37  // Support Extension Board
+#define X_DIR_PIN                             36
+#define X_ENABLE_PIN                          31
 #ifndef X_CS_PIN
-  #define X_CS_PIN         38
+  #define X_CS_PIN                            38
 #endif
 
-#define Y_STEP_PIN         32   // Support Extension Board
-#define Y_DIR_PIN          35
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            32  // Support Extension Board
+#define Y_DIR_PIN                             35
+#define Y_ENABLE_PIN                          31
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         34
+  #define Y_CS_PIN                            34
 #endif
 
-#define Z_STEP_PIN         30   // Support Extension Board
-#define Z_DIR_PIN           2
-#define Z_ENABLE_PIN       31
+#define Z_STEP_PIN                            30  // Support Extension Board
+#define Z_DIR_PIN                              2
+#define Z_ENABLE_PIN                          31
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         10
+  #define Z_CS_PIN                            10
 #endif
 
-#define E0_STEP_PIN        29
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      33
+#define E0_STEP_PIN                           29
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         33
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        14
+  #define E0_CS_PIN                           14
 #endif
 
-#define E1_STEP_PIN        22
-#define E1_DIR_PIN         24
-#define E1_ENABLE_PIN      26
+#define E1_STEP_PIN                           22
+#define E1_DIR_PIN                            24
+#define E1_ENABLE_PIN                         26
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        15
+  #define E1_CS_PIN                           15
 #endif
 
-#define E2_STEP_PIN        25
-#define E2_DIR_PIN         23
-#define E2_ENABLE_PIN      27
+#define E2_STEP_PIN                           25
+#define E2_DIR_PIN                            23
+#define E2_ENABLE_PIN                         27
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        61
+  #define E2_CS_PIN                           61
 #endif
 
 #if HAS_CUSTOM_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 #if HAS_FILAMENT_SENSOR
   #ifndef FIL_RUNOUT_PIN
-    #define FIL_RUNOUT_PIN   Y_MIN_PIN
+    #define FIL_RUNOUT_PIN             Y_MIN_PIN
   #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13
-#define HEATER_1_PIN       12
-#define HEATER_2_PIN       11
-#define HEATER_BED_PIN      7   // BED H1
+#define HEATER_0_PIN                          13
+#define HEATER_1_PIN                          12
+#define HEATER_2_PIN                          11
+#define HEATER_BED_PIN                         7  // BED H1
 
-#define FAN_PIN             9
-#define FAN1_PIN            8
-#define CONTROLLER_FAN_PIN -1
+#define FAN_PIN                                9
+#define FAN1_PIN                               8
+#define CONTROLLER_FAN_PIN                    -1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // ANALOG A0
-#define TEMP_1_PIN          1   // ANALOG A1
-#define TEMP_2_PIN          2   // ANALOG A2
-#define TEMP_3_PIN          3   // ANALOG A3
-#define TEMP_BED_PIN        4   // ANALOG A4
+#define TEMP_0_PIN                             0  // ANALOG A0
+#define TEMP_1_PIN                             1  // ANALOG A1
+#define TEMP_2_PIN                             2  // ANALOG A2
+#define TEMP_3_PIN                             3  // ANALOG A3
+#define TEMP_BED_PIN                           4  // ANALOG A4
 
 // The thermocouple uses Analog pins
-#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
-  #define TEMP_4_PIN        5   // A5
-  #define TEMP_5_PIN        6   // A6 (Marlin 2.0 not support)
+#if ENABLED(VER_WITH_THERMOCOUPLE)                // Defined in Configuration.h
+  #define TEMP_4_PIN                           5  // A5
+  #define TEMP_5_PIN                           6  // A6 (Marlin 2.0 not support)
 #endif
 
 // SPI for Max6675 or Max31855 Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   53
+  #define MAX6675_SS_PIN                      53
 #else
-  #define MAX6675_SS_PIN   49
+  #define MAX6675_SS_PIN                      49
 #endif
 */
 
 //
 // Misc. Functions
 //
-#define SDSS                4   // 4,10,52 if using HW SPI.
-#define LED_PIN            -1   // 13 - HEATER_0_PIN
-#define PS_ON_PIN          -1   // 65
+#define SDSS                                   4  // 4,10,52 if using HW SPI.
+#define LED_PIN                               -1  // 13 - HEATER_0_PIN
+#define PS_ON_PIN                             -1  // 65
 
 // MKS TFT / Nextion Use internal USART-1
-#define TFT_LCD_MODULE_COM        1
-#define TFT_LCD_MODULE_BAUDRATE   115200
+#define TFT_LCD_MODULE_COM                     1
+#define TFT_LCD_MODULE_BAUDRATE              115200
 
 // ESP WiFi Use internal USART-2
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
-#define PIGGY_GPIO_PIN            -1
+#define ESP_WIFI_MODULE_COM                    2
+#define ESP_WIFI_MODULE_BAUDRATE             115200
+#define ESP_WIFI_MODULE_RESET_PIN             -1
+#define PIGGY_GPIO_PIN                        -1
 
 //
 // EEPROM
 //
-#define E2END 0x7FFF  // 32Kb (24lc256)
-#define I2C_EEPROM    // EEPROM on I2C-0
-//#define EEPROM_SD   // EEPROM on SDCARD
-//#define SPI_EEPROM  // EEPROM on SPI-0
+#define E2END 0x7FFF                              // 32Kb (24lc256)
+#define I2C_EEPROM                                // EEPROM on I2C-0
+//#define EEPROM_SD                               // EEPROM on SDCARD
+//#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
 //#define SPI_EEPROM1_CS          ?
 // 2K EEPROM
@@ -189,70 +189,70 @@
 #if HAS_SPI_LCD
 
   #if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BEEPER_PIN      62
-    #define LCD_PINS_D4     48
-    #define LCD_PINS_D5     50
-    #define LCD_PINS_D6     52
-    #define LCD_PINS_D7     53
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_PINS_D4                       48
+    #define LCD_PINS_D5                       50
+    #define LCD_PINS_D6                       52
+    #define LCD_PINS_D7                       53
+    #define SD_DETECT_PIN                     51
   #endif
 
   #if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     63
-    #define LCD_PINS_ENABLE 64
+    #define LCD_PINS_RS                       63
+    #define LCD_PINS_ENABLE                   64
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS     52
-    #define LCD_PINS_ENABLE 53
+    #define LCD_PINS_RS                       52
+    #define LCD_PINS_ENABLE                   53
 
   #elif HAS_SSD1306_OLED_I2C
 
-    #define BEEPER_PIN      62
-    #define LCD_SDSS        10
-    #define SD_DETECT_PIN   51
+    #define BEEPER_PIN                        62
+    #define LCD_SDSS                          10
+    #define SD_DETECT_PIN                     51
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN      62
-    #define DOGLCD_CS       64
-    #define DOGLCD_A0       63
+    #define BEEPER_PIN                        62
+    #define DOGLCD_CS                         64
+    #define DOGLCD_A0                         63
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-    #define LCD_RESET_PIN   48   // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN                     48  // Must be high or open for LCD to operate normally.
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN 50   // D5
+        #define RGB_LED_R_PIN                 50  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN 52   // D6
+        #define RGB_LED_G_PIN                 52  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN 53   // D7
+        #define RGB_LED_B_PIN                 53  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN    50   // D5
+      #define NEOPIXEL_PIN                    50  // D5
     #endif
 
   #elif ENABLED(MKS_MINI_12864)
 
-    #define ORIG_BEEPER_PIN 62
+    #define ORIG_BEEPER_PIN                   62
 
-    #define DOGLCD_A0       52
-    #define DOGLCD_CS       50
+    #define DOGLCD_A0                         52
+    #define DOGLCD_CS                         50
 
-    #define SD_DETECT_PIN   51
+    #define SD_DETECT_PIN                     51
 
   #endif
 
   #if ENABLED(NEWPANEL)
-    #define BTN_EN1         44
-    #define BTN_EN2         42
-    #define BTN_ENC         40
+    #define BTN_EN1                           44
+    #define BTN_EN2                           42
+    #define BTN_ENC                           40
   #endif
 
 #endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
index db0826e7c9d7..ae01d5da4c1c 100644
--- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
+++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
@@ -35,140 +35,140 @@
 // Servos
 //
 #if NUM_SERVOS > 0
-  #define SERVO0_PIN       11
+  #define SERVO0_PIN                          11
   #if NUM_SERVOS > 1
-    #define SERVO1_PIN     12
+    #define SERVO1_PIN                        12
   #endif
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          31
-#define X_MAX_PIN          30
-#define Y_MIN_PIN          12
-#define Y_MAX_PIN          11
-#define Z_MIN_PIN          29
-#define Z_MAX_PIN          28
+#define X_MIN_PIN                             31
+#define X_MAX_PIN                             30
+#define Y_MIN_PIN                             12
+#define Y_MAX_PIN                             11
+#define Z_MIN_PIN                             29
+#define Z_MAX_PIN                             28
 
 //
 // Steppers
 //
-#define X_STEP_PIN         35
-#define X_DIR_PIN          34
-#define X_ENABLE_PIN       37
+#define X_STEP_PIN                            35
+#define X_DIR_PIN                             34
+#define X_ENABLE_PIN                          37
 #ifndef X_CS_PIN
-  #define X_CS_PIN         18
+  #define X_CS_PIN                            18
 #endif
 
-#define Y_STEP_PIN         22
-#define Y_DIR_PIN          23
-#define Y_ENABLE_PIN       33
+#define Y_STEP_PIN                            22
+#define Y_DIR_PIN                             23
+#define Y_ENABLE_PIN                          33
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         19
+  #define Y_CS_PIN                            19
 #endif
 
-#define Z_STEP_PIN         25
-#define Z_DIR_PIN          26
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            25
+#define Z_DIR_PIN                             26
+#define Z_ENABLE_PIN                          24
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         16
+  #define Z_CS_PIN                            16
 #endif
 
-#define E0_STEP_PIN        47
-#define E0_DIR_PIN         46
-#define E0_ENABLE_PIN      48
+#define E0_STEP_PIN                           47
+#define E0_DIR_PIN                            46
+#define E0_ENABLE_PIN                         48
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        17
+  #define E0_CS_PIN                           17
 #endif
 
-#define E1_STEP_PIN        44
-#define E1_DIR_PIN         36
-#define E1_ENABLE_PIN      45
+#define E1_STEP_PIN                           44
+#define E1_DIR_PIN                            36
+#define E1_ENABLE_PIN                         45
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                           -1
 #endif
 
-#define E2_STEP_PIN        42
-#define E2_DIR_PIN         41
-#define E2_ENABLE_PIN      43
+#define E2_STEP_PIN                           42
+#define E2_DIR_PIN                            41
+#define E2_ENABLE_PIN                         43
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        -1
+  #define E2_CS_PIN                           -1
 #endif
 
-#define E3_STEP_PIN        39
-#define E3_DIR_PIN         38
-#define E3_ENABLE_PIN      40
+#define E3_STEP_PIN                           39
+#define E3_DIR_PIN                            38
+#define E3_ENABLE_PIN                         40
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        -1
+  #define E3_CS_PIN                           -1
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          2   // Analog Input
-#define TEMP_2_PIN          3   // Analog Input
-#define TEMP_3_PIN          4   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             2  // Analog Input
+#define TEMP_2_PIN                             3  // Analog Input
+#define TEMP_3_PIN                             4  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3
-#define HEATER_1_PIN        8
-#define HEATER_2_PIN        7
-#define HEATER_3_PIN        9
-#define HEATER_BED_PIN      2
+#define HEATER_0_PIN                           3
+#define HEATER_1_PIN                           8
+#define HEATER_2_PIN                           7
+#define HEATER_3_PIN                           9
+#define HEATER_BED_PIN                         2
 
 #ifndef FAN_PIN
-  #define FAN_PIN           6
+  #define FAN_PIN                              6
 #endif
-#define FAN2_PIN            5
+#define FAN2_PIN                               5
 
 //
 // Misc. Functions
 //
-#define SDSS               59
-#define SD_DETECT_PIN      60
-#define LED_PIN            13
-#define PS_ON_PIN          32
+#define SDSS                                  59
+#define SD_DETECT_PIN                         60
+#define LED_PIN                               13
+#define PS_ON_PIN                             32
 
 //
 // SPI Buses
 //
 
-#define DAC0_SYNC          53   // PB14
-#define SPI_CHAN_DAC        1
+#define DAC0_SYNC                             53  // PB14
+#define SPI_CHAN_DAC                           1
 
-#define SPI_CHAN_EEPROM1   -1
-#define SPI_EEPROM1_CS     -1
-#define SPI_EEPROM2_CS     -1
-#define SPI_FLASH_CS       -1
+#define SPI_CHAN_EEPROM1                      -1
+#define SPI_EEPROM1_CS                        -1
+#define SPI_EEPROM2_CS                        -1
+#define SPI_FLASH_CS                          -1
 
 // SPI for Max6675 or Max31855 Thermocouple
-#define MAX6675_SS_PIN     65
-#define MAX31855_SS0       65
-#define MAX31855_SS1       52
-#define MAX31855_SS2       50
-#define MAX31855_SS3       51
+#define MAX6675_SS_PIN                        65
+#define MAX31855_SS0                          65
+#define MAX31855_SS1                          52
+#define MAX31855_SS2                          50
+#define MAX31855_SS3                          51
 
-#define ENC424_SS          61
+#define ENC424_SS                             61
 
 //
 // LCD / Controller
 //
 
-#define BEEPER_PIN         27
+#define BEEPER_PIN                            27
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      A8     // CS chip select / SS chip slave select
-  #define LCD_PINS_ENABLE  MOSI   // SID (MOSI)
-  #define LCD_PINS_D4      SCK    // SCK (CLK) clock
+  #define LCD_PINS_RS                         A8  // CS chip select / SS chip slave select
+  #define LCD_PINS_ENABLE                   MOSI  // SID (MOSI)
+  #define LCD_PINS_D4                        SCK  // SCK (CLK) clock
 
-  #define BTN_EN1          20
-  #define BTN_EN2          21
-  #define BTN_ENC          64
+  #define BTN_EN1                             20
+  #define BTN_EN2                             21
+  #define BTN_ENC                             64
 
 #endif // REPRAPWORLD_GRAPHICAL_LCD
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 107ef9f57e95..f02a8b86bd55 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -36,110 +36,111 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
-#define SERVO3_PIN          4
+#define SERVO0_PIN                            11
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
+#define SERVO3_PIN                             4
 
 //
 // EEPROM
 //
-#define E2END 0x7FFF  // 32Kb (24lc256)
-#define I2C_EEPROM    // EEPROM on I2C-0
+//#define QSPI_EEPROM                             // Use AGCM4 onboard QSPI EEPROM (Uses 4K of RAM)
+#define I2C_EEPROM                                // EEPROM on I2C-0
+#define E2END 0x7FFF                              // 32K (24lc256)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  18
+  #define Z_MIN_PROBE_PIN                     18
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         67     // Mega/Due:54 - AGCM4:67
-#define X_DIR_PIN          68     // Mega/Due:55 - AGCM4:68
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            67  // Mega/Due:54 - AGCM4:67
+#define X_DIR_PIN                             68  // Mega/Due:55 - AGCM4:68
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         47
+  #define X_CS_PIN                            47
 #endif
 
-#define Y_STEP_PIN         73     // Mega/Due:60 - AGCM4:73
-#define Y_DIR_PIN          74     // Mega/Due:61 - AGCM4:74
-#define Y_ENABLE_PIN       69     // Mega/Due:56 - AGCM4:69
+#define Y_STEP_PIN                            73  // Mega/Due:60 - AGCM4:73
+#define Y_DIR_PIN                             74  // Mega/Due:61 - AGCM4:74
+#define Y_ENABLE_PIN                          69  // Mega/Due:56 - AGCM4:69
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         45
+  #define Y_CS_PIN                            45
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       54     // Mega/Due:62 - AGCM4:54
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          54  // Mega/Due:62 - AGCM4:54
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         32
+  #define Z_CS_PIN                            32
 #endif
 
-#define Z2_STEP_PIN        36
-#define Z2_DIR_PIN         34
-#define Z2_ENABLE_PIN      30
+#define Z2_STEP_PIN                           36
+#define Z2_DIR_PIN                            34
+#define Z2_ENABLE_PIN                         30
 #ifndef Z2_CS_PIN
-  #define Z2_CS_PIN        22
+  #define Z2_CS_PIN                           22
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        43
+  #define E0_CS_PIN                           43
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13
-#define TEMP_BED_PIN       14
-#define TEMP_CHAMBER_PIN   15
+#define TEMP_0_PIN                            13
+#define TEMP_BED_PIN                          14
+#define TEMP_CHAMBER_PIN                      15
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_BED_PIN      8
-#define FAN_PIN             9
-#define FAN1_PIN            7
-#define FAN2_PIN           12
+#define HEATER_0_PIN                          10
+#define HEATER_BED_PIN                         8
+#define FAN_PIN                                9
+#define FAN1_PIN                               7
+#define FAN2_PIN                              12
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // RAMPS 1.4 DIO 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        39
+  #define PS_ON_PIN                           39
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN  6   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #endif
 #endif
 
@@ -147,10 +148,10 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !NUM_SERVOS                      // Use servo connector if possible
-    #define SPINDLE_LASER_ENA_PIN  4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN  6   // Hardware PWM
-    #define SPINDLE_DIR_PIN        5
+  #if !NUM_SERVOS                                 // Use servo connector if possible
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
   #else
     #error "No auto-assignable Spindle/Laser pins available."
   #endif
@@ -161,17 +162,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    58     // Mega/Due:66 - AGCM4:58
+    #define TMC_SW_MOSI                       58  // Mega/Due:66 - AGCM4:58
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     56     // Mega/Due:64 - AGCM4:56
+    #define TMC_SW_SCK                        56  // Mega/Due:64 - AGCM4:56
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -195,91 +196,91 @@
   //
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  47
+    #define X_SERIAL_TX_PIN                   47
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  47
+    #define X_SERIAL_RX_PIN                   47
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  45
+    #define Y_SERIAL_TX_PIN                   45
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  45
+    #define Y_SERIAL_RX_PIN                   45
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  32
+    #define Z_SERIAL_TX_PIN                   32
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  32
+    #define Z_SERIAL_RX_PIN                   32
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN 22
+    #define Z2_SERIAL_TX_PIN                  22
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN 22
+    #define Z2_SERIAL_RX_PIN                  22
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 43
+    #define E0_SERIAL_TX_PIN                  43
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 43
+    #define E0_SERIAL_RX_PIN                  43
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
@@ -345,17 +346,17 @@
         // #define DOGLCD_SCK      23
         // #define DOGLCD_A0       LCD_PINS_DC
       #else
-        #define LCD_PINS_RS        16
-        #define LCD_PINS_ENABLE    17
-        #define LCD_PINS_D4        23
-        #define LCD_PINS_D5        25
-        #define LCD_PINS_D6        27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7          29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN         33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -363,10 +364,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK          38
-      //#define SHIFT_LD           42
-      //#define SHIFT_OUT          40
-      //#define SHIFT_EN           17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -378,22 +379,22 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN           37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
         // TO TEST
         // #define BTN_EN1         17
         // #define BTN_EN2         23
       #else
-        #define BTN_EN1            31
-        #define BTN_EN2            33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC              35
+      #define BTN_ENC                         35
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN      49
+        #define SD_DETECT_PIN                 49
       #endif
-      #define KILL_PIN             41
+      #define KILL_PIN                        41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         // TO TEST
@@ -465,15 +466,15 @@
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 
       // TO TEST
-      //#define BEEPER_PIN         37
-      //#define BTN_ENC            35
-      //#define SD_DETECT_PIN      49
+      //#define BEEPER_PIN                    37
+      //#define BTN_ENC                       35
+      //#define SD_DETECT_PIN                 49
 
       //#ifndef KILL_PIN
       //  #define KILL_PIN         41
       //#endif
 
-      #if ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
+      #if ENABLED(MKS_MINI_12864)                 // Added in Marlin 1.1.6
 
         // TO TEST
         // #define DOGLCD_A0       27
@@ -502,8 +503,8 @@
         // #define BTN_EN1         33
         // #define BTN_EN2         31
 
-        //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+        //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
         // #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
 
@@ -600,12 +601,12 @@
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(ONBOARD)
   #undef SDSS
-  #define SDSS             83
+  #define SDSS                                83
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    95
+  #define SD_DETECT_PIN                       95
 #endif
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index ebd050371231..73145a3cdbb7 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -98,50 +98,50 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         18
-#define Y_STOP_PIN         19
-#define Z_STOP_PIN         20
+#define X_STOP_PIN                            18
+#define Y_STOP_PIN                            19
+#define Z_STOP_PIN                            20
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          21
-#define X_ENABLE_PIN       14
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             21
+#define X_ENABLE_PIN                          14
 
-#define Y_STEP_PIN         22
-#define Y_DIR_PIN          23
-#define Y_ENABLE_PIN       14
+#define Y_STEP_PIN                            22
+#define Y_DIR_PIN                             23
+#define Y_ENABLE_PIN                          14
 
-#define Z_STEP_PIN          3
-#define Z_DIR_PIN           2
-#define Z_ENABLE_PIN       26
+#define Z_STEP_PIN                             3
+#define Z_DIR_PIN                              2
+#define Z_ENABLE_PIN                          26
 
-#define E0_STEP_PIN         1
-#define E0_DIR_PIN          0
-#define E0_ENABLE_PIN      14
+#define E0_STEP_PIN                            1
+#define E0_DIR_PIN                             0
+#define E0_ENABLE_PIN                         14
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN        6   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             7  // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN                           6  // Analog Input (pin 34 bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13   // (extruder)
-#define HEATER_BED_PIN     12   // (bed)
+#define HEATER_0_PIN                          13  // (extruder)
+#define HEATER_BED_PIN                        12  // (bed)
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4
+  #define FAN_PIN                              4
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               31
-#define LED_PIN            -1
+#define SDSS                                  31
+#define LED_PIN                               -1
 
 /**
  * LCD / Controller
@@ -153,36 +153,36 @@
  */
 
 #if HAS_SPI_LCD
-  #define LCD_SDSS           28
+  #define LCD_SDSS                            28
   #if ENABLED(ADC_KEYPAD)
-    #define SERVO0_PIN       27   // free for BLTouch/3D-Touch
-    #define LCD_PINS_RS      28
-    #define LCD_PINS_ENABLE  29
-    #define LCD_PINS_D4      10
-    #define LCD_PINS_D5      11
-    #define LCD_PINS_D6      16
-    #define LCD_PINS_D7      17
-    #define ADC_KEYPAD_PIN    1
+    #define SERVO0_PIN                        27  // free for BLTouch/3D-Touch
+    #define LCD_PINS_RS                       28
+    #define LCD_PINS_ENABLE                   29
+    #define LCD_PINS_D4                       10
+    #define LCD_PINS_D5                       11
+    #define LCD_PINS_D6                       16
+    #define LCD_PINS_D7                       17
+    #define ADC_KEYPAD_PIN                     1
   #elif EITHER(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD)
     // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
     // display using an adapter board  // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
     // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
-    #define SERVO0_PIN       29   // free for BLTouch/3D-Touch
-    #define BEEPER_PIN       17
-    #define LCD_PINS_RS      27
-    #define LCD_PINS_ENABLE  28
-    #define LCD_PINS_D4      30
-    #define BTN_EN1          11
-    #define BTN_EN2          10
-    #define BTN_ENC          16
+    #define SERVO0_PIN                        29  // free for BLTouch/3D-Touch
+    #define BEEPER_PIN                        17
+    #define LCD_PINS_RS                       27
+    #define LCD_PINS_ENABLE                   28
+    #define LCD_PINS_D4                       30
+    #define BTN_EN1                           11
+    #define BTN_EN2                           10
+    #define BTN_ENC                           16
     #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
     #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
     #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-    #define STD_ENCODER_PULSES_PER_STEP 4
-    #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
+    #define STD_ENCODER_PULSES_PER_STEP        4
+    #define STD_ENCODER_STEPS_PER_MENU_ITEM    1
   #endif
 #else
-  #define SERVO0_PIN         27
+  #define SERVO0_PIN                          27
 #endif
 
 /**
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
index 833f99fb7f8f..b9a917d65de1 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
@@ -55,47 +55,47 @@
 #endif
 
 #define BOARD_INFO_NAME "Gen3 Monolithic"
-#define DEBUG_PIN 0
+#define DEBUG_PIN                              0
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         20
-#define Y_STOP_PIN         25
-#define Z_STOP_PIN         30
+#define X_STOP_PIN                            20
+#define Y_STOP_PIN                            25
+#define Z_STOP_PIN                            30
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       24   // actually uses Y_enable_pin
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          24  // actually uses Y_enable_pin
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24   // shared with X_enable_pin
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24  // shared with X_enable_pin
 
-#define Z_STEP_PIN         27
-#define Z_DIR_PIN          28
-#define Z_ENABLE_PIN       29
+#define Z_STEP_PIN                            27
+#define Z_DIR_PIN                             28
+#define Z_ENABLE_PIN                          29
 
-#define E0_STEP_PIN        12
-#define E0_DIR_PIN         17
-#define E0_ENABLE_PIN       3
+#define E0_STEP_PIN                           12
+#define E0_DIR_PIN                            17
+#define E0_ENABLE_PIN                          3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
 
 //
 // Heaters
 //
-#define HEATER_0_PIN       16
+#define HEATER_0_PIN                          16
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          14   // Alex, does this work on the card?
+#define PS_ON_PIN                             14  // Alex, does this work on the card?
 
 // Alex extras from Gen3+
diff --git a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
index c7c037fd4d46..6cd6fdaf27b3 100644
--- a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
+++ b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
@@ -50,7 +50,6 @@
  *
  */
 
-
 #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
   #error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644P' or 'ATmega1284P' in 'Tools > Processor.'"
 #endif
@@ -60,43 +59,43 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         20
-#define Y_STOP_PIN         25
-#define Z_STOP_PIN         30
+#define X_STOP_PIN                            20
+#define Y_STOP_PIN                            25
+#define Z_STOP_PIN                            30
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       19
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          19
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         27
-#define Z_DIR_PIN          28
-#define Z_ENABLE_PIN       29
+#define Z_STEP_PIN                            27
+#define Z_DIR_PIN                             28
+#define Z_ENABLE_PIN                          29
 
-#define E0_STEP_PIN        17
-#define E0_DIR_PIN         21
-#define E0_ENABLE_PIN      13
+#define E0_STEP_PIN                           17
+#define E0_DIR_PIN                            21
+#define E0_ENABLE_PIN                         13
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN        5   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             0  // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN                           5  // Analog Input (pin 34 bed)
 
 //
 // Heaters
 //
-#define HEATER_0_PIN       12
-#define HEATER_BED_PIN     16
+#define HEATER_0_PIN                          12
+#define HEATER_BED_PIN                        16
 
 //
 // Misc. Functions
 //
-#define SDSS                4
-#define PS_ON_PIN          14
+#define SDSS                                   4
+#define PS_ON_PIN                             14
diff --git a/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin/src/pins/sanguino/pins_GEN6.h
index d1b8391bcdf7..0d2449ae6e99 100644
--- a/Marlin/src/pins/sanguino/pins_GEN6.h
+++ b/Marlin/src/pins/sanguino/pins_GEN6.h
@@ -63,58 +63,58 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         20
-#define Y_STOP_PIN         25
-#define Z_STOP_PIN         30
+#define X_STOP_PIN                            20
+#define Y_STOP_PIN                            25
+#define Z_STOP_PIN                            30
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       19
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          19
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         27
-#define Z_DIR_PIN          28
-#define Z_ENABLE_PIN       29
+#define Z_STEP_PIN                            27
+#define Z_DIR_PIN                             28
+#define Z_ENABLE_PIN                          29
 
-#define E0_STEP_PIN         4   // Edited @ EJE Electronics 20100715
-#define E0_DIR_PIN          2   // Edited @ EJE Electronics 20100715
-#define E0_ENABLE_PIN       3   // Added @ EJE Electronics 20100715
+#define E0_STEP_PIN                            4  // Edited @ EJE Electronics 20100715
+#define E0_DIR_PIN                             2  // Edited @ EJE Electronics 20100715
+#define E0_ENABLE_PIN                          3  // Added @ EJE Electronics 20100715
 
 //
 // Temperature Sensor
 //
-#define TEMP_0_PIN          5   // Analog Input
+#define TEMP_0_PIN                             5  // Analog Input
 
 //
 // Heaters
 //
-#define HEATER_0_PIN       14   // changed @ rkoeppl 20110410
+#define HEATER_0_PIN                          14  // changed @ rkoeppl 20110410
 
 #if !MB(GEN6)
-  #define HEATER_BED_PIN    1   // changed @ rkoeppl 20110410
-  #define TEMP_BED_PIN      0   // Analog Input
+  #define HEATER_BED_PIN                       1  // changed @ rkoeppl 20110410
+  #define TEMP_BED_PIN                         0  // Analog Input
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               17
-#define DEBUG_PIN           0
-#define CASE_LIGHT_PIN     16   // Hardware PWM
+#define SDSS                                  17
+#define DEBUG_PIN                              0
+#define CASE_LIGHT_PIN                        16  // Hardware PWM
 
 // RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN     5   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    16   // Hardware PWM
-#define SPINDLE_DIR_PIN           6
+#define SPINDLE_LASER_ENA_PIN                  5  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+#define SPINDLE_DIR_PIN                        6
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_12.h b/Marlin/src/pins/sanguino/pins_GEN7_12.h
index 4ab53faa98c4..bb0e44a3002a 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_12.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_12.h
@@ -61,90 +61,89 @@
 #endif
 
 #ifndef GEN7_VERSION
-  #define GEN7_VERSION 12   // v1.x
+  #define GEN7_VERSION                        12  // v1.x
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           7
-#define Y_MIN_PIN           5
-#define Z_MIN_PIN           1
-#define Z_MAX_PIN           0
-#define Y_MAX_PIN           2
-#define X_MAX_PIN           6
-
+#define X_MIN_PIN                              7
+#define Y_MIN_PIN                              5
+#define Z_MIN_PIN                              1
+#define Z_MAX_PIN                              0
+#define Y_MAX_PIN                              2
+#define X_MAX_PIN                              6
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN   0
+  #define Z_MIN_PROBE_PIN                      0
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         19
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            19
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3
 
-#if !defined(FAN_PIN) && GEN7_VERSION < 13   // Gen7 v1.3 removed the fan pin
-  #define FAN_PIN        31
+#if !defined(FAN_PIN) && GEN7_VERSION < 13        // Gen7 v1.3 removed the fan pin
+  #define FAN_PIN                             31
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          15
+#define PS_ON_PIN                             15
 
 #if GEN7_VERSION < 13
-  #define CASE_LIGHT_PIN   16   // Hardware PWM
-#else     // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
-  #define CASE_LIGHT_PIN   15   // Hardware PWM
+  #define CASE_LIGHT_PIN                      16  // Hardware PWM
+#else                                             // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
+  #define CASE_LIGHT_PIN                      15  // Hardware PWM
 #endif
 
 // All these generations of Gen7 supply thermistor power
 // via PS_ON, so ignore bad thermistor readings
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD     2000
 
-#define DEBUG_PIN           0
+#define DEBUG_PIN                              0
 
 // RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    10   // Pullup or pulldown!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_ENA_PIN                 10  // Pullup or pulldown!
+#define SPINDLE_DIR_PIN                       11
 #if GEN7_VERSION < 13
-  #define SPINDLE_LASER_PWM_PIN  16   // Hardware PWM
-#else  // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
-  #define SPINDLE_LASER_PWM_PIN  15   // Hardware PWM
+  #define SPINDLE_LASER_PWM_PIN               16  // Hardware PWM
+#else                                             // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
+  #define SPINDLE_LASER_PWM_PIN               15  // Hardware PWM
 #endif
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_14.h b/Marlin/src/pins/sanguino/pins_GEN7_14.h
index 5121b7d2e98c..9dc9f2808b77 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_14.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_14.h
@@ -58,62 +58,62 @@
 
 #define BOARD_INFO_NAME "Gen7 v1.4"
 
-#define GEN7_VERSION 14   // v1.4
+#define GEN7_VERSION                          14  // v1.4
 
 //
 // Limit switches
 //
-#define X_STOP_PIN          0
-#define Y_STOP_PIN          1
-#define Z_STOP_PIN          2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         29
-#define X_DIR_PIN          28
-#define X_ENABLE_PIN       25
+#define X_STEP_PIN                            29
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          25
 
-#define Y_STEP_PIN         27
-#define Y_DIR_PIN          26
-#define Y_ENABLE_PIN       25
+#define Y_STEP_PIN                            27
+#define Y_DIR_PIN                             26
+#define Y_ENABLE_PIN                          25
 
-#define Z_STEP_PIN         23
-#define Z_DIR_PIN          22
-#define Z_ENABLE_PIN       25
+#define Z_STEP_PIN                            23
+#define Z_DIR_PIN                             22
+#define Z_ENABLE_PIN                          25
 
-#define E0_STEP_PIN        19
-#define E0_DIR_PIN         18
-#define E0_ENABLE_PIN      25
+#define E0_STEP_PIN                           19
+#define E0_DIR_PIN                            18
+#define E0_ENABLE_PIN                         25
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          15
-#define CASE_LIGHT_PIN     15    // Hardware PWM
+#define PS_ON_PIN                             15
+#define CASE_LIGHT_PIN                        15  // Hardware PWM
 
 // A pin for debugging
-#define DEBUG_PIN           0
+#define DEBUG_PIN                              0
 
 // RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN    20   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    16   // Hardware PWM
-#define SPINDLE_DIR_PIN          21
+#define SPINDLE_LASER_ENA_PIN                 20  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+#define SPINDLE_DIR_PIN                       21
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
index 0f8a92f08dea..67a9762fa085 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
@@ -64,76 +64,76 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          0
-#define Y_STOP_PIN          1
-#define Z_STOP_PIN          2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         21   // different from standard GEN7
-#define X_DIR_PIN          20   // different from standard GEN7
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            21  // different from standard GEN7
+#define X_DIR_PIN                             20  // different from standard GEN7
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             2  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input (pin 34 bed)
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3   // (bed)
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3  // (bed)
 
 //
 // Misc. Functions
 //
-#define SDSS               31   // SCL pin of I2C header || CS Pin for SD Card support
-#define PS_ON_PIN          19
-#define CASE_LIGHT_PIN     15   // Hardware PWM
+#define SDSS                                  31  // SCL pin of I2C header || CS Pin for SD Card support
+#define PS_ON_PIN                             19
+#define CASE_LIGHT_PIN                        15  // Hardware PWM
 
 // A pin for debugging
-#define DEBUG_PIN          -1
+#define DEBUG_PIN                             -1
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         -1
+#define BEEPER_PIN                            -1
 
 // 4bit LCD Support
-#define LCD_PINS_RS        18
-#define LCD_PINS_ENABLE    17
-#define LCD_PINS_D4        16
-#define LCD_PINS_D5        15
-#define LCD_PINS_D6        13
-#define LCD_PINS_D7        14
+#define LCD_PINS_RS                           18
+#define LCD_PINS_ENABLE                       17
+#define LCD_PINS_D4                           16
+#define LCD_PINS_D5                           15
+#define LCD_PINS_D6                           13
+#define LCD_PINS_D7                           14
 
 // Buttons are directly    attached
-#define BTN_EN1            11
-#define BTN_EN2            10
-#define BTN_ENC            12
+#define BTN_EN1                               11
+#define BTN_EN2                               10
+#define BTN_ENC                               12
 
 // RS485 pins
-//#define TX_ENABLE_PIN   12
-//#define RX_ENABLE_PIN   13
+//#define TX_ENABLE_PIN                       12
+//#define RX_ENABLE_PIN                       13
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN     5   // Pullup or pulldown!
-#define SPINDLE_LASER_PWM_PIN    16   // Hardware PWM
-#define SPINDLE_DIR_PIN           6
+#define SPINDLE_LASER_ENA_PIN                  5  // Pullup or pulldown!
+#define SPINDLE_LASER_PWM_PIN                 16  // Hardware PWM
+#define SPINDLE_DIR_PIN                        6
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 958ea78da4b5..10a52705e77e 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -46,15 +46,15 @@
 #undef LCD_PINS_D5
 #undef LCD_PINS_D6
 #undef LCD_PINS_D7
-#undef FIL_RUNOUT_PIN           // Uses Beeper/LED Pin Pulled to GND
+#undef FIL_RUNOUT_PIN                             // Uses Beeper/LED Pin Pulled to GND
 
-#define LCD_SDSS           31   // Smart Controller SD card reader (rather than the Melzi)
-#define LCD_PINS_RS        28   // ST9720 CS
-#define LCD_PINS_ENABLE    17   // ST9720 DAT
-#define LCD_PINS_D4        30   // ST9720 CLK
+#define LCD_SDSS                             31   // Smart Controller SD card reader (rather than the Melzi)
+#define LCD_PINS_RS                          28   // ST9720 CS
+#define LCD_PINS_ENABLE                      17   // ST9720 DAT
+#define LCD_PINS_D4                          30   // ST9720 CLK
 
 #if ENABLED(BLTOUCH)
-  #define SERVO0_PIN 27
+  #define SERVO0_PIN                         27
   #undef BEEPER_PIN
 #endif
 
@@ -67,7 +67,7 @@
 
 #if ENABLED(MINIPANEL)
   #undef DOGLCD_CS
-  #define DOGLCD_CS        LCD_PINS_RS
+  #define DOGLCD_CS LCD_PINS_RS
 #endif
 
 /**
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index bf0e34a9ec8d..8e682453b4f6 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -36,12 +36,12 @@
 #undef BTN_EN2
 #undef BTN_ENC
 
-#define LCD_PINS_RS        17   // ST9720 CS
-#define LCD_PINS_ENABLE    16   // ST9720 DAT
-#define LCD_PINS_D4        11   // ST9720 CLK
-#define BTN_EN1            30
-#define BTN_EN2            29
-#define BTN_ENC            28
+#define LCD_PINS_RS                          17   // ST9720 CS
+#define LCD_PINS_ENABLE                      16   // ST9720 DAT
+#define LCD_PINS_D4                          11   // ST9720 CLK
+#define BTN_EN1                              30
+#define BTN_EN2                              29
+#define BTN_ENC                              28
 
 // Alter timing for graphical display
 #if HAS_GRAPHICAL_LCD
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index 50433f6244db..88b80dfb895e 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -40,16 +40,16 @@
 #undef BTN_ENC
 #undef LCD_SDSS
 
-#define Z_ENABLE_PIN    14
-#define LCD_PINS_RS     30
-#define LCD_PINS_ENABLE 28
-#define LCD_PINS_D4     16
-#define LCD_PINS_D5     17
-#define LCD_PINS_D6     27
-#define LCD_PINS_D7     29
-#define BTN_EN1         10
-#define BTN_EN2         11
-#define BTN_ENC         26
+#define Z_ENABLE_PIN                          14
+#define LCD_PINS_RS                           30
+#define LCD_PINS_ENABLE                       28
+#define LCD_PINS_D4                           16
+#define LCD_PINS_D5                           17
+#define LCD_PINS_D6                           27
+#define LCD_PINS_D7                           29
+#define BTN_EN1                               10
+#define BTN_EN2                               11
+#define BTN_ENC                               26
 
 #if HAS_GRAPHICAL_LCD
   #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
diff --git a/Marlin/src/pins/sanguino/pins_OMCA.h b/Marlin/src/pins/sanguino/pins_OMCA.h
index c2ba1ed7073b..774910bd7d46 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA.h
@@ -86,66 +86,66 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         0
-#define Y_STOP_PIN         1
-#define Z_STOP_PIN         2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          25
-#define X_ENABLE_PIN       10
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             25
+#define X_ENABLE_PIN                          10
 
-#define Y_STEP_PIN         28
-#define Y_DIR_PIN          27
-#define Y_ENABLE_PIN       10
+#define Y_STEP_PIN                            28
+#define Y_DIR_PIN                             27
+#define Y_ENABLE_PIN                          10
 
-#define Z_STEP_PIN         23
-#define Z_DIR_PIN          22
-#define Z_ENABLE_PIN       10
+#define Z_STEP_PIN                            23
+#define Z_DIR_PIN                             22
+#define Z_ENABLE_PIN                          10
 
-#define E0_STEP_PIN        24
-#define E0_DIR_PIN         21
-#define E0_ENABLE_PIN      10
+#define E0_STEP_PIN                           24
+#define E0_DIR_PIN                            21
+#define E0_ENABLE_PIN                         10
 
-#define E1_STEP_PIN        -1   // 21
-#define E1_DIR_PIN         -1   // 20
-#define E1_ENABLE_PIN      -1   // 19
+#define E1_STEP_PIN                           -1  // 21
+#define E1_DIR_PIN                            -1  // 20
+#define E1_ENABLE_PIN                         -1  // 19
 
-#define E2_STEP_PIN        -1   // 21
-#define E2_DIR_PIN         -1   // 20
-#define E2_ENABLE_PIN      -1   // 18
+#define E2_STEP_PIN                           -1  // 21
+#define E2_DIR_PIN                            -1  // 20
+#define E2_ENABLE_PIN                         -1  // 18
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input (1,2 or I2C)
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input (1,2 or I2C)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        3   // DONE PWM on RIGHT connector
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           3  // DONE PWM on RIGHT connector
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN          14   // PWM on MIDDLE connector
+  #define FAN_PIN                             14  // PWM on MIDDLE connector
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               11
+#define SDSS                                  11
 
-#define I2C_SCL_PIN        16
-#define I2C_SDA_PIN        17
+#define I2C_SCL_PIN                           16
+#define I2C_SDA_PIN                           17
 
 // future proofing
-#define __FS  20
-#define __FD  19
-#define __GS  18
-#define __GD  13
+#define __FS                                  20
+#define __FD                                  19
+#define __GS                                  18
+#define __GD                                  13
 
-#define UNUSED_PWM         14   // PWM on LEFT connector
+#define UNUSED_PWM                            14  // PWM on LEFT connector
diff --git a/Marlin/src/pins/sanguino/pins_OMCA_A.h b/Marlin/src/pins/sanguino/pins_OMCA_A.h
index b8340a3debd8..73237743b820 100644
--- a/Marlin/src/pins/sanguino/pins_OMCA_A.h
+++ b/Marlin/src/pins/sanguino/pins_OMCA_A.h
@@ -85,54 +85,54 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          0
-#define Y_STOP_PIN          1
-#define Z_STOP_PIN          2
+#define X_STOP_PIN                             0
+#define Y_STOP_PIN                             1
+#define Z_STOP_PIN                             2
 
 //
 // Steppers
 //
-#define X_STEP_PIN         21
-#define X_DIR_PIN          20
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            21
+#define X_DIR_PIN                             20
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
-#define E1_STEP_PIN        -1   // 19
-#define E1_DIR_PIN         -1   // 18
-#define E1_ENABLE_PIN      24
+#define E1_STEP_PIN                           -1  // 19
+#define E1_DIR_PIN                            -1  // 18
+#define E1_ENABLE_PIN                         24
 
-#define E2_STEP_PIN        -1   // 17
-#define E2_DIR_PIN         -1   // 16
-#define E2_ENABLE_PIN      24
+#define E2_STEP_PIN                           -1  // 17
+#define E2_DIR_PIN                            -1  // 16
+#define E2_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input (D27)
+#define TEMP_0_PIN                             0  // Analog Input (D27)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
+#define HEATER_0_PIN                           4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           3
+  #define FAN_PIN                              3
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               11
+#define SDSS                                  11
 
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index 977ba16daf22..50d3a53779cb 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -63,60 +63,60 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         18
-#define Y_STOP_PIN         19
-#define Z_STOP_PIN         20
+#define X_STOP_PIN                            18
+#define Y_STOP_PIN                            19
+#define Z_STOP_PIN                            20
 
 //
 // Steppers
 //
-#define X_STEP_PIN         15
-#define X_DIR_PIN          21
+#define X_STEP_PIN                            15
+#define X_DIR_PIN                             21
 
-#define Y_STEP_PIN         22
-#define Y_DIR_PIN          23
+#define Y_STEP_PIN                            22
+#define Y_DIR_PIN                             23
 
-#define Z_STEP_PIN          3
-#define Z_DIR_PIN           2
+#define Z_STEP_PIN                             3
+#define Z_DIR_PIN                              2
 
-#define E0_STEP_PIN         1
-#define E0_DIR_PIN          0
+#define E0_STEP_PIN                            1
+#define E0_DIR_PIN                             0
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN        6   // Analog Input (pin 34 bed)
+#define TEMP_0_PIN                             7  // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN                           6  // Analog Input (pin 34 bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13   // (extruder)
+#define HEATER_0_PIN                          13  // (extruder)
 
 #if ENABLED(SANGUINOLOLU_V_1_2)
 
-  #define HEATER_BED_PIN   12   // (bed)
-  #define X_ENABLE_PIN     14
-  #define Y_ENABLE_PIN     14
-  #define Z_ENABLE_PIN     26
-  #define E0_ENABLE_PIN    14
+  #define HEATER_BED_PIN                      12  // (bed)
+  #define X_ENABLE_PIN                        14
+  #define Y_ENABLE_PIN                        14
+  #define Z_ENABLE_PIN                        26
+  #define E0_ENABLE_PIN                       14
 
   #if !defined(FAN_PIN) && ENABLED(LCD_I2C_PANELOLU2)
-    #define FAN_PIN         4   // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
+    #define FAN_PIN                            4  // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
   #endif
 
 #else
 
-  #define HEATER_BED_PIN   14   // (bed)
-  #define X_ENABLE_PIN     -1
-  #define Y_ENABLE_PIN     -1
-  #define Z_ENABLE_PIN     -1
-  #define E0_ENABLE_PIN    -1
+  #define HEATER_BED_PIN                      14  // (bed)
+  #define X_ENABLE_PIN                        -1
+  #define Y_ENABLE_PIN                        -1
+  #define Z_ENABLE_PIN                        -1
+  #define E0_ENABLE_PIN                       -1
 
 #endif
 
 #if !defined(FAN_PIN) && (MB(AZTEEG_X1, STB_11) || IS_MELZI)
-  #define FAN_PIN           4   // Works for Panelolu2 too
+  #define FAN_PIN                              4  // Works for Panelolu2 too
 #endif
 
 //
@@ -129,17 +129,17 @@
  * If you encounter issues with these pins, upgrade your
  * Sanguino libraries! See #368.
  */
-//#define SDSS               24
-#define SDSS               31
+//#define SDSS                                24
+#define SDSS                                  31
 
 #if IS_MELZI
-  #define LED_PIN          27
+  #define LED_PIN                             27
 #elif MB(STB_11)
-  #define LCD_BACKLIGHT_PIN 17   // LCD backlight LED
+  #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
 #endif
 
-#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)  // try to use IO Header
-  #define CASE_LIGHT_PIN     4   // Hardware PWM  - see if IO Header is available
+#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
+  #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
 #endif
 
 /**
@@ -156,57 +156,57 @@
 //
 #if HAS_SPI_LCD
 
-  #define SD_DETECT_PIN         -1
+  #define SD_DETECT_PIN                       -1
 
   #if HAS_GRAPHICAL_LCD
 
     #if ENABLED(LCD_FOR_MELZI)
 
-      #define LCD_PINS_RS       17
-      #define LCD_PINS_ENABLE   16
-      #define LCD_PINS_D4       11
+      #define LCD_PINS_RS                     17
+      #define LCD_PINS_ENABLE                 16
+      #define LCD_PINS_D4                     11
 
       #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
       #define BOARD_ST7920_DELAY_2 DELAY_NS(188)
       #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
 
-    #elif ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
+    #elif ENABLED(U8GLIB_ST7920)                  // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
 
       #if IS_MELZI
-        #define LCD_PINS_RS     30   // CS chip select /SS chip slave select
-        #define LCD_PINS_ENABLE 29   // SID (MOSI)
-        #define LCD_PINS_D4     17   // SCK (CLK) clock
+        #define LCD_PINS_RS                   30  // CS chip select /SS chip slave select
+        #define LCD_PINS_ENABLE               29  // SID (MOSI)
+        #define LCD_PINS_D4                   17  // SCK (CLK) clock
         // Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
         // with M42 instead of BEEPER_PIN.
-        #define BEEPER_PIN      27
-      #else        // Sanguinololu >=1.3
-        #define LCD_PINS_RS      4
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4     30
-        #define LCD_PINS_D5     29
-        #define LCD_PINS_D6     28
-        #define LCD_PINS_D7     27
+        #define BEEPER_PIN                    27
+      #else                                       // Sanguinololu >=1.3
+        #define LCD_PINS_RS                    4
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   30
+        #define LCD_PINS_D5                   29
+        #define LCD_PINS_D6                   28
+        #define LCD_PINS_D7                   27
       #endif
 
     #else
 
-      #define DOGLCD_A0         30
+      #define DOGLCD_A0                       30
 
       #if ENABLED(MAKRPANEL)
 
-        #define BEEPER_PIN      29
-        #define DOGLCD_CS       17
-        #define LCD_BACKLIGHT_PIN 28   // PA3
+        #define BEEPER_PIN                    29
+        #define DOGLCD_CS                     17
+        #define LCD_BACKLIGHT_PIN             28  // PA3
 
       #elif IS_MELZI
 
-        #define BEEPER_PIN      27
-        #define DOGLCD_CS       28
+        #define BEEPER_PIN                    27
+        #define DOGLCD_CS                     28
 
-      #else // !MAKRPANEL
+      #else                                       // !MAKRPANEL
 
-        #define DOGLCD_CS       29
+        #define DOGLCD_CS                     29
 
       #endif
 
@@ -218,57 +218,57 @@
     //#define LCD_SCREEN_ROT_180
     //#define LCD_SCREEN_ROT_270
 
-  #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
+  #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
 
-    #define LCD_PINS_RS    28
-    #define LCD_PINS_ENABLE 29
-    #define LCD_PINS_D4    10
-    #define LCD_PINS_D5    11
-    #define LCD_PINS_D6    16
-    #define LCD_PINS_D7    17
+    #define LCD_PINS_RS                       28
+    #define LCD_PINS_ENABLE                   29
+    #define LCD_PINS_D4                       10
+    #define LCD_PINS_D5                       11
+    #define LCD_PINS_D6                       16
+    #define LCD_PINS_D7                       17
 
   #else
 
-    #define LCD_PINS_RS     4
-    #define LCD_PINS_ENABLE 17
-    #define LCD_PINS_D4    30
-    #define LCD_PINS_D5    29
-    #define LCD_PINS_D6    28
-    #define LCD_PINS_D7    27
+    #define LCD_PINS_RS                        4
+    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_D4                       30
+    #define LCD_PINS_D5                       29
+    #define LCD_PINS_D6                       28
+    #define LCD_PINS_D7                       27
 
   #endif
 
   #if ENABLED(LCD_FOR_MELZI)
 
-    #define BTN_ENC        28
-    #define BTN_EN1        29
-    #define BTN_EN2        30
+    #define BTN_ENC                           28
+    #define BTN_EN1                           29
+    #define BTN_EN2                           30
 
-  #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
+  #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
 
-    #define ADC_KEYPAD_PIN  1
-    #define BTN_EN1        -1
-    #define BTN_EN2        -1
+    #define ADC_KEYPAD_PIN                     1
+    #define BTN_EN1                           -1
+    #define BTN_EN2                           -1
 
   #elif ENABLED(LCD_I2C_PANELOLU2)
 
     #if IS_MELZI
-      #define BTN_ENC      29
-      #define LCD_SDSS     30   // Panelolu2 SD card reader rather than the Melzi
+      #define BTN_ENC                         29
+      #define LCD_SDSS                        30  // Panelolu2 SD card reader rather than the Melzi
     #else
-      #define BTN_ENC      30
+      #define BTN_ENC                         30
     #endif
 
-  #else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
+  #else                                           // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
 
-    #define BTN_ENC        16
-    #define LCD_SDSS       28   // Smart Controller SD card reader rather than the Melzi
+    #define BTN_ENC                           16
+    #define LCD_SDSS                          28  // Smart Controller SD card reader rather than the Melzi
 
   #endif
 
   #if ENABLED(NEWPANEL) && !defined(BTN_EN1)
-    #define BTN_EN1        11
-    #define BTN_EN2        10
+    #define BTN_EN1                           11
+    #define BTN_EN2                           10
   #endif
 
 #endif // HAS_SPI_LCD
@@ -277,13 +277,13 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
-  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)  // try to use IO Header
+  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
 
-    #define SPINDLE_LASER_ENA_PIN    10   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM
-    #define SPINDLE_DIR_PIN          11
+    #define SPINDLE_LASER_ENA_PIN             10  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   11
 
-  #elif !MB(MELZI)  // use X stepper motor socket
+  #elif !MB(MELZI)                                // use X stepper motor socket
 
     /**
      *  To control the spindle speed and have an LCD you must sacrifice
@@ -315,11 +315,11 @@
     #undef X_DIR_PIN
     #undef X_ENABLE_PIN
     #undef X_STEP_PIN
-    #define X_DIR_PIN                 0
-    #define X_ENABLE_PIN             14
-    #define X_STEP_PIN                1
-    #define SPINDLE_LASER_PWM_PIN    15   // Hardware PWM
-    #define SPINDLE_LASER_ENA_PIN    21   // Pullup!
-    #define SPINDLE_DIR_PIN          -1   // No pin available on the socket for the direction pin
+    #define X_DIR_PIN                          0
+    #define X_ENABLE_PIN                      14
+    #define X_STEP_PIN                         1
+    #define SPINDLE_LASER_PWM_PIN             15  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             21  // Pullup!
+    #define SPINDLE_DIR_PIN                   -1  // No pin available on the socket for the direction pin
   #endif
 #endif
diff --git a/Marlin/src/pins/sanguino/pins_SETHI.h b/Marlin/src/pins/sanguino/pins_SETHI.h
index 528ec4455f48..b945869cbccb 100644
--- a/Marlin/src/pins/sanguino/pins_SETHI.h
+++ b/Marlin/src/pins/sanguino/pins_SETHI.h
@@ -57,69 +57,69 @@
 #define BOARD_INFO_NAME "Sethi 3D_1"
 
 #ifndef GEN7_VERSION
-  #define GEN7_VERSION 12   // v1.x
+  #define GEN7_VERSION                        12  // v1.x
 #endif
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN          2
-#define Y_STOP_PIN          0
-#define Z_MIN_PIN           1
-#define Z_MAX_PIN           0
+#define X_STOP_PIN                             2
+#define Y_STOP_PIN                             0
+#define Z_MIN_PIN                              1
+#define Z_MAX_PIN                              0
 
 //
 // Steppers
 //
-#define X_STEP_PIN         19
-#define X_DIR_PIN          18
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            19
+#define X_DIR_PIN                             18
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24
 
-#define Z_STEP_PIN         26
-#define Z_DIR_PIN          25
-#define Z_ENABLE_PIN       24
+#define Z_STEP_PIN                            26
+#define Z_DIR_PIN                             25
+#define Z_ENABLE_PIN                          24
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         24
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN      3
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                         3
 
 #ifndef FAN_PIN
   #if GEN7_VERSION >= 13
     // Gen7 v1.3 removed the fan pin
-    #define FAN_PIN          -1
+    #define FAN_PIN                           -1
   #else
-    #define FAN_PIN          31
+    #define FAN_PIN                           31
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          15
+#define PS_ON_PIN                             15
 
 // All these generations of Gen7 supply thermistor power
 // via PS_ON, so ignore bad thermistor readings
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD     2000
 
 // our pin for debugging.
-#define DEBUG_PIN           0
+#define DEBUG_PIN                              0
 
 // our RS485 pins
-#define TX_ENABLE_PIN      12
-#define RX_ENABLE_PIN      13
+#define TX_ENABLE_PIN                         12
+#define RX_ENABLE_PIN                         13
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 807ee99e235f..180bc8d6f6cb 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -278,9 +278,9 @@
 #endif
 
 #define _E6_CS
+#define _E6_MS1
 #define _E6_MS2
 #define _E6_MS3
-#define _E6_MS4
 
 #if E_NEEDED(6)
   #if PIN_EXISTS(E6_CS) && AXIS_HAS_SPI(E6)
@@ -302,9 +302,9 @@
 #endif
 
 #define _E7_CS
+#define _E7_MS1
+#define _E7_MS2
 #define _E7_MS3
-#define _E7_MS4
-#define _E7_MS5
 
 #if E_NEEDED(7)
   #if PIN_EXISTS(E7_CS) && AXIS_HAS_SPI(E7)
diff --git a/Marlin/src/pins/stm32/pins_ARMED.h b/Marlin/src/pins/stm32/pins_ARMED.h
deleted file mode 100644
index 03f267a3a456..000000000000
--- a/Marlin/src/pins/stm32/pins_ARMED.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-//  https://github.com/ktand/Armed
-
-#pragma once
-
-#ifndef STM32F4
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "Arm'ed supports up to 2 hotends / E-steppers."
-#endif
-
-#ifndef ARMED_V1_0
-  #define ARMED_V1_1
-#endif
-
-#undef BOARD_INFO_NAME // Defined on the command line by Arduino Core STM32
-#define BOARD_INFO_NAME      "Arm'ed"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-#define I2C_EEPROM
-
-#undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
-#define E2END 0xFFF // 4KB
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PE0
-#define Y_STOP_PIN         PE1
-#define Z_STOP_PIN         PE14
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-//#ifndef Z_MIN_PROBE_PIN
-//  #define Z_MIN_PROBE_PIN  PA4
-//#endif
-
-//
-// Filament Runout Sensor
-//
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA3
-#endif
-
-//
-// Steppers
-//
-
-#ifdef ARMED_SWAP_X_E1
-  #define X_STEP_PIN       PE4
-  #define X_DIR_PIN        PE2
-  #define X_ENABLE_PIN     PE3
-  #define X_CS_PIN         PE5
-#else
-  #define X_STEP_PIN       PD3
-  #define X_DIR_PIN        PD2
-  #define X_ENABLE_PIN     PD0
-  #define X_CS_PIN         PD1
-#endif
-
-#define Y_STEP_PIN         PE11
-#define Y_DIR_PIN          PE10
-#define Y_ENABLE_PIN       PE13
-#define Y_CS_PIN           PE12
-
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD7
-#define Z_ENABLE_PIN       PD4
-#define Z_CS_PIN           PD5
-
-#define E0_STEP_PIN        PB5
-#define E0_DIR_PIN         PB6
-#ifdef ARMED_V1_1
-  #define E0_ENABLE_PIN    PC12
-#else
-  #define E0_ENABLE_PIN    PB3
-#endif
-#define E0_CS_PIN          PB4
-
-#ifdef ARMED_SWAP_X_E1
-  #define E1_STEP_PIN      PD3
-  #define E1_DIR_PIN       PD2
-  #define E1_ENABLE_PIN    PD0
-  #define E1_CS_PIN        PD1
-#else
-  #define E1_STEP_PIN      PE4
-  #define E1_DIR_PIN       PE2
-  #define E1_ENABLE_PIN    PE3
-  #define E1_CS_PIN        PE5
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_BED_PIN       PC2   // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PA1   // Hardware PWM
-#define HEATER_1_PIN       PA2   // Hardware PWM
-#define HEATER_BED_PIN     PA0   // Hardware PWM
-
-#define FAN_PIN            PC6   // Hardware PWM, Part cooling fan
-#define FAN1_PIN           PC7   // Hardware PWM, Extruder fan
-#define FAN2_PIN           PC8   // Hardware PWM, Controller fan
-
-//
-// Misc functions
-//
-#define SDSS               PE7
-#define LED_PIN            PB7   // Heart beat
-#define PS_ON_PIN          PA10
-#define KILL_PIN           PA8
-#define PWR_LOSS           PA4   // Power loss / nAC_FAULT
-
-//
-// LCD / Controller
-//
-#define SD_DETECT_PIN      PA15
-#define BEEPER_PIN         PC9
-
-#if ENABLED(FYSETC_MINI_12864)
-  //
-  // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
-  //
-  #define DOGLCD_A0        PE9
-  #define DOGLCD_CS        PE8
-
-  #define LCD_BACKLIGHT_PIN -1
-
-  #define LCD_RESET_PIN    PB12   // Must be high or open for LCD to operate normally.
-
-  #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
-    #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN PB13
-    #endif
-    #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN PB14
-    #endif
-    #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN PB15
-    #endif
-  #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN   PB13
-  #endif
-#else
-  #define LCD_PINS_RS      PE9
-  #define LCD_PINS_ENABLE  PE8
-  #define LCD_PINS_D4      PB12
-  #define LCD_PINS_D5      PB13
-  #define LCD_PINS_D6      PB14
-  #define LCD_PINS_D7      PB15
-
-  #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      PB13
-    #define DOGLCD_A0      PB14
-  #endif
-#endif
-
-#define BTN_EN1            PC4
-#define BTN_EN2            PC5
-#define BTN_ENC            PC3
-
-//
-// Extension pins
-//
-#define EXT0_PIN           PB0
-#define EXT1_PIN           PB1
-#define EXT2_PIN           PB2
-#define EXT3_PIN           PD8
-#define EXT4_PIN           PD9
-#define EXT5_PIN           PD10
-#define EXT6_PIN           PD11
-#define EXT7_PIN           PD12
-#define EXT8_PIN           PB10
-#define EXT9_PIN           PB11
diff --git a/Marlin/src/pins/stm32/pins_BEAST.h b/Marlin/src/pins/stm32/pins_BEAST.h
deleted file mode 100644
index d779994d1926..000000000000
--- a/Marlin/src/pins/stm32/pins_BEAST.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if !defined(__STM32F1__) && !defined(__STM32F4__)
-  #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
-#endif
-
-/**
- * 21017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME      "Beast STM32"
-#define DEFAULT_MACHINE_NAME "STM32F103RET6"
-
-// Enable I2C_EEPROM for testing
-#define I2C_EEPROM
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PE0
-#define X_DIR_PIN          PE1
-#define X_ENABLE_PIN       PC0
-#define X_MIN_PIN          PD5
-#define X_MAX_PIN          -1
-
-#define Y_STEP_PIN         PE2
-#define Y_DIR_PIN          PE3
-#define Y_ENABLE_PIN       PC1
-#define Y_MIN_PIN          PD6
-#define Y_MAX_PIN
-
-#define Z_STEP_PIN         PE4
-#define Z_DIR_PIN          PE5
-#define Z_ENABLE_PIN       PC2
-#define Z_MIN_PIN          PD7
-#define Z_MAX_PIN          -1
-
-#define Y2_STEP_PIN        -1
-#define Y2_DIR_PIN         -1
-#define Y2_ENABLE_PIN      -1
-
-#define Z2_STEP_PIN        -1
-#define Z2_DIR_PIN         -1
-#define Z2_ENABLE_PIN      -1
-
-#define E0_STEP_PIN        PE6
-#define E0_DIR_PIN         PE7
-#define E0_ENABLE_PIN      PC3
-
-/**
- * TODO: Currently using same Enable pin to all steppers.
- */
-
-#define E1_STEP_PIN        PE8
-#define E1_DIR_PIN         PE9
-#define E1_ENABLE_PIN      PC4
-
-#define E2_STEP_PIN        PE10
-#define E2_DIR_PIN         PE11
-#define E2_ENABLE_PIN      PC5
-
-//
-// Misc. Functions
-//
-#define SDSS               PA15
-#define LED_PIN            PB2
-
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PD12   // EXTRUDER 1
-#define HEATER_1_PIN       PD13
-#define HEATER_2_PIN       PD14
-
-#define HEATER_BED_PIN     PB9   // BED
-#define HEATER_BED2_PIN    -1    // BED2
-#define HEATER_BED3_PIN    -1    // BED3
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PB10
-#endif
-
-#define FAN_SOFT_PWM
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN       PA0   // Analog Input
-#define TEMP_0_PIN         PA1   // Analog Input
-#define TEMP_1_PIN         PA2   // Analog Input
-#define TEMP_2_PIN         PA3   // Analog Input
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
-  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
-  #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
-  #else
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
-    #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        33
-      // Buttons attached to a shift register
-      // Not wired yet
-      //#define SHIFT_CLK 38
-      //#define SHIFT_LD 42
-      //#define SHIFT_OUT 40
-      //#define SHIFT_EN 17
-    #endif
-  #endif
-
-  #if ENABLED(NEWPANEL)
-
-    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
-      #define BEEPER_PIN        37
-
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
-
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
-
-      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
-      #endif
-
-    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
-
-    #elif ENABLED(LCD_I2C_PANELOLU2)
-
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     -1
-      #define KILL_PIN          41
-
-    #elif ENABLED(LCD_I2C_VIKI)
-
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
-      #define BTN_ENC           -1
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     49
-
-    #elif ANY(VIKI2, miniVIKI)
-
-      #define BEEPER_PIN        33
-
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
-      #define LCD_SCREEN_ROT_180
-
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
-
-      #define SDSS              53
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
-
-      #define KILL_PIN          31
-
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
-
-    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
-      #define SD_DETECT_PIN     49
-      #define LCD_SDSS          53
-      #define KILL_PIN          41
-      #define BEEPER_PIN        23
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
-      #define LCD_BACKLIGHT_PIN 33
-
-    #elif ENABLED(MINIPANEL)
-
-      #define BEEPER_PIN        42
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS              53
-
-      #define KILL_PIN          64
-      // GLCD features
-      // Uncomment screen orientation
-      //#define LCD_SCREEN_ROT_90
-      //#define LCD_SCREEN_ROT_180
-      //#define LCD_SCREEN_ROT_270
-      // The encoder and click button
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
-      // not connected to a pin
-      #define SD_DETECT_PIN     49
-
-    #else
-
-      // Beeper on AUX-4
-      #define BEEPER_PIN        33
-
-      // Buttons directly attached to AUX-2
-      #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-      #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
-      #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
-      #endif
-
-      #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
-      #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
-      #endif
-
-    #endif
-  #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
deleted file mode 100644
index d0edf897f407..000000000000
--- a/Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * STM32F407VET6 with RAMPS-like shield
- * 'Black' STM32F407VET6 board - http://wiki.stm32duino.com/index.php?title=STM32F407
- * Shield - https://github.com/jmz52/Hardware
- */
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
-#endif
-
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "Black STM32F4VET6"
-#endif
-
-#define DEFAULT_MACHINE_NAME "STM32F407VET6"
-
-//#define I2C_EEPROM
-//#define E2END 0x1FFF // 8KB
-#define SRAM_EEPROM_EMULATION
-
-//
-// Servos
-//
-#define SERVO0_PIN         PC6
-#define SERVO1_PIN         PC7
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PC13
-#define X_MAX_PIN          PA15
-#define Y_MIN_PIN          PA5
-#define Y_MAX_PIN          PD12
-#define Z_MIN_PIN          PD14
-#define Z_MAX_PIN          PD15
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PC4
-#define X_DIR_PIN          PA4
-#define X_ENABLE_PIN       PE7
-
-#define Y_STEP_PIN         PE5
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PE6
-
-#define Z_STEP_PIN         PD5
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PD6
-
-#define E0_STEP_PIN        PD7
-#define E0_DIR_PIN         PD0
-#define E0_ENABLE_PIN      PB9
-
-#define E1_STEP_PIN        PE0
-#define E1_DIR_PIN         PE1
-#define E1_ENABLE_PIN      PB8
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC0  // T0
-#define TEMP_1_PIN         PC1  // T1
-#define TEMP_BED_PIN       PC2  // TB
-
-#ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN PC3  // TC
-#endif
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PA2  // Heater0
-#define HEATER_1_PIN       PA3  // Heater1
-#define HEATER_BED_PIN     PA1  // Hotbed
-
-#define FAN_PIN            PE9  // Fan0
-#define FAN1_PIN           PE11 // Fan1
-#define FAN2_PIN           PE13 // Fan2
-#define FAN3_PIN           PE14 // Fan3
-
-//
-// Misc. Functions
-//
-#define LED_PIN            PA6
-//#define LED_PIN          PA7
-#define KILL_PIN           PB1
-
-//
-// LCD / Controller
-//
-//#define SD_DETECT_PIN      PC5
-//#define SD_DETECT_PIN      PA8  // SDIO SD_DETECT_PIN, external SDIO card reader only
-
-#define BEEPER_PIN         PD10
-#define LCD_PINS_RS        PE15
-#define LCD_PINS_ENABLE    PD8
-#define LCD_PINS_D4        PE10
-#define LCD_PINS_D5        PE12
-#define LCD_PINS_D6        PD1
-#define LCD_PINS_D7        PE8
-#define BTN_ENC            PD9
-#define BTN_EN1            PD4
-#define BTN_EN2            PD13
-
-#define DOGLCD_CS          LCD_PINS_D5
-#define DOGLCD_A0          LCD_PINS_D6
-
-//
-// Onboard SD support
-//
-#define SDIO_D0_PIN        PC8
-#define SDIO_D1_PIN        PC9
-#define SDIO_D2_PIN        PC10
-#define SDIO_D3_PIN        PC11
-#define SDIO_CK_PIN        PC12
-#define SDIO_CMD_PIN       PD2
-
-#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
-  #define SDIO_SUPPORT     // Use SDIO for onboard SD
-
-  #ifndef SDIO_SUPPORT
-    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
-    #define SDSS           SDIO_D3_PIN
-    #define SCK_PIN        SDIO_CK_PIN
-    #define MISO_PIN       SDIO_D0_PIN
-    #define MOSI_PIN       SDIO_CMD_PIN
-  #endif
-#endif
diff --git a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
deleted file mode 100644
index aa2152c84fae..000000000000
--- a/Marlin/src/pins/stm32/pins_BTT_GTR_V1_0.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef TARGET_STM32F4
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 8 || E_STEPPERS > 8
-  #error "BIGTREE GTR V1.0 supports up to 8 hotends / E-steppers."
-#elif HOTENDS > MAX_EXTRUDERS || E_STEPPERS > MAX_EXTRUDERS
-  #error "Marlin extruder/hotends limit! Increase MAX_EXTRUDERS to continue."
-#endif
-
-#define BOARD_INFO_NAME "BIGTREE GTR 1.0"
-
-// Use one of these or SDCard-based Emulation will be used
-//#define I2C_EEPROM
-//#define SRAM_EEPROM_EMULATION   // Use BackSRAM-based EEPROM emulation
-//#define FLASH_EEPROM_EMULATION  // Use Flash-based EEPROM emulation
-
-#define TP   // Enable to define servo and probe pins
-
-//
-// Servos
-//
-#if ENABLED(TP)
-  #define SERVO0_PIN       PB11
-#endif
-
-#define PS_ON_PIN          PH6
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PF2
-#define X_MAX_PIN          PG14
-#define Y_MIN_PIN          PC13
-#define Y_MAX_PIN          PG9
-#define Z_MIN_PIN          PE0
-#define Z_MAX_PIN          PD3
-
-//
-// Pins on the extender
-//
-//#define X_MIN_PIN        PI4
-//#define X2_MIN_PIN       PF12
-//#define Y_MIN_PIN        PF4
-//#define Y2_MIN_PIN       PI7
-//#define Z_MIN_PIN        PF6
-
-#if ENABLED(TP) && !defined(Z_MIN_PROBE_PIN)
-  #define Z_MIN_PROBE_PIN PH11   // Z Probe must be PH11
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PC15
-#define X_DIR_PIN          PF0
-#define X_ENABLE_PIN       PF1
-#ifndef X_CS_PIN
-  #define X_CS_PIN         PC14
-#endif
-
-#define Y_STEP_PIN         PE3
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PE4
-#ifndef Y_CS_PIN
-  #define Y_CS_PIN         PE1
-#endif
-
-#define Z_STEP_PIN         PB8
-#define Z_DIR_PIN          PB7   // PB7
-#define Z_ENABLE_PIN       PB9
-#ifndef Z_CS_PIN
-  #define Z_CS_PIN         PB5
-#endif
-
-#define E0_STEP_PIN        PG12
-#define E0_DIR_PIN         PG11
-#define E0_ENABLE_PIN      PG13
-#ifndef E0_CS_PIN
-  #define E0_CS_PIN        PG10
-#endif
-
-#define E1_STEP_PIN        PD6
-#define E1_DIR_PIN         PD5
-#define E1_ENABLE_PIN      PD7
-#ifndef E1_CS_PIN
-  #define E1_CS_PIN        PD4
-#endif
-
-#define E2_STEP_PIN        PD1
-#define E2_DIR_PIN         PD0
-#define E2_ENABLE_PIN      PD2
-#ifndef E2_CS_PIN
-  #define E2_CS_PIN        PC12
-#endif
-
-#define E3_STEP_PIN        PF3
-#define E3_DIR_PIN         PG3
-#define E3_ENABLE_PIN      PF8
-#ifndef E3_CS_PIN
-  #define E3_CS_PIN        PG4
-#endif
-
-#define E4_STEP_PIN        PD14
-#define E4_DIR_PIN         PD11
-#define E4_ENABLE_PIN      PG2
-#ifndef E4_CS_PIN
-  #define E4_CS_PIN        PE15
-#endif
-
-#define E5_STEP_PIN        PE12
-#define E5_DIR_PIN         PE10
-#define E5_ENABLE_PIN      PF14
-#ifndef E5_CS_PIN
-  #define E5_CS_PIN        PE7
-#endif
-
-#define E6_STEP_PIN        PG0
-#define E6_DIR_PIN         PG1
-#define E6_ENABLE_PIN      PE8
-#ifndef E6_CS_PIN
-  #define E6_CS_PIN        PF15
-#endif
-
-#define E7_STEP_PIN        PH12
-#define E7_DIR_PIN         PH15
-#define E7_ENABLE_PIN      PI0
-#ifndef E7_CS_PIN
-  #define E7_CS_PIN        PH14
-#endif
-
-//
-// Software SPI pins for TMC2130 stepper drivers
-//
-#if ENABLED(TMC_USE_SW_SPI)
-  #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PG15
-  #endif
-  #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB6
-  #endif
-  #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB3
-  #endif
-#endif
-
-#if HAS_TMC220x
-  /**
-   * TMC2208/TMC2209 stepper drivers
-   *
-   * Hardware serial communication ports.
-   * If undefined software serial is used according to the pins below
-   */
-  //#define X_HARDWARE_SERIAL  Serial
-  //#define X2_HARDWARE_SERIAL Serial1
-  //#define Y_HARDWARE_SERIAL  Serial1
-  //#define Y2_HARDWARE_SERIAL Serial1
-  //#define Z_HARDWARE_SERIAL  Serial1
-  //#define Z2_HARDWARE_SERIAL Serial1
-  //#define E0_HARDWARE_SERIAL Serial1
-  //#define E1_HARDWARE_SERIAL Serial1
-  //#define E2_HARDWARE_SERIAL Serial1
-  //#define E3_HARDWARE_SERIAL Serial1
-  //#define E4_HARDWARE_SERIAL Serial1
-  //#define E5_HARDWARE_SERIAL Serial1
-  //#define E6_HARDWARE_SERIAL Serial1
-  //#define E7_HARDWARE_SERIAL Serial1
-
-  //
-  // Software serial
-  //
-  #define X_SERIAL_TX_PIN  PC14
-  #define X_SERIAL_RX_PIN  PC14
-
-  #define Y_SERIAL_TX_PIN  PE1
-  #define Y_SERIAL_RX_PIN  PE1
-
-  #define Z_SERIAL_TX_PIN  PB5
-  #define Z_SERIAL_RX_PIN  PB5
-
-  #define E0_SERIAL_TX_PIN PG10
-  #define E0_SERIAL_RX_PIN PG10
-
-  #define E1_SERIAL_TX_PIN PD4
-  #define E1_SERIAL_RX_PIN PD4
-
-  #define E2_SERIAL_TX_PIN PC12
-  #define E2_SERIAL_RX_PIN PC12
-
-  #define E3_SERIAL_TX_PIN PG4
-  #define E3_SERIAL_RX_PIN PG4
-
-  #define E4_SERIAL_TX_PIN PE15
-  #define E4_SERIAL_RX_PIN PE15
-
-  #define E5_SERIAL_TX_PIN PE7
-  #define E5_SERIAL_RX_PIN PE7
-
-  #define E6_SERIAL_TX_PIN PF15
-  #define E6_SERIAL_RX_PIN PF15
-
-  #define E7_SERIAL_TX_PIN PH14
-  #define E7_SERIAL_RX_PIN PH14
-
-  // Reduce baud rate to improve software serial reliability
-  #define TMC_BAUD_RATE 19200
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC1   // T1 <-> E0
-#define TEMP_1_PIN         PC2   // T2 <-> E1
-#define TEMP_2_PIN         PC3   // T3 <-> E2
-
-#define TEMP_3_PIN         PA3   // T4 <-> E3
-#define TEMP_4_PIN         PF9   // T5 <-> E4
-#define TEMP_5_PIN         PF10  // T6 <-> E5
-//#define TEMP_6_PIN         PF7   // T7 <-> E6
-//#define TEMP_7_PIN         PF5   // T8 <-> E7
-
-#define TEMP_BED_PIN       PC0   // T0 <-> Bed
-
-// SPI for Max6675 or Max31855 Thermocouple
-// Uses a separate SPI bus
-// If you have a two-way thermocouple, you can customize two THERMO_CSx_PIN pins (x:1~2)
-
-#define THERMO_SCK_PIN     PI1   // SCK
-#define THERMO_DO_PIN      PI2   // MISO
-#define THERMO_CS1_PIN     PH9   // CS1
-#define THERMO_CS2_PIN     PH2   // CS2
-
-#define MAX6675_SS_PIN     THERMO_CS1_PIN
-#define MAX6675_SS2_PIN    THERMO_CS2_PIN
-#define MAX6675_SCK_PIN    THERMO_SCK_PIN
-#define MAX6675_DO_PIN     THERMO_DO_PIN
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PB1   // Heater0
-#define HEATER_1_PIN       PA1   // Heater1
-#define HEATER_2_PIN       PB0   // Heater2
-
-#define HEATER_3_PIN       PD15  // Heater3
-#define HEATER_4_PIN       PD13  // Heater4
-#define HEATER_5_PIN       PD12  // Heater5
-//#define HEATER_6_PIN       PE13 // Heater6
-//#define HEATER_7_PIN       PI6  // Heater7
-
-#define HEATER_BED_PIN     PA2   // Hotbed
-
-#define FAN_PIN            PE5   // Fan0
-#define FAN1_PIN           PE6   // Fan1
-#define FAN2_PIN           PC8   // Fan2
-
-#define FAN3_PIN           PI5   // Fan3
-#define FAN4_PIN           PE9   // Fan4
-#define FAN5_PIN           PE11  // Fan5
-//#define FAN6_PIN           PC9   // Fan6
-//#define FAN7_PIN           PE14  // Fan7
-
-//
-// By default the onboard SD (SPI1) is enabled
-//
-#define CUSTOM_SPI_PINS
-#if DISABLED(CUSTOM_SPI_PINS)
-  #define SDSS             PB12
-#endif
-
-// HAL SPI1 pins group
-#if ENABLED(CUSTOM_SPI_PINS)
-  #define SDSS             PA4
-  #define SD_DETECT_PIN    PC4
-  #define LCD_SDSS         PA4
-
-  #define SCK_PIN          PA5
-  #define MISO_PIN         PA6
-  #define MOSI_PIN         PA7
-  #define SS_PIN           PA4   // Chip select for SD card used by Marlin
-#endif
-
-/**
- *               _____                                             _____
- *           NC | · · | GND                                    5V | · · | GND
- *        RESET | · · | PB10(SD_DETECT)             (LCD_D7)  PG5 | · · | PG6  (LCD_D6)
- *   (MOSI)PB15 | · · | PH10(BTN_EN2)               (LCD_D5)  PG7 | · · | PG8  (LCD_D4)
- *  (SD_SS)PB12 | · · | PD10(BTN_EN1)               (LCD_RS)  PA8 | · · | PC10 (LCD_EN)
- *    (SCK)PB13 | · · | PB14(MISO)                 (BTN_ENC) PA15 | · · | PC11  (BEEPER)
- *               ￣￣                                               ￣￣
- *               EXP2                                              EXP1
- */
-
-//
-// LCDs and Controllers
-//
-#if HAS_SPI_LCD
-  #define BEEPER_PIN       PC11
-  #define BTN_ENC          PA15
-
-  #if ENABLED(CR10_STOCKDISPLAY)
-
-    #define LCD_PINS_RS    PA8
-
-    #define BTN_EN1        PD10
-    #define BTN_EN2        PH10
-
-    #define LCD_PINS_ENABLE PG7
-    #define LCD_PINS_D4    PG8
-
-    //#undef ST7920_DELAY_1
-    //#undef ST7920_DELAY_2
-    //#undef ST7920_DELAY_3
-
-  #else
-
-    #define LCD_PINS_RS    PA8
-
-    #define BTN_EN1        PD10
-    #define BTN_EN2        PH10
-
-    #if DISABLED(CUSTOM_SPI_PINS)
-      #define SD_DETECT_PIN PB10
-      #define LCD_SDSS     PB12
-    #endif
-
-    #define LCD_PINS_ENABLE PC10
-    #define LCD_PINS_D4    PG8
-
-    #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    PC10
-      #define DOGLCD_A0    PA8
-      //#define LCD_BACKLIGHT_PIN -1
-      #define LCD_RESET_PIN PG8   // Must be high or open for LCD to operate normally.
-      #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
-        #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN PG7
-        #endif
-        #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PG6
-        #endif
-        #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PG5
-        #endif
-      #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PF13
-      #endif
-    #endif // !FYSETC_MINI_12864
-
-    #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PG7
-      #define LCD_PINS_D6  PG6
-      #define LCD_PINS_D7  PG5
-    #endif
-
-  #endif
-
-  // Alter timing for graphical display
-  #if HAS_GRAPHICAL_LCD
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
-  #endif
-
-  //#define DOGLCD_CS      PB12
-  //#define DOGLCD_A0      PA8
-  //#define LCD_PINS_DC    PB14
-  //#define DOGLCD_MOSI    PB15
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
deleted file mode 100644
index 77a412ad613b..000000000000
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef TARGET_STM32F1
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
-
-// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
-#define DISABLE_JTAG
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-#define FLASH_EEPROM_EMULATION
-#define EEPROM_PAGE_SIZE     uint16(0x800) // 2KB
-#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
-#undef E2END
-#define E2END                (EEPROM_PAGE_SIZE - 1) // 2KB
-
-//
-// Servos
-//
-#define SERVO0_PIN         PA1
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PC0
-#define Y_STOP_PIN         PC1
-#define Z_STOP_PIN         PC2
-
-//
-// Z Probe must be this pins
-//
-#define Z_MIN_PROBE_PIN    PC14
-
-//
-// Filament Runout Sensor
-//
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC15   // "E0-STOP"
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN       PB14
-#define X_STEP_PIN         PB13
-#define X_DIR_PIN          PB12
-
-#define Y_ENABLE_PIN       PB11
-#define Y_STEP_PIN         PB10
-#define Y_DIR_PIN          PB2
-
-#define Z_ENABLE_PIN       PB1
-#define Z_STEP_PIN         PB0
-#define Z_DIR_PIN          PC5
-
-#define E0_ENABLE_PIN      PD2
-#define E0_STEP_PIN        PB3
-#define E0_DIR_PIN         PB4
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PA0   // Analog Input
-#define TEMP_BED_PIN       PC3   // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PC8   // EXTRUDER
-#define HEATER_BED_PIN     PC9   // BED
-#define FAN_PIN            PA8
-
-//
-// USB connect control
-//
-#define USB_CONNECT_PIN    PC13
-#define USB_CONNECT_INVERTING false
-
-#define SD_DETECT_PIN      PC4
-
-/**
- *                 _____
- *             5V | 1 2 | GND
- *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
- *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
- *          RESET | 7 8 | PA9  (BTN_EN1)
- * (BTN_ENC) PB6  | 9 10| PB5  (BEEPER)
- *                 -----
- *                 EXP1
- */
-
-#define EXPA1_03_PIN       PB7
-#define EXPA1_04_PIN       PB8
-#define EXPA1_05_PIN       PB9
-#define EXPA1_06_PIN       PA10
-#define EXPA1_07_PIN       -1
-#define EXPA1_08_PIN       PA9
-#define EXPA1_09_PIN       PB6
-#define EXPA1_10_PIN       PB5
-
-#if HAS_SPI_LCD
-
-  #if ENABLED(CR10_STOCKDISPLAY)
-
-    #define BEEPER_PIN     EXPA1_10_PIN
-
-    #define BTN_EN1        EXPA1_08_PIN
-    #define BTN_EN2        EXPA1_06_PIN
-    #define BTN_ENC        EXPA1_09_PIN
-
-    #define LCD_PINS_RS    EXPA1_04_PIN
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
-    #define LCD_PINS_D4    EXPA1_05_PIN
-
-  #elif ENABLED(ZONESTAR_LCD)     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
-
-    #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
-
-    #define LCD_PINS_RS    EXPA1_05_PIN
-    #define LCD_PINS_ENABLE EXPA1_09_PIN
-    #define LCD_PINS_D4    EXPA1_04_PIN
-    #define LCD_PINS_D5    EXPA1_06_PIN
-    #define LCD_PINS_D6    EXPA1_08_PIN
-    #define LCD_PINS_D7    EXPA1_10_PIN
-    #define ADC_KEYPAD_PIN PA1    // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
-
-  #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
-
-    /** Creality Ender-2 display pinout
-     *                   _____
-     *               5V | 1 2 | GND
-     *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
-     *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
-     *            RESET | 7 8 | PA9  (BTN_EN1)
-     *   (BTN_ENC) PB6  | 9 10| PB5  (SCK)
-     *                   -----
-     *                    EXP1
-     */
-    #define BTN_EN1        EXPA1_08_PIN
-    #define BTN_EN2        EXPA1_06_PIN
-    #define BTN_ENC        EXPA1_09_PIN
-
-    #define DOGLCD_CS      EXPA1_04_PIN
-    #define DOGLCD_A0      EXPA1_05_PIN
-    #define DOGLCD_SCK     EXPA1_10_PIN
-    #define DOGLCD_MOSI    EXPA1_03_PIN
-    #define FORCE_SOFT_SPI
-    #define LCD_BACKLIGHT_PIN -1
-
-  #else
-
-    #error "Only ZONESTAR_LCD, MKS_MINI_12864, ENDER2_STOCKDISPLAY, and CR10_STOCKDISPLAY are currently supported on the BIGTREE_SKR_MINI_E3."
-
-  #endif
-
-#endif // HAS_SPI_LCD
-
-//
-// SD Support
-//
-#define HAS_ONBOARD_SD
-
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
-#endif
-
-#define ON_BOARD_SPI_DEVICE 1    // SPI1
-#define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
deleted file mode 100644
index 8222bbe14392..000000000000
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef TARGET_STM32F4
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
-  #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME "BIGTREE SKR Pro 1.1" // redefined?
-
-// Use one of these or SDCard-based Emulation will be used
-//#define SRAM_EEPROM_EMULATION   // Use BackSRAM-based EEPROM emulation
-//#define FLASH_EEPROM_EMULATION  // Use Flash-based EEPROM emulation
-
-//
-// Servos
-//
-#define SERVO0_PIN         PA1
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PB10
-#define X_MAX_PIN          PE15
-#define Y_MIN_PIN          PE12
-#define Y_MAX_PIN          PE10
-#define Z_MIN_PIN          PG8
-#define Z_MAX_PIN          PG5
-
-//
-// Z Probe must be this pins
-//
-#ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PA2
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PE9
-#define X_DIR_PIN          PF1
-#define X_ENABLE_PIN       PF2
-#ifndef X_CS_PIN
-  #define X_CS_PIN         PA15
-#endif
-
-#define Y_STEP_PIN         PE11
-#define Y_DIR_PIN          PE8
-#define Y_ENABLE_PIN       PD7
- #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PB8
-#endif
-
-#define Z_STEP_PIN         PE13
-#define Z_DIR_PIN          PC2
-#define Z_ENABLE_PIN       PC0
-#ifndef Z_CS_PIN
-  #define Z_CS_PIN         PB9
-#endif
-
-#define E0_STEP_PIN        PE14
-#define E0_DIR_PIN         PA0
-#define E0_ENABLE_PIN      PC3
-#ifndef E0_CS_PIN
-  #define E0_CS_PIN        PB3
-#endif
-
-#define E1_STEP_PIN        PD15
-#define E1_DIR_PIN         PE7
-#define E1_ENABLE_PIN      PA3
-#ifndef E1_CS_PIN
-  #define E1_CS_PIN        PG15
-#endif
-
-#define E2_STEP_PIN        PD13
-#define E2_DIR_PIN         PG9
-#define E2_ENABLE_PIN      PF0
-#ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG12
-#endif
-
-//
-// Software SPI pins for TMC2130 stepper drivers
-//
-#if ENABLED(TMC_USE_SW_SPI)
-  #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PC12
-  #endif
-  #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PC11
-  #endif
-  #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PC10
-  #endif
-#endif
-
-#if HAS_TMC220x
-  /**
-   * TMC2208/TMC2209 stepper drivers
-   *
-   * Hardware serial communication ports.
-   * If undefined software serial is used according to the pins below
-   */
-  //#define X_HARDWARE_SERIAL  Serial
-  //#define X2_HARDWARE_SERIAL Serial1
-  //#define Y_HARDWARE_SERIAL  Serial1
-  //#define Y2_HARDWARE_SERIAL Serial1
-  //#define Z_HARDWARE_SERIAL  Serial1
-  //#define Z2_HARDWARE_SERIAL Serial1
-  //#define E0_HARDWARE_SERIAL Serial1
-  //#define E1_HARDWARE_SERIAL Serial1
-  //#define E2_HARDWARE_SERIAL Serial1
-  //#define E3_HARDWARE_SERIAL Serial1
-  //#define E4_HARDWARE_SERIAL Serial1
-
-  //
-  // Software serial
-  //
-  #define X_SERIAL_TX_PIN  PC13
-  #define X_SERIAL_RX_PIN  PC13
-
-  #define Y_SERIAL_TX_PIN  PE3
-  #define Y_SERIAL_RX_PIN  PE3
-
-  #define Z_SERIAL_TX_PIN  PE1
-  #define Z_SERIAL_RX_PIN  PE1
-
-  #define E0_SERIAL_TX_PIN PD4
-  #define E0_SERIAL_RX_PIN PD4
-
-  #define E1_SERIAL_TX_PIN PD1
-  #define E1_SERIAL_RX_PIN PD1
-
-  #define E2_SERIAL_TX_PIN PD6
-  #define E2_SERIAL_RX_PIN PD6
-
-  // Reduce baud rate to improve software serial reliability
-  #define TMC_BAUD_RATE 19200
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PF4  // T1 <-> E0
-#define TEMP_1_PIN         PF5  // T2 <-> E1
-#define TEMP_2_PIN         PF6  // T3 <-> E2
-#define TEMP_BED_PIN       PF3  // T0 <-> Bed
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PB1  // Heater0
-#define HEATER_1_PIN       PD14 // Heater1
-#define HEATER_2_PIN       PB0  // Heater1
-#define HEATER_BED_PIN     PD12 // Hotbed
-#define FAN_PIN            PC8  // Fan0
-#define FAN1_PIN           PE5  // Fan1
-#define FAN2_PIN           PE6  // Fan2
-
-//
-// Misc. Functions
-//
-
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
-#endif
-
-//
-// Onboard SD card
-//   NOT compatible with LCD
-//
-#if SDCARD_CONNECTION == ONBOARD && !defined(HAS_SPI_LCD)
-  #define SOFTWARE_SPI            // Use soft SPI for onboard SD
-  #define SDSS             PA4
-  #define SCK_PIN          PA5
-  #define MISO_PIN         PA6
-  #define MOSI_PIN         PB5
-#else
-  #define SDSS             PB12
-#endif
-
-
-/**
- *               _____                                             _____
- *           NC | · · | GND                                    5V | · · | GND
- *        RESET | · · | PF12(SD_DETECT)             (LCD_D7)  PG7 | · · | PG6  (LCD_D6)
- *   (MOSI)PB15 | · · | PF11(BTN_EN2)               (LCD_D5)  PG3 | · · | PG2  (LCD_D4)
- *  (SD_SS)PB12 | · · | PG10(BTN_EN1)               (LCD_RS) PD10 | · · | PD11 (LCD_EN)
- *    (SCK)PB13 | · · | PB14(MISO)                 (BTN_ENC)  PA8 | · · | PG4  (BEEPER)
- *               ￣￣                                               ￣￣
- *               EXP2                                              EXP1
- */
-
-//
-// LCDs and Controllers
-//
-#if HAS_SPI_LCD
-  #define BEEPER_PIN       PG4
-  #define BTN_ENC          PA8
-
-  #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PG6
-
-    #define BTN_EN1        PD11
-    #define BTN_EN2        PG2
-
-    #define LCD_PINS_ENABLE PG7
-    #define LCD_PINS_D4    PG3
-
-    // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
-    // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
-    #undef ST7920_DELAY_1
-    #undef ST7920_DELAY_2
-    #undef ST7920_DELAY_3
-
-
-  #else
-
-    #define LCD_PINS_RS    PD10
-
-    #define BTN_EN1        PG10
-    #define BTN_EN2        PF11
-    #define SD_DETECT_PIN  PF12
-
-    #define LCD_SDSS       PB12
-
-    #define LCD_PINS_ENABLE PD11
-    #define LCD_PINS_D4    PG2
-
-    #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    PD11
-      #define DOGLCD_A0    PD10
-      //#define LCD_BACKLIGHT_PIN -1
-      #define LCD_RESET_PIN PG2   // Must be high or open for LCD to operate normally.
-      #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
-        #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN PG3
-        #endif
-        #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PG6
-        #endif
-        #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PG7
-        #endif
-      #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PG3
-      #endif
-    #endif // !FYSETC_MINI_12864
-
-    #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PG3
-      #define LCD_PINS_D6  PG6
-      #define LCD_PINS_D7  PG7
-    #endif
-
-  #endif
-
-  // Alter timing for graphical display
-  #if HAS_GRAPHICAL_LCD
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
-  #endif
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_CHITU3D.h b/Marlin/src/pins/stm32/pins_CHITU3D.h
deleted file mode 100644
index 2411500fb2b9..000000000000
--- a/Marlin/src/pins/stm32/pins_CHITU3D.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if !defined(__STM32F1__) && !defined(__STM32F4__)
-  #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
-#endif
-
-/**
- * 2017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME      "Chitu3D"
-#define DEFAULT_MACHINE_NAME "STM32F103RET6"
-
-// Enable I2C_EEPROM for testing
-//#define I2C_EEPROM
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PE5
-#define X_DIR_PIN          PE6
-#define X_ENABLE_PIN       PC13
-#define X_MIN_PIN          PG10
-#define X_MAX_PIN          -1
-
-#define Y_STEP_PIN         PE2
-#define Y_DIR_PIN          PE3
-#define Y_ENABLE_PIN       PE4
-#define Y_MIN_PIN          PA12
-#define Y_MAX_PIN
-
-#define Z_STEP_PIN         PB9
-#define Z_DIR_PIN          PE0
-#define Z_ENABLE_PIN       PE1
-#define Z_MIN_PIN          PA14
-#define Z_MAX_PIN          -1
-
-#define Y2_STEP_PIN        -1
-#define Y2_DIR_PIN         -1
-#define Y2_ENABLE_PIN      -1
-
-#define Z2_STEP_PIN        -1
-#define Z2_DIR_PIN         -1
-#define Z2_ENABLE_PIN      -1
-
-#define E0_STEP_PIN        PB4
-#define E0_DIR_PIN         PB5
-#define E0_ENABLE_PIN      PB8
-
-
-
-#define E1_STEP_PIN        -1
-#define E1_DIR_PIN         -1
-#define E1_ENABLE_PIN      -1
-
-#define E2_STEP_PIN        -1
-#define E2_DIR_PIN         -1
-#define E2_ENABLE_PIN      -1
-
-//
-// Misc. Functions
-//
-#define SDSS               -1
-#define LED_PIN            -1
-#define CASE_LIGHT_PIN      8
-
-#define PS_ON_PIN          -1
-#define KILL_PIN           PD6      // LED strip 24v
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PD12     // HOT-END
-#define HEATER_1_PIN       -1
-#define HEATER_2_PIN       -1
-
-#define HEATER_BED_PIN     PG11     // HOT-BED
-#define HEATER_BED2_PIN    -1       // BED2
-#define HEATER_BED3_PIN    -1       // BED3
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PG14     // MAIN BOARD FAN
-#endif
-
-#define FAN_SOFT_PWM
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN       PA0   // Analog Input
-#define TEMP_0_PIN         PA1   // Analog Input
-#define TEMP_1_PIN         -1   // Analog Input
-#define TEMP_2_PIN         -1   // Analog Input
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
-  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
-  #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
-  #else
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
-    #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        33
-      // Buttons attached to a shift register
-      // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
-    #endif
-  #endif
-
-  #if ENABLED(NEWPANEL)
-
-    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
-      #define BEEPER_PIN        37
-
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
-
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
-
-      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
-      #endif
-
-    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
-
-    #elif ENABLED(LCD_I2C_PANELOLU2)
-
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     -1
-      #define KILL_PIN          41
-
-    #elif ENABLED(LCD_I2C_VIKI)
-
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
-      #define BTN_ENC           -1
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     49
-
-    #elif ANY(VIKI2, miniVIKI)
-
-      #define BEEPER_PIN        33
-
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
-      #define LCD_SCREEN_ROT_180
-
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
-
-      #define SDSS              53
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
-
-      #define KILL_PIN          31
-
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
-
-    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
-      #define SD_DETECT_PIN     49
-      #define LCD_SDSS          53
-      #define KILL_PIN          41
-      #define BEEPER_PIN        23
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
-      #define LCD_BACKLIGHT_PIN 33
-
-    #elif ENABLED(MINIPANEL)
-
-      #define BEEPER_PIN        42
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS              53
-
-      #define KILL_PIN          64
-      // GLCD features
-      // Uncomment screen orientation
-      //#define LCD_SCREEN_ROT_90
-      //#define LCD_SCREEN_ROT_180
-      //#define LCD_SCREEN_ROT_270
-      // The encoder and click button
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
-      // not connected to a pin
-      #define SD_DETECT_PIN     49
-
-    #else
-
-      // Beeper on AUX-4
-      #define BEEPER_PIN        33
-
-      // Buttons directly attached to AUX-2
-      #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-      #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
-      #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
-      #endif
-
-      #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
-      #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
-      #endif
-
-    #endif
-  #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_FLYF407ZG.h b/Marlin/src/pins/stm32/pins_FLYF407ZG.h
deleted file mode 100644
index 97aaf3fdfc6a..000000000000
--- a/Marlin/src/pins/stm32/pins_FLYF407ZG.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 6 || E_STEPPERS > 6
-  #error "FLYF407ZG supports up to 6 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME      "FLYF407ZG"
-#define BOARD_WEBSITE_URL    "github.com/FLYmaker/FLYF407ZG"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-#undef E2END
-#define E2END 0xFFF // 4KB
-
-//
-// Servos
-//
-#define SERVO0_PIN         PE11
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PC3
-#define X_MAX_PIN          PC2
-#define Y_MIN_PIN          PF2
-#define Y_MAX_PIN          PF1
-#define Z_MIN_PIN          PF0
-#define Z_MAX_PIN          PC15
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#define Z_MIN_PROBE_PIN    PC14   // Z3_PIN
-
-//
-// Steppers
-//
-
-#define X_STEP_PIN         PB9
-#define X_DIR_PIN          PE0
-#define X_ENABLE_PIN       PE1
-#ifndef X_CS_PIN
-  #define X_CS_PIN         PG13
-#endif
-
-#define Y_STEP_PIN         PB8
-#define Y_DIR_PIN          PG11
-#define Y_ENABLE_PIN       PG12
-#ifndef Y_CS_PIN
-  #define Y_CS_PIN         PG10
-#endif
-
-#define Z_STEP_PIN         PA8
-#define Z_DIR_PIN          PD6
-#define Z_ENABLE_PIN       PD7
-#ifndef Z_CS_PIN
-  #define Z_CS_PIN         PD5
-#endif
-
-#define E0_STEP_PIN        PC7
-#define E0_DIR_PIN         PD3
-#define E0_ENABLE_PIN      PD4
-#ifndef E0_CS_PIN
-  #define E0_CS_PIN        PD1
-#endif
-
-#define E1_STEP_PIN        PC6
-#define E1_DIR_PIN         PA15
-#define E1_ENABLE_PIN      PD0
-#ifndef E1_CS_PIN
-  #define E1_CS_PIN        PA14
-#endif
-
-#define E2_STEP_PIN        PD15
-#define E2_DIR_PIN         PG7
-#define E2_ENABLE_PIN      PG8
-#ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG6
-#endif
-
-#define E3_STEP_PIN        PD14
-#define E3_DIR_PIN         PG4
-#define E3_ENABLE_PIN      PG5
-#ifndef E3_CS_PIN
-  #define E3_CS_PIN        PG3
-#endif
-
-#define E4_STEP_PIN        PD13
-#define E4_DIR_PIN         PD11
-#define E4_ENABLE_PIN      PG2
-#ifndef E4_CS_PIN
-  #define E4_CS_PIN        PD10
-#endif
-
-#define E5_STEP_PIN        PD12
-#define E5_DIR_PIN         PD8
-#define E5_ENABLE_PIN      PD9
-#ifndef E5_CS_PIN
-  #define E5_CS_PIN        PB12
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PA0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_2_PIN         PC0   // Analog Input
-#define TEMP_3_PIN         PF10  // Analog Input
-#define TEMP_4_PIN         PF5   // Analog Input
-#define TEMP_5_PIN         PF4   // Analog Input
-#define TEMP_BED_PIN       PF3   // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PF7
-#define HEATER_1_PIN       PF6
-#define HEATER_2_PIN       PE6
-#define HEATER_3_PIN       PE5
-#define HEATER_4_PIN       PE4
-#define HEATER_5_PIN       PA2
-#define HEATER_BED_PIN     PE2
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PF8
-#endif
-#define FAN1_PIN           PF9
-#define FAN2_PIN           PE3
-#define FAN3_PIN           PA1
-#define FAN4_PIN           PE13
-#define FAN5_PIN           PB11
-
-//
-// Onboard SD support
-//
-
-#define SDIO_D0_PIN        PC8
-#define SDIO_D1_PIN        PC9
-//#define SD_CARD_DETECT_PIN PC13
-#define SDIO_D2_PIN        PC10
-#define SDIO_D3_PIN        PC11
-#define SDIO_CK_PIN        PC12
-#define SDIO_CMD_PIN       PD2
-
-#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
-  #define SDIO_SUPPORT     // Use SDIO for onboard SD
-
-  #ifndef SDIO_SUPPORT
-    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
-    #define SDSS           SDIO_D3_PIN
-    #define SCK_PIN        SDIO_CK_PIN
-    #define MISO_PIN       SDIO_D0_PIN
-    #define MOSI_PIN       SDIO_CMD_PIN
-  #endif
-#endif
-
-//
-// Trinamic Software SPI
-//
-
-#if ENABLED(TMC_USE_SW_SPI)
-  #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB15
-  #endif
-  #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB14
-  #endif
-  #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB13
-  #endif
-#endif
-
-//
-// Trinamic Software Serial
-//
-
-#if HAS_TMC220x
-  #define X_SERIAL_TX_PIN  PG13
-  #define X_SERIAL_RX_PIN  PG13
-
-  #define Y_SERIAL_TX_PIN  PG10
-  #define Y_SERIAL_RX_PIN  PG10
-
-  #define Z_SERIAL_TX_PIN  PD5
-  #define Z_SERIAL_RX_PIN  PD5
-
-  #define E0_SERIAL_TX_PIN PD1
-  #define E0_SERIAL_RX_PIN PD1
-
-  #define E1_SERIAL_TX_PIN PA14
-  #define E1_SERIAL_RX_PIN PA14
-
-  #define E2_SERIAL_TX_PIN PG6
-  #define E2_SERIAL_RX_PIN PG6
-
-  #define E3_SERIAL_TX_PIN PG3
-  #define E3_SERIAL_RX_PIN PG3
-
-  #define E4_SERIAL_TX_PIN PD10
-  #define E4_SERIAL_RX_PIN PD10
-
-  #define E5_SERIAL_TX_PIN PB12
-  #define E5_SERIAL_RX_PIN PB12
-
-#endif
-
-
-//
-// LCD / Controller
-//
-#define SCK_PIN            PB13
-#define MISO_PIN           PB14
-#define MOSI_PIN           PB15
-#define SDSS               PF11
-#define SD_DETECT_PIN      PB2
-#define BEEPER_PIN         PB10
-#define LCD_PINS_RS        PE12
-#define LCD_PINS_ENABLE    PE14
-#define LCD_PINS_D4        PE10
-#define LCD_PINS_D5        PE9
-#define LCD_PINS_D6        PE8
-#define LCD_PINS_D7        PE7
-#define BTN_EN1            PC4
-#define BTN_EN2            PC5
-#define BTN_ENC            PE15
-
-//
-// Filament runout
-//
-
-#define FIL_RUNOUT_PIN     PA3
-
-//
-// ST7920 Delays
-//
-#ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(96)
-#endif
-#ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(48)
-#endif
-#ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_S6.h b/Marlin/src/pins/stm32/pins_FYSETC_S6.h
deleted file mode 100644
index 16f176a376f7..000000000000
--- a/Marlin/src/pins/stm32/pins_FYSETC_S6.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef STM32F4
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
-  #error "RUMBA32 supports up to 3 hotends / E-steppers."
-#endif
-
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "FYSETC_S6"
-#endif
-#ifndef DEFAULT_MACHINE_NAME
-  #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-#endif
-
-// change the prio to 3 , 2 is for software serial
-//#define TEMP_TIMER_IRQ_PRIO 3
-
-//
-// EEPROM Emulation
-//
-#define FLASH_EEPROM_EMULATION
-//#define SRAM_EEPROM_EMULATION
-//#define I2C_EEPROM
-#ifdef I2C_EEPROM
-  #undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
-  #define E2END 0xFFF // 4KB
-#endif
-
-//
-// Servos
-//
-#define SERVO0_PIN         PA3
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PB14
-#define X_MAX_PIN          PA1
-#define Y_MIN_PIN          PB13
-#define Y_MAX_PIN          PA2
-#define Z_MIN_PIN          PA0
-#define Z_MAX_PIN          PA3
-
-//
-// Filament Sensor
-//
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA1
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PE11
-#define X_DIR_PIN          PE10
-#define X_ENABLE_PIN       PE12
-#define X_CS_PIN           PE7
-
-#define Y_STEP_PIN         PD8
-#define Y_DIR_PIN          PB12
-#define Y_ENABLE_PIN       PD9
-#define Y_CS_PIN           PE15
-
-#define Z_STEP_PIN         PD14
-#define Z_DIR_PIN          PD13
-#define Z_ENABLE_PIN       PD15
-#define Z_CS_PIN           PD10
-
-#define E0_STEP_PIN        PD5
-#define E0_DIR_PIN         PD6
-#define E0_ENABLE_PIN      PD4
-#define E0_CS_PIN          PD7
-
-#define E1_STEP_PIN        PE6
-#define E1_DIR_PIN         PC13
-#define E1_ENABLE_PIN      PE5
-#define E1_CS_PIN          PC14
-
-#define E2_STEP_PIN        PE2
-#define E2_DIR_PIN         PE4
-#define E2_ENABLE_PIN      PE3
-#define E2_CS_PIN          PC15
-
-#if HAS_TMC220x
-  //
-  // TMC2208/TMC2209 stepper drivers
-  //
-
-  //
-  // Software serial
-  //
-  #define X_SERIAL_TX_PIN  PE9
-  #define X_SERIAL_RX_PIN  PE8
-
-  #define Y_SERIAL_TX_PIN  PE14
-  #define Y_SERIAL_RX_PIN  PE13
-
-  #define Z_SERIAL_TX_PIN  PD11
-  #define Z_SERIAL_RX_PIN  PD12
-
-  #define E0_SERIAL_TX_PIN PD3
-  #define E0_SERIAL_RX_PIN PA15
-
-  #define E1_SERIAL_TX_PIN PC4
-  #define E1_SERIAL_RX_PIN PC5
-
-  #define E2_SERIAL_TX_PIN PE1
-  #define E2_SERIAL_RX_PIN PE0
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC0
-#define TEMP_1_PIN         PC1
-#define TEMP_2_PIN         PC2
-#define TEMP_BED_PIN       PC3
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PB3
-#define HEATER_1_PIN       PB4
-#define HEATER_2_PIN       PB15
-#define HEATER_BED_PIN     PC8
-
-#define FAN_PIN            PB0
-#define FAN1_PIN           PB1
-#define FAN2_PIN           PB2
-
-//
-// SPI
-//
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
-
-//
-// Misc. Functions
-//
-//#define LED_PIN            PB14
-//#define BTN_PIN            PC10
-//#define PS_ON_PIN          PE11
-//#define KILL_PIN           PC5
-
-#define SDSS               PA4
-#define SD_DETECT_PIN  	   PB10
-
-//
-// LCD / Controller
-//
-#if HAS_SPI_LCD
-  #define BEEPER_PIN       PC9
-  #define BTN_ENC          PA8
-
-  #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PD0
-
-    #define BTN_EN1        PC11
-    #define BTN_EN2        PC10
-
-    #define LCD_PINS_ENABLE PD1
-    #define LCD_PINS_D4    PC12
-
-    // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
-    // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
-    #undef ST7920_DELAY_1
-    #undef ST7920_DELAY_2
-    #undef ST7920_DELAY_3
-
-  #else
-
-    #define LCD_PINS_RS    PD2
-
-    #define BTN_EN1        PC6
-    #define BTN_EN2        PC7
-
-    #define LCD_SDSS       PA4
-
-    #define LCD_PINS_ENABLE PC11
-    #define LCD_PINS_D4    PC10
-
-    #if ENABLED(FYSETC_MINI_12864)
-     // See https://wiki.fysetc.com/Mini12864_Panel
-      #define DOGLCD_CS    PC11
-      #define DOGLCD_A0    PD2
-      #if ENABLED(FYSETC_GENERIC_12864_1_1)
-        #define LCD_BACKLIGHT_PIN PD0
-      #endif
-      #define LCD_RESET_PIN PC10   // Must be high or open for LCD to operate normally.
-      #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
-        #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN PC12
-        #endif
-        #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PD0
-        #endif
-        #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PD1
-        #endif
-      #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PC12
-      #endif
-    #endif // !FYSETC_MINI_12864
-
-    #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PC12
-      #define LCD_PINS_D6  PD0
-      #define LCD_PINS_D7  PD1
-    #endif
-
-  #endif
-
-  // Alter timing for graphical display
-  #if HAS_GRAPHICAL_LCD
-    #ifndef ST7920_DELAY_1
-      #define ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef ST7920_DELAY_2
-      #define ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef ST7920_DELAY_3
-      #define ST7920_DELAY_3 DELAY_NS(600)
-    #endif
-  #endif
-
-#endif // HAS_SPI_LCD
-
-#ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN    PB6
-#endif
-#ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN    PB5
-#endif
-#ifndef RGB_LED_B_PIN
-  #define RGB_LED_B_PIN    PB7
-#endif
-#ifndef RGB_LED_W_PIN
-  #define RGB_LED_W_PIN    -1
-#endif
diff --git a/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h b/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
deleted file mode 100644
index 2909b7c53824..000000000000
--- a/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * To build with Arduino IDE use "Discovery F407VG"
- * To build with PlatformIO use environment "STM32F4"
- */
-#if !defined(STM32F4) && !defined(STM32F4xx)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "STM32F4 supports up to 2 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME      "Misc. STM32F4"
-#define DEFAULT_MACHINE_NAME "STM32F407VET6"
-
-//#define I2C_EEPROM
-
-#ifndef E2END
-  #define E2END 0xFFF // 4KB
-#endif
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PE0
-#define X_MAX_PIN          -1
-#define Y_MIN_PIN          PE1
-#define Y_MAX_PIN          -1
-#define Z_MIN_PIN          PE14
-#define Z_MAX_PIN          -1
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-
-//#ifndef Z_MIN_PROBE_PIN
-//  #define Z_MIN_PROBE_PIN  PA4
-//#endif
-
-//
-// Steppers
-//
-
-#define X_STEP_PIN         PD3
-#define X_DIR_PIN          PD2
-#define X_ENABLE_PIN       PD0
-//#ifndef X_CS_PIN
-//  #define X_CS_PIN         PD1
-//#endif
-
-#define Y_STEP_PIN         PE11
-#define Y_DIR_PIN          PE10
-#define Y_ENABLE_PIN       PE13
-//#ifndef Y_CS_PIN
-//  #define Y_CS_PIN         PE12
-//#endif
-
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD7
-#define Z_ENABLE_PIN       PD4
-//#ifndef Z_CS_PIN
-//  #define Z_CS_PIN         PD5
-//#endif
-
-#define E0_STEP_PIN        PB5
-#define E0_DIR_PIN         PB6
-#define E0_ENABLE_PIN      PB3
-//#ifndef E0_CS_PIN
-//  #define E0_CS_PIN         PB4
-//#endif
-
-#define E1_STEP_PIN        PE4
-#define E1_DIR_PIN         PE2
-#define E1_ENABLE_PIN      PE3
-//#ifndef E1_CS_PIN
-//  #define E1_CS_PIN         PE5
-//#endif
-
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
-
-//
-// Temperature Sensors
-//
-
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_BED_PIN       PC2   // Analog Input
-
-//
-// Heaters / Fans
-//
-
-#define HEATER_0_PIN       PA1
-#define HEATER_1_PIN       PA2
-#define HEATER_BED_PIN     PA0
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PC6
-#endif
-#define FAN1_PIN           PC7
-#define FAN2_PIN           PC8
-
-#define ORIG_E0_AUTO_FAN_PIN  FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Misc. Functions
-//
-
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN      PF13
-
-//
-// Průša i3 MK2 Multi Material Multiplexer Support
-//
-
-//#define E_MUX0_PIN         PG3
-//#define E_MUX1_PIN         PG4
-
-//
-// Servos
-//
-
-//#define SERVO0_PIN         PE13
-//#define SERVO1_PIN         PE14
-
-
-#define SDSS               PE7
-#define SS_PIN             PE7
-#define LED_PIN            PB7         //Alive
-#define PS_ON_PIN          PA10
-#define KILL_PIN           PA8
-#define PWR_LOSS           PA4         //Power loss / nAC_FAULT
-
-//
-// LCD / Controller
-//
-
-#define SD_DETECT_PIN      PA15
-#define BEEPER_PIN         PC9
-#define LCD_PINS_RS        PE9
-#define LCD_PINS_ENABLE    PE8
-#define LCD_PINS_D4        PB12
-#define LCD_PINS_D5        PB13
-#define LCD_PINS_D6        PB14
-#define LCD_PINS_D7        PB15
-#define BTN_EN1            PC4
-#define BTN_EN2            PC5
-#define BTN_ENC            PC3
-
-//
-// Filament runout
-//
-
-#define FIL_RUNOUT_PIN     PA3
-
-//
-// ST7920 Delays
-//
-#if HAS_GRAPHICAL_LCD
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_K.h b/Marlin/src/pins/stm32/pins_LERDGE_K.h
deleted file mode 100644
index 2b3ad6019920..000000000000
--- a/Marlin/src/pins/stm32/pins_LERDGE_K.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "LERDGE K supports up to 2 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME      "Lerdge K"
-#define DEFAULT_MACHINE_NAME "LERDGE"
-
-#define I2C_EEPROM
-
-// Ignore temp readings during develpment.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Servos
-//
-//#define SERVO0_PIN         PD12
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PG3
-#define Y_STOP_PIN         PG4
-#define Z_STOP_PIN         PG5
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-//#ifndef Z_MIN_PROBE_PIN
-//  #define Z_MIN_PROBE_PIN  PB15
-//#endif
-
-//
-// Filament runout
-//
-#define FIL_RUNOUT_PIN     PE6
-#define FIL_RUNOUT2_PIN    PE7
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PG1
-#define X_DIR_PIN          PB10
-#define X_ENABLE_PIN       PG0
-//#ifndef X_CS_PIN
-//  #define X_CS_PIN       PE0
-//#endif
-
-#define Y_STEP_PIN         PF14
-#define Y_DIR_PIN          PF15
-#define Y_ENABLE_PIN       PF13
-//#ifndef Y_CS_PIN
-//  #define Y_CS_PIN       PE1
-//#endif
-
-#define Z_STEP_PIN         PF11
-#define Z_DIR_PIN          PF12
-#define Z_ENABLE_PIN       PC5
-//#ifndef Z_CS_PIN
-//  #define Z_CS_PIN       PE2
-//#endif
-
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
-//#ifndef E0_CS_PIN
-//  #define E0_CS_PIN      PE3
-//#endif
-
-#define E1_STEP_PIN        PF1
-#define E1_DIR_PIN         PF0
-#define E1_ENABLE_PIN      PF2
-//#ifndef E1_CS_PIN
-//  #define E1_CS_PIN      PE4
-//#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC1   // Analog Input
-#define TEMP_1_PIN         PC2   // Analog Input
-#define TEMP_BED_PIN       PC0   // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PA1
-#define HEATER_1_PIN       PA0
-#define HEATER_BED_PIN     PA2
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PC15
-#endif
-#define FAN1_PIN           PF6
-#define FAN2_PIN           PF7
-
-#define ORIG_E0_AUTO_FAN_PIN  FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// LED / Lighting
-//
-//#define CASE_LIGHT_PIN_CI -1
-//#define CASE_LIGHT_PIN_DO -1
-//#define NEOPIXEL_PIN      -1
-
-//
-// Prusa i3 MK2 Multi-Material Multiplexer Support
-//
-//#define E_MUX0_PIN         -1
-//#define E_MUX1_PIN         -1
-
-//
-// SD support
-//
-#define SDIO_SUPPORT
-
-//
-// Misc. Functions
-//
-#define SDSS               PC11
-#define LED_PIN            PC7   // Alive
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
-#define POWER_LOSS_PIN     -1    // Power-loss / nAC_FAULT
-
-#define SCK_PIN            PC12
-#define MISO_PIN           PC8
-#define MOSI_PIN           PD2
-#define SS_PIN             PC11
-
-//
-// LCD / Controller
-//
-
-// TODO: Replace these with the correct FSMC pins, once known
-#define SD_DETECT_PIN      -1
-#define BEEPER_PIN         PD12
-#define LCD_PINS_RS        -1
-#define LCD_PINS_ENABLE    -1
-#define LCD_PINS_D4        -1
-#define LCD_PINS_D5        -1
-#define LCD_PINS_D6        -1
-#define LCD_PINS_D7        -1
-
-#define BTN_EN1            PE3
-#define BTN_EN2            PE4
-#define BTN_ENC            PE2
-
-//
-// ST7920 Delays
-//
-#if HAS_GRAPHICAL_LCD
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_LERDGE_X.h b/Marlin/src/pins/stm32/pins_LERDGE_X.h
deleted file mode 100644
index f498b7d0b9f6..000000000000
--- a/Marlin/src/pins/stm32/pins_LERDGE_X.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "LERDGE X supports up to 2 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME      "Lerdge X"
-#define DEFAULT_MACHINE_NAME "LERDGE"
-
-//#define I2C_EEPROM
-
-//
-// Servos
-//
-//#define SERVO0_PIN         PD12
-//#define SERVO1_PIN         -1
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PB12
-#define Y_STOP_PIN         PB13
-#define Z_STOP_PIN         PB14
-
-//
-// Filament runout
-//
-#define FIL_RUNOUT_PIN     PE1
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-//#ifndef Z_MIN_PROBE_PIN
-//  #define Z_MIN_PROBE_PIN  PB15
-//#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PB10
-#define X_DIR_PIN          PB2
-#define X_ENABLE_PIN       PB11
-//#ifndef X_CS_PIN
-//  #define X_CS_PIN       PD1
-//#endif
-
-#define Y_STEP_PIN         PB0
-#define Y_DIR_PIN          PC5
-#define Y_ENABLE_PIN       PB1
-//#ifndef Y_CS_PIN
-//  #define Y_CS_PIN       PE12
-//#endif
-
-#define Z_STEP_PIN         PA7
-#define Z_DIR_PIN          PA6
-#define Z_ENABLE_PIN       PC4
-//#ifndef Z_CS_PIN
-//  #define Z_CS_PIN       PD5
-//#endif
-
-#define E0_STEP_PIN        PA4
-#define E0_DIR_PIN         PA3
-#define E0_ENABLE_PIN      PA5
-//#ifndef E0_CS_PIN
-//  #define E0_CS_PIN      PB4
-//#endif
-
-#define E1_STEP_PIN        -1
-#define E1_DIR_PIN         -1
-#define E1_ENABLE_PIN      -1
-//#ifndef E1_CS_PIN
-//  #define E1_CS_PIN      PE5
-//#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         -1    // Analog Input
-#define TEMP_BED_PIN       PC1   // Analog Input
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PA1
-#define HEATER_1_PIN       -1
-#define HEATER_BED_PIN     PA2
-
-#ifndef FAN_PIN
-//  #define FAN_PIN        PC15
-#endif
-#define FAN1_PIN           PC15
-#define FAN2_PIN           PA0
-
-#define ORIG_E0_AUTO_FAN_PIN PC15   // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Prusa i3 MK2 Multi Material Multiplexer Support
-//
-//#define E_MUX0_PIN       -1
-//#define E_MUX1_PIN       -1
-
-//
-// LED / Lighting
-//
-//#define CASE_LIGHT_PIN_CI -1
-//#define CASE_LIGHT_PIN_DO -1
-//#define NEOPIXEL_PIN     -1
-
-//
-// Misc. Functions
-//
-#define SDSS               PC11
-#define LED_PIN            PC7   // Alive
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
-#define POWER_LOSS_PIN     -1    // Power-loss / nAC_FAULT
-
-#define SCK_PIN            PC12
-#define MISO_PIN           PC8
-#define MOSI_PIN           PD2
-#define SS_PIN             PC11
-
-//
-// SD support
-//
-#define SDIO_SUPPORT
-
-//
-// LCD / Controller
-//
-
-// The LCD is initialized in FSMC mode
-#define SD_DETECT_PIN      -1
-#define BEEPER_PIN         PD12
-
-#define BTN_EN1            PE3
-#define BTN_EN2            PE4
-#define BTN_ENC            PE2
-
-#define LCD_RESET_PIN      PD6
-#define LCD_BACKLIGHT_PIN  PD3
-#define FSMC_CS_PIN        PD4
-#define FSMC_RS_PIN        PD11
-#define TOUCH_CS           PB6
-
-//
-// ST7920 Delays
-//
-#if HAS_GRAPHICAL_LCD
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h
deleted file mode 100644
index 66c5b55ecb74..000000000000
--- a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * Longer3D LK1/LK2 & Alfawise U20/U30 (STM32F103VET6) board pin assignments
- */
-
-#if !defined(__STM32F1__) && !defined(STM32F1xx)
-  #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
-  #error "Longer3D board only supports 1 hotend / E-stepper. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "Longer3D"
-#define ALFAWISE_UX0             // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
-
-//#define DISABLE_DEBUG          //  We still want to debug with STLINK...
-#define DISABLE_JTAG             //  We free the jtag pins (PA15) but keep STLINK
-                                 //  Release PB4 (STEP_X_PIN) from JTAG NRST role.
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PC1   // pin 16
-#define X_MAX_PIN          PC0   // pin 15 (Filament sensor on Alfawise setup)
-#define Y_MIN_PIN          PC15  // pin 9
-#define Y_MAX_PIN          PC14  // pin 8 (Unused in stock Alfawise setup)
-#define Z_MIN_PIN          PE6   // pin 5 Standard Endstop or Z_Probe endstop function
-#define Z_MAX_PIN          PE5   // pin 4 (Unused in stock Alfawise setup)
-                                 // May be used for BLTouch Servo function on older variants (<= V08)
-#define ONBOARD_ENDSTOPPULLUPS
-
-//
-// Filament Sensor
-//
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC0   // XMAX plug on PCB used as filament runout sensor on Alfawise boards (inverting true)
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN       PB5   // pin 91
-#define X_STEP_PIN         PB4   // pin 90
-#define X_DIR_PIN          PB3   // pin 89
-
-#define Y_ENABLE_PIN       PB8   // pin 95
-#define Y_STEP_PIN         PB7   // pin 93
-#define Y_DIR_PIN          PB6   // pin 92
-
-#define Z_ENABLE_PIN       PE1   // pin 98
-#define Z_STEP_PIN         PE0   // pin 97
-#define Z_DIR_PIN          PB9   // pin 96
-
-#define E0_ENABLE_PIN      PE4   // pin 3
-#define E0_STEP_PIN        PE3   // pin 2
-#define E0_DIR_PIN         PE2   // pin 1
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PA0   // pin 23 (Nozzle 100K/3950 thermistor)
-#define TEMP_BED_PIN       PA1   // pin 24 (Hot Bed 100K/3950 thermistor)
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PD3   // pin 84 (Nozzle Heat Mosfet)
-#define HEATER_BED_PIN     PA8   // pin 67 (Hot Bed Mosfet)
-
-#define FAN_PIN            PA15  // pin 77 (4cm Fan)
-#define FAN_SOFT_PWM             // Required to avoid issues with heating or STLink
-#define FAN_MIN_PWM        35    // Fan will not start in 1-30 range
-#define FAN_MAX_PWM        255
-
-//#define BEEPER_PIN       PD13  // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor
-                                 // Can drive a PC Buzzer, if connected between PWM and 5V pins
-
-#define LED_PIN            PC2   // pin 17
-
-//
-// PWM for a servo probe
-// Other servo devices are not supported on this board!
-//
-#if HAS_Z_SERVO_PROBE
-  #define SERVO0_PIN       PD13  // Open drain PWM pin on the V0G (GND or floating 5V)
-  #define SERVO0_PWM_OD          // Comment this if using PE5
-
-  //#define SERVO0_PIN     PE5   // Pulled up PWM pin on the V08 (3.3V or 0)
-  //#undef Z_MAX_PIN             // Uncomment if using ZMAX connector (PE5)
-#endif
-
-/**
- * Note: Alfawise screens use various TFT controllers. Supported screens
- * are based on the ILI9341, ILI9328 and ST7798V. Define init sequences for
- * other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
- *
- * If the screen stays white, disable 'LCD_RESET_PIN' to let the bootloader
- * init the screen.
- *
- * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
- * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
- */
-
-#define LCD_RESET_PIN      PC4   // pin 33
-#define LCD_BACKLIGHT_PIN  PD12  // pin 59
-#define FSMC_CS_PIN        PD7   // pin 88 = FSMC_NE1
-#define FSMC_RS_PIN        PD11  // pin 58 A16 Register. Only one address needed
-
-#define LCD_USE_DMA_FSMC   // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV       DMA2
-#define FSMC_DMA_CHANNEL   DMA_CH5
-
-#define DOGLCD_MOSI        -1  // Prevent auto-define by Conditionals_post.h
-#define DOGLCD_SCK         -1
-
-/**
- * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
- * mixed up MOSI and MISO pins. SPI is managed in SW, and needs pins
- * declared below.
- */
-#if ENABLED(TOUCH_BUTTONS)
-  #define TOUCH_CS_PIN     PB12  // pin 51 SPI2_NSS
-  #define TOUCH_SCK_PIN    PB13  // pin 52
-  #define TOUCH_MOSI_PIN   PB14  // pin 53
-  #define TOUCH_MISO_PIN   PB15  // pin 54
-  #define TOUCH_INT_PIN    PC6   // pin 63 (PenIRQ coming from ADS7843)
-#endif
-
-//
-// Persistent Storage
-// If no option is selected below the SD Card will be used
-//
-//#define SPI_EEPROM
-#define FLASH_EEPROM_EMULATION
-
-#undef E2END
-#if ENABLED(SPI_EEPROM)
-  // SPI1 EEPROM Winbond W25Q64 (8MB/64Mbits)
-  #define SPI_CHAN_EEPROM1   1
-  #define SPI_EEPROM1_CS     PC5   // pin 34
-  #define EEPROM_SCK  BOARD_SPI1_SCK_PIN    // PA5 pin 30
-  #define EEPROM_MISO BOARD_SPI1_MISO_PIN   // PA6 pin 31
-  #define EEPROM_MOSI BOARD_SPI1_MOSI_PIN   // PA7 pin 32
-  #define EEPROM_PAGE_SIZE   0x1000U        // 4KB (from datasheet)
-  #define E2END ((16 * EEPROM_PAGE_SIZE)-1) // Limit to 64KB for now...
-#elif ENABLED(FLASH_EEPROM_EMULATION)
-  // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
-  #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
-  #define EEPROM_PAGE_SIZE     (0x800U)     // 2KB, but will use 2x more (4KB)
-  #define E2END (EEPROM_PAGE_SIZE - 1)
-#else
-  #define E2END (0x7FFU) // On SD, Limit to 2KB, require this amount of RAM
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN.h
deleted file mode 100644
index 3b10bae139e4..000000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * MKS Robin (STM32F130ZET6) board pin assignments
- *
- * https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin/Hardware
- */
-
-#ifndef __STM32F1__
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "MKS Robin"
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_JTAG
-
-//
-// Servos
-//
-#define SERVO0_PIN         PC3   // XS1 - 5
-#define SERVO1_PIN         PA1   // XS1 - 6
-#define SERVO2_PIN         PF9   // XS2 - 5
-#define SERVO3_PIN         PF8   // XS2 - 6
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PB12
-#define X_MAX_PIN          PB0
-#define Y_MIN_PIN          PC5
-#define Y_MAX_PIN          PC4
-#define Z_MIN_PIN          PA4
-#define Z_MAX_PIN          PF7
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN       PB9
-#define X_STEP_PIN         PB8
-#define X_DIR_PIN          PB5
-
-#define Y_ENABLE_PIN       PB4
-#define Y_STEP_PIN         PG15
-#define Y_DIR_PIN          PG10
-
-#define Z_ENABLE_PIN       PD7
-#define Z_STEP_PIN         PD3
-#define Z_DIR_PIN          PG14
-
-#define E0_ENABLE_PIN      PG13
-#define E0_STEP_PIN        PG8
-#define E0_DIR_PIN         PA15
-
-#define E1_ENABLE_PIN      PA12
-#define E1_STEP_PIN        PA11
-#define E1_DIR_PIN         PA8
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_1_PIN         PC2   // TH2
-#define TEMP_BED_PIN       PC0   // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PC7   // HEATER1
-#define HEATER_1_PIN       PA6   // HEATER2
-#define HEATER_BED_PIN     PC6   // HOT BED
-
-#define FAN_PIN            PA7   // FAN
-
-/**
- * Note: MKS Robin board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
- */
-//#define MAX6675_SS_PIN     PE5  // TC1 - CS1
-//#define MAX6675_SS_PIN     PE6  // TC2 - CS2
-
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PA3   // PW_OFF
-#define FIL_RUNOUT_PIN     PF11  // MT_DET
-
-#define BEEPER_PIN         PC13
-#define LED_PIN            PB2
-
-/**
- * Note: MKS Robin TFT screens use various TFT controllers
- * Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
- * ILI9488 is not supported
- * Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
- *
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- *
- * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
- * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
- */
-//#define LCD_RESET_PIN      PF6
-#define LCD_BACKLIGHT_PIN  PG11
-#define FSMC_CS_PIN        PG12  // NE4
-#define FSMC_RS_PIN        PF0   // A0
-
-#define LCD_USE_DMA_FSMC   // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV       DMA2
-#define FSMC_DMA_CHANNEL   DMA_CH5
-
-#if ENABLED(TOUCH_BUTTONS)
-  #define TOUCH_CS_PIN     PB1   // SPI2_NSS
-  #define TOUCH_SCK_PIN    PB13  // SPI2_SCK
-  #define TOUCH_MISO_PIN   PB14  // SPI2_MISO
-  #define TOUCH_MOSI_PIN   PB15  // SPI2_MOSI
-#endif
-
-// SPI1(PA7) & SPI3(PB5) not available
-#define ENABLE_SPI2
-
-#if ENABLED(SDIO_SUPPORT)
-  #define SCK_PIN           PB13 // SPI2
-  #define MISO_PIN          PB14 // SPI2
-  #define MOSI_PIN          PB15 // SPI2
-  #define SS_PIN            -1   // PB12 is X-
-  #define SD_DETECT_PIN     PF12 // SD_CD
-#else
-  // SD as custom software SPI (SDIO pins)
-  #define SCK_PIN           PC12
-  #define MISO_PIN          PC8
-  #define MOSI_PIN          PD2
-  #define SS_PIN            -1
-  #define ONBOARD_SD_CS_PIN PC11
-  #define SDSS              PD2
-  #define SD_DETECT_PIN     -1
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
deleted file mode 100644
index 5d97de12ebf2..000000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN2.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef STM32F4
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS_ROBIN2 supports up to 2 hotends / E-steppers."
-#endif
-
-#ifndef BOARD_INFO_NAME
-  #define BOARD_NAME "MKS_ROBIN2"
-#endif
-
-#ifndef DEFAULT_MACHINE_NAME
-  #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-#endif
-
-#define SRAM_EEPROM_EMULATION
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PG8
-#define X_MAX_PIN          PG7
-#define Y_MIN_PIN          PG6
-#define Y_MAX_PIN          PG5
-#define Z_MIN_PIN          PG4
-#define Z_MAX_PIN          PG3
-
-//
-// Servos
-//
-#define SERVO0_PIN         PB0   // XS2-5
-#define SERVO1_PIN         PF7   // XS1-5
-#define SERVO2_PIN         PF8   // XS1-6
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PE6
-#define X_DIR_PIN          PE5
-#define X_ENABLE_PIN       PC13
-
-#define Y_STEP_PIN         PE3
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PE4
-
-#define Z_STEP_PIN         PE0
-#define Z_DIR_PIN          PB9
-#define Z_ENABLE_PIN       PE1
-
-#define E0_STEP_PIN        PG10
-#define E0_DIR_PIN         PG9
-#define E0_ENABLE_PIN      PB8
-
-#define E1_STEP_PIN        PD3
-#define E1_DIR_PIN         PA15
-#define E1_ENABLE_PIN      PD6
-
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC1   // T1 <-> E0
-#define TEMP_1_PIN         PC2   // T2 <-> E1
-#define TEMP_BED_PIN       PC0   // T0 <-> Bed
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PF3   // Heater0
-#define HEATER_1_PIN       PF2   // Heater1
-#define HEATER_BED_PIN     PF4   // Hotbed
-#define FAN_PIN            PA7   // Fan0
-
-//
-// Misc. Functions
-//
-#define SDSS               -1    // PB12
-
-#define SD_DETECT_PIN      PF9
-#define BEEPER_PIN         PG2
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
deleted file mode 100644
index 1a7d664899c6..000000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef __STM32F1__
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
-  #error "MKS Robin Lite supports only 1 hotend / E-stepper. Comment out this line to continue."
-#endif
-
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "MKS Robin Lite"
-#endif
-#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
-
-//#define DISABLE_DEBUG
-#define DISABLE_JTAG
-#define ENABLE_SPI2
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PC13
-#define Y_STOP_PIN         PC0
-#define Z_MIN_PIN          PC12
-#define Z_MAX_PIN          PB9
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PB12
-#define X_ENABLE_PIN       PB10
-
-#define Y_STEP_PIN         PB11
-#define Y_DIR_PIN          PB2
-#define Y_ENABLE_PIN       PB10
-
-#define Z_STEP_PIN         PB1
-#define Z_DIR_PIN          PC5
-#define Z_ENABLE_PIN       PB10
-
-#define E0_STEP_PIN        PC4
-#define E0_DIR_PIN         PA5
-#define E0_ENABLE_PIN      PA4
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PC9
-#define FAN_PIN            PA8
-#define HEATER_BED_PIN     PC8
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN       PA1
-#define TEMP_0_PIN         PA0
-
-#define FIL_RUNOUT_PIN     PB8  // MT_DET
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-  #define BEEPER_PIN       PD2
-  #define BTN_ENC          PB3
-  #define LCD_PINS_RS      PC3
-
-  #define BTN_EN1          PB5
-  #define BTN_EN2          PB4
-
-  #define LCD_PINS_ENABLE  PC2
-
-  #if ENABLED(MKS_MINI_12864)
-
-    #define LCD_BACKLIGHT_PIN -1
-    #define LCD_RESET_PIN  -1
-    #define DOGLCD_A0      PC1
-    #define DOGLCD_CS      PC2
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
-
-  #else // !MKS_MINI_12864
-
-    #define LCD_PINS_D4    PC1
-    #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  -1
-      #define LCD_PINS_D6  -1
-      #define LCD_PINS_D7  -1
-    #endif
-
-  #endif // !MKS_MINI_12864
-
-#endif // HAS_SPI_LCD
-
-// Motor current PWM pins
-#define MOTOR_CURRENT_PWM_XY_PIN PB0
-#define MOTOR_CURRENT_PWM_Z_PIN  PA7
-#define MOTOR_CURRENT_PWM_E_PIN  PA6
-#define MOTOR_CURRENT_PWM_RANGE (65535/10/3.3) // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
-#define DEFAULT_PWM_MOTOR_CURRENT { 1000, 1000, 1000 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
-
-//
-// SD Card
-//
-#define ENABLE_SPI2
-#define SD_DETECT_PIN      PC10
-#define SCK_PIN            PB13
-#define MISO_PIN           P1B4
-#define MOSI_PIN           P1B5
-#define SS_PIN             PA15
-
-#if HAS_GRAPHICAL_LCD
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
deleted file mode 100644
index 9a404ec64d24..000000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE3.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * MKS Robin Lite 3 (STM32F103RCT6) board pin assignments
- */
-
-#ifndef __STM32F1__
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin Lite3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "MKS Robin Lite3"
-#endif
-#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
-
-//#define DISABLE_DEBUG
-#define DISABLE_JTAG
-#define ENABLE_SPI2
-
-//
-// Servos
-//
-#define SERVO0_PIN         PA3
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PA12
-#define Y_STOP_PIN         PA11
-#define Z_MIN_PIN          PC6
-#define Z_MAX_PIN          PB1
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PC0
-#define X_DIR_PIN          PB2
-#define X_ENABLE_PIN       PC13
-
-#define Y_STEP_PIN         PC2
-#define Y_DIR_PIN          PB9
-#define Y_ENABLE_PIN       PB12
-
-#define Z_STEP_PIN         PB7
-#define Z_DIR_PIN          PB6
-#define Z_ENABLE_PIN       PB8
-
-#define E0_STEP_PIN        PB4
-#define E0_DIR_PIN         PB3
-#define E0_ENABLE_PIN      PB5
-
-#define E1_STEP_PIN        PC12
-#define E1_DIR_PIN         PC11
-#define E1_ENABLE_PIN      PD2
-
-//
-// Heaters 0,1 / Fans / Bed
-//
-#define HEATER_0_PIN       PC9
-#define HEATER_1_PIN       PC7
-#define FAN_PIN            PA8
-#define HEATER_BED_PIN     PC8
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN       PA1  //TB
-#define TEMP_0_PIN         PA0  //TH1
-#define TEMP_1_PIN         PA2  //TH2
-
-#define FIL_RUNOUT_PIN     PB10 // MT_DET
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
-  #define BEEPER_PIN       PC1
-  #define BTN_ENC          PC3
-  #define LCD_PINS_ENABLE  PA4
-  #define LCD_PINS_RS      PA5
-  #define BTN_EN1          PB11
-  #define BTN_EN2          PB0
-
-  // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
-  #if ENABLED(MKS_MINI_12864)
-
-    #define LCD_BACKLIGHT_PIN -1
-    #define LCD_RESET_PIN  -1
-    #define DOGLCD_A0      PC4
-    #define DOGLCD_CS      PA7
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
-
-    // Required for MKS_MINI_12864 with this board
-    #define MKS_LCD12864B
-    #undef SHOW_BOOTSCREEN
-
-  #else // !MKS_MINI_12864
-
-    #define LCD_PINS_D4    PA6
-    #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PA7
-      #define LCD_PINS_D6  PC4
-      #define LCD_PINS_D7  PC5
-    #endif
-
-  #endif // !MKS_MINI_12864
-
-#endif // HAS_SPI_LCD
-
-//
-// SD Card
-//
-#define ENABLE_SPI2
-#define SD_DETECT_PIN      PC10
-#define SCK_PIN            PB13
-#define MISO_PIN           PB14
-#define MOSI_PIN           PB15
-#define SS_PIN             PA15
-
-#ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(125)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
deleted file mode 100644
index 223f520ebe2e..000000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * MKS Robin nano (STM32F130VET6) board pin assignments
- */
-
-#ifndef __STM32F1__
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "MKS Robin nano"
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_DEBUG
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN        PA15
-#define Y_STOP_PIN        PA12
-#define Z_MIN_PIN         PA11
-#define Z_MAX_PIN         PC4
-
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA4   // MT_DET
-#endif
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN       PE4
-#define X_STEP_PIN         PE3
-#define X_DIR_PIN          PE2
-
-#define Y_ENABLE_PIN       PE1
-#define Y_STEP_PIN         PE0
-#define Y_DIR_PIN          PB9
-
-#define Z_ENABLE_PIN       PB8
-#define Z_STEP_PIN         PB5
-#define Z_DIR_PIN          PB4
-
-#define E0_ENABLE_PIN      PB3
-#define E0_STEP_PIN        PD6
-#define E0_DIR_PIN         PD3
-
-#define E1_ENABLE_PIN      PA3
-#define E1_STEP_PIN        PA6
-#define E1_DIR_PIN         PA1
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_1_PIN         PC2   // TH2
-#define TEMP_BED_PIN       PC0   // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PC3   // HEATER1
-#define HEATER_1_PIN       PB0   // HEATER2
-#define HEATER_BED_PIN     PA0   // HOT BED
-
-#define FAN_PIN            PB1   // FAN
-
-//
-// Thermocouples
-//
-//#define MAX6675_SS_PIN     PE5  // TC1 - CS1
-//#define MAX6675_SS_PIN     PE6  // TC2 - CS2
-
-//
-// Misc. Functions
-//
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PA3   // PW_OFF
-
-#define LED_PIN            PB2
-
-//
-// SD Card
-//
-#define SDIO_SUPPORT
-#define SD_DETECT_PIN      PD12
-
-//
-// LCD / Controller
-//
-#define BEEPER_PIN         PC5
-
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- */
-#if ENABLED(FSMC_GRAPHICAL_TFT)
-  #define FSMC_CS_PIN        PD7    // NE4
-  #define FSMC_RS_PIN        PD11   // A0
-
-  #define LCD_RESET_PIN      PC6    // FSMC_RST
-  #define NO_LCD_REINIT             // Suppress LCD re-initialization
-
-  #define LCD_BACKLIGHT_PIN  PD13
-
-  #if ENABLED(TOUCH_BUTTONS)
-    #define TOUCH_CS_PIN     PA7  // SPI2_NSS
-    #define TOUCH_SCK_PIN    PB13 // SPI2_SCK
-    #define TOUCH_MISO_PIN   PB14 // SPI2_MISO
-    #define TOUCH_MOSI_PIN   PB15 // SPI2_MOSI
-  #endif
-#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
deleted file mode 100644
index ec43ab8fc3c7..000000000000
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_PRO.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * MKS Robin pro (STM32F103ZET6) board pin assignments
- */
-
-#ifndef __STM32F1__
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
-  #error "MKS Robin pro supports up to 3 hotends / E-steppers. Comment out this line to continue."
-#endif
-
-#define BOARD_INFO_NAME "MKS Robin pro"
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_DEBUG
-
-//
-// Note: MKS Robin board is using SPI2 interface.
-//
-//#define SPI_MODULE 2
-#define ENABLE_SPI2
-
-//
-// Servos
-//
-#define SERVO0_PIN         PA8   // BLTOUCH
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PA15
-#define X_MAX_PIN          PG7
-#define Y_MIN_PIN          PA12
-#define Y_MAX_PIN          PG8
-#define Z_MIN_PIN          PA11
-#define Z_MAX_PIN          PC4
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN       PE4
-#define X_STEP_PIN         PE3
-#define X_DIR_PIN          PE2
-#ifndef X_CS_PIN
-  #define X_CS_PIN         PF8
-#endif
-
-#define Y_ENABLE_PIN       PE1
-#define Y_STEP_PIN         PE0
-#define Y_DIR_PIN          PB9
-#ifndef Y_CS_PIN
-  #define Y_CS_PIN         PF3
-#endif
-
-#define Z_ENABLE_PIN       PB8
-#define Z_STEP_PIN         PB5
-#define Z_DIR_PIN          PB4
-#ifndef Z_CS_PIN
-  #define Z_CS_PIN         PF6
-#endif
-
-#define E0_ENABLE_PIN      PB3
-#define E0_STEP_PIN        PD6
-#define E0_DIR_PIN         PD3
-#ifndef E0_CS_PIN
-  #define E0_CS_PIN        PG15
-#endif
-
-#define E1_ENABLE_PIN      PA3
-#define E1_STEP_PIN        PA6
-#define E1_DIR_PIN         PA1
-#ifndef E1_CS_PIN
-  #define E1_CS_PIN        PG10
-#endif
-
-#define E2_ENABLE_PIN      PF0
-#define E2_STEP_PIN        PF2
-#define E2_DIR_PIN         PF1
-#ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG9
-#endif
-//
-// Software SPI pins for TMC2130 stepper drivers
-//
-#if ENABLED(TMC_USE_SW_SPI)
-  #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB15
-  #endif
-  #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB14
-  #endif
-  #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB13
-  #endif
-#endif
-
-#if HAS_TMC220x
-  /**
-   * TMC2208/TMC2209 stepper drivers
-   *
-   * Hardware serial communication ports.
-   * If undefined software serial is used according to the pins below
-   */
-  //#define X_HARDWARE_SERIAL  Serial
-  //#define X2_HARDWARE_SERIAL Serial1
-  //#define Y_HARDWARE_SERIAL  Serial1
-  //#define Y2_HARDWARE_SERIAL Serial1
-  //#define Z_HARDWARE_SERIAL  Serial1
-  //#define Z2_HARDWARE_SERIAL Serial1
-  //#define E0_HARDWARE_SERIAL Serial1
-  //#define E1_HARDWARE_SERIAL Serial1
-  //#define E2_HARDWARE_SERIAL Serial1
-  //#define E3_HARDWARE_SERIAL Serial1
-  //#define E4_HARDWARE_SERIAL Serial1
-
-  //
-  // Software serial
-  //
-  #define X_SERIAL_TX_PIN  PF7
-  #define X_SERIAL_RX_PIN  PF8
-
-  #define Y_SERIAL_TX_PIN  PF4
-  #define Y_SERIAL_RX_PIN  PF3
-
-  #define Z_SERIAL_TX_PIN  PF5
-  #define Z_SERIAL_RX_PIN  PF6
-
-  #define E0_SERIAL_TX_PIN PG13
-  #define E0_SERIAL_RX_PIN PG15
-
-  #define E1_SERIAL_TX_PIN PG12
-  #define E1_SERIAL_RX_PIN PG10
-
-  #define E2_SERIAL_TX_PIN PC13
-  #define E2_SERIAL_RX_PIN PG9
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_1_PIN         PC2   // TH2
-#define TEMP_2_PIN         PC3   // TH3
-#define TEMP_BED_PIN       PC0   // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PF10  // +HE0-
-#define HEATER_1_PIN       PB0   // +HE1-
-#define HEATER_2_PIN       PF9   // +HE2-
-#define HEATER_BED_PIN     PA0   // +HOT-BED-
-#define FAN_PIN            PB1   // +FAN-
-
-/**
- * Note: MKS Robin Pro board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
- */
-//#define MAX6675_SS_PIN     PE5   // TC1 - CS1
-//#define MAX6675_SS_PIN     PF11  // TC2 - CS2
-
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PG11   // PW_OFF
-#define FIL_RUNOUT_PIN     PA4  // MT_DET1
-//#define FIL_RUNOUT_PIN     PE6   // MT_DET2
-//#define FIL_RUNOUT_PIN     PG14  // MT_DET3
-
-//
-// SD Card
-//
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
-#endif
-
-#if SD_CONNECTION_IS(LCD)
-  #define ENABLE_SPI2
-  #define SD_DETECT_PIN    PG3
-  #define SCK_PIN          PB13
-  #define MISO_PIN         PB14
-  #define MOSI_PIN         PB15
-  #define SS_PIN           PG6
-#elif SD_CONNECTION_IS(ONBOARD)
-  #define SDIO_SUPPORT
-  #define SD_DETECT_PIN    PD12
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
-  #error "No custom SD drive cable defined for this board."
-#endif
-
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- */
-#if ENABLED(FSMC_GRAPHICAL_TFT)
-  #define FSMC_CS_PIN      PD7    // NE4
-  #define FSMC_RS_PIN      PD11   // A0
-
-  #define LCD_RESET_PIN    PF6
-  #define NO_LCD_REINIT             // Suppress LCD re-initialization
-
-  #define LCD_BACKLIGHT_PIN PD13
-
-  #if ENABLED(TOUCH_BUTTONS)
-    #define TOUCH_CS_PIN   PA7
-  #else
-    #define BEEPER_PIN     PC5
-    #define BTN_ENC        PG2
-    #define BTN_EN1        PG5
-    #define BTN_EN2        PG4
-  #endif
-
-#elif HAS_SPI_LCD
-
-  #define BEEPER_PIN       PC5
-  #define BTN_ENC          PG2
-  #define LCD_PINS_ENABLE  PG0
-  #define LCD_PINS_RS      PG1
-  #define BTN_EN1          PG5
-  #define BTN_EN2          PG4
-
-  // MKS MINI12864 and MKS LCD12864B. If using MKS LCD12864A (Need to remove RPK2 resistor)
-  #if ENABLED(MKS_MINI_12864)
-
-    #define LCD_BACKLIGHT_PIN -1
-    #define LCD_RESET_PIN  -1
-    #define DOGLCD_A0      PF12
-    #define DOGLCD_CS      PF15
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
-
-  #else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
-
-    #define LCD_PINS_D4    PF14
-    #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PF15
-      #define LCD_PINS_D6  PF12
-      #define LCD_PINS_D7  PF13
-    #endif
-
-  #endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
-#endif
-
-#ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(125)
-#endif
-#ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(125)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_REMRAM_V1.h b/Marlin/src/pins/stm32/pins_REMRAM_V1.h
deleted file mode 100644
index 45a1f68e5a3a..000000000000
--- a/Marlin/src/pins/stm32/pins_REMRAM_V1.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef STM32F7xx
-  #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
-#endif
-
-#define BOARD_INFO_NAME      "RemRam v1"
-#define DEFAULT_MACHINE_NAME "RemRam"
-
-#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM
-
-#if HOTENDS > 1 || E_STEPPERS > 1
-  #error "RemRam supports only one hotend / E-stepper."
-#endif
-
-//
-// Limit Switches
-//
-#if DISABLED(SENSORLESS_HOMING)
-  #define X_MIN_PIN        58
-  #define X_MAX_PIN        59
-  #define Y_MIN_PIN        60
-  #define Y_MAX_PIN        61
-  #define Z_MIN_PIN        62
-  #define Z_MAX_PIN        63
-#else
-  #define X_STOP_PIN       36
-  #define Y_STOP_PIN       39
-  #define Z_MIN_PIN        62
-  #define Z_MAX_PIN        42
-#endif
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  26   // EXT_D1
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN         22
-#define X_DIR_PIN          35
-#define X_ENABLE_PIN       34
-#define X_CS_PIN           14
-
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          38
-#define Y_ENABLE_PIN       37
-#define Y_CS_PIN           15
-
-#define Z_STEP_PIN         24
-#define Z_DIR_PIN          41
-#define Z_ENABLE_PIN       40
-#define Z_CS_PIN           16
-
-#define E0_STEP_PIN        25
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      43
-#define E0_CS_PIN          10
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         64   // THERM_1
-#define TEMP_1_PIN         65   // THERM_2
-#define TEMP_BED_PIN       66   // THERM_3
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       33
-#define HEATER_BED_PIN     31
-
-#ifndef FAN_PIN
-  #define FAN_PIN          30   // "FAN1"
-#endif
-#define FAN1_PIN           32   // "FAN2"
-
-#define ORIG_E0_AUTO_FAN_PIN 32   // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Servos
-//
-#define SERVO0_PIN         26   // PWM_EXT1
-#define SERVO1_PIN         27   // PWM_EXT2
-
-#define SDSS               57   // Onboard SD card reader
-//#define SDSS              9   // LCD SD card reader
-#define LED_PIN            21   // STATUS_LED
-
-//
-// LCD / Controller
-//
-#define SD_DETECT_PIN      56   // SD_CARD_DET
-#define BEEPER_PIN         46   // LCD_BEEPER
-#define LCD_PINS_RS        49   // LCD_RS
-#define LCD_PINS_ENABLE    48   // LCD_EN
-#define LCD_PINS_D4        50   // LCD_D4
-#define LCD_PINS_D5        51   // LCD_D5
-#define LCD_PINS_D6        52   // LCD_D6
-#define LCD_PINS_D7        53   // LCD_D7
-#define BTN_EN1            54   // BTN_EN1
-#define BTN_EN2            55   // BTN_EN2
-#define BTN_ENC            47   // BTN_ENC
-
-//
-// Timers
-//
-
-#define STEP_TIMER 2
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_common.h b/Marlin/src/pins/stm32/pins_RUMBA32_common.h
deleted file mode 100644
index 0fb469112d41..000000000000
--- a/Marlin/src/pins/stm32/pins_RUMBA32_common.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * Common pin assignments for all RUMBA32 boards
- */
-
-#ifndef STM32F4
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
-  #error "RUMBA32 boards support up to 3 hotends / E-steppers."
-#endif
-
-#define RUMBA32_V1_0
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-//#define I2C_EEPROM
-#ifdef E2END
-  #undef E2END
-#endif
-#define E2END 0xFFF // 4KB
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PB12
-#define X_MAX_PIN          PB13
-#define Y_MIN_PIN          PB15
-#define Y_MAX_PIN          PD8
-#define Z_MIN_PIN          PD9
-#define Z_MAX_PIN          PD10
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PA0
-#define X_DIR_PIN          PC15
-#define X_ENABLE_PIN       PC11
-#define X_CS_PIN           PC14
-
-#define Y_STEP_PIN         PE5
-#define Y_DIR_PIN          PE6
-#define Y_ENABLE_PIN       PE3
-#define Y_CS_PIN           PE4
-
-#define Z_STEP_PIN         PE1
-#define Z_DIR_PIN          PE2
-#define Z_ENABLE_PIN       PB7
-#define Z_CS_PIN           PE0
-
-#define E0_STEP_PIN        PB5
-#define E0_DIR_PIN         PB6
-#define E0_ENABLE_PIN      PC12
-#define E0_CS_PIN          PC13
-
-#define E1_STEP_PIN        PD6
-#define E1_DIR_PIN         PD7
-#define E1_ENABLE_PIN      PD4
-#define E1_CS_PIN          PD5
-
-#define E2_STEP_PIN        PD2
-#define E2_DIR_PIN         PD3
-#define E2_ENABLE_PIN      PD0
-#define E2_CS_PIN          PD1
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN         PC4
-#define TEMP_1_PIN         PC3
-#define TEMP_2_PIN         PC2
-#define TEMP_3_PIN         PC1
-#define TEMP_BED_PIN       PC0
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PC6
-#define HEATER_1_PIN       PC7
-#define HEATER_2_PIN       PC8
-#define HEATER_BED_PIN     PA1
-
-#define FAN_PIN            PC9
-#define FAN1_PIN           PA8
-
-//
-// I2C
-//
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
-
-//
-// Misc. Functions
-//
-#define LED_PIN            PB14
-#define BTN_PIN            PC10
-#define PS_ON_PIN          PE11
-#define KILL_PIN           PC5
-
-#define SDSS               PA2
-#define SD_DETECT_PIN      PB0
-#define BEEPER_PIN         PE8
-
-//
-// LCD / Controller
-//
-#if HAS_SPI_LCD
-
-  #define BTN_EN1          PB2
-  #define BTN_EN2          PB1
-  #define BTN_ENC          PE7
-
-  #define LCD_PINS_RS      PE10
-  #define LCD_PINS_ENABLE  PE9
-  #define LCD_PINS_D4      PE12
-
-  #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      PE13
-    #define DOGLCD_A0      PE14
-  #endif
-
-  #if ENABLED(ULTIPANEL)
-    #define LCD_PINS_D5    PE13
-    #define LCD_PINS_D6    PE14
-    #define LCD_PINS_D7    PE15
-  #endif
-
-#endif
diff --git a/Marlin/src/pins/stm32/pins_STM32F1R.h b/Marlin/src/pins/stm32/pins_STM32F1R.h
deleted file mode 100644
index b43492af21c3..000000000000
--- a/Marlin/src/pins/stm32/pins_STM32F1R.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef __STM32F1__
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
-
-/**
- * 21017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME      "Misc. STM32F1R"
-#define DEFAULT_MACHINE_NAME "STM32F103RET6"
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PB3
-#define Y_STOP_PIN         PB4
-#define Z_STOP_PIN         PB5
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PC0
-#define X_DIR_PIN          PC1
-#define X_ENABLE_PIN       PA8
-
-#define Y_STEP_PIN         PC2
-#define Y_DIR_PIN          PC3
-#define Y_ENABLE_PIN       PA8
-
-#define Z_STEP_PIN         PC4
-#define Z_DIR_PIN          PC5
-#define Z_ENABLE_PIN       PA8
-
-#define E0_STEP_PIN        PC6
-#define E0_DIR_PIN         PC7
-#define E0_ENABLE_PIN      PA8
-
-/**
- * TODO: Currently using same Enable pin to all steppers.
- */
-
-#define E1_STEP_PIN        PC8
-#define E1_DIR_PIN         PC9
-#define E1_ENABLE_PIN      PA8
-
-#define E2_STEP_PIN        PC10
-#define E2_DIR_PIN         PC11
-#define E2_ENABLE_PIN      PA8
-
-//
-// Misc. Functions
-//
-#define SDSS               PA4
-#define LED_PIN            PD2
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PB0   // EXTRUDER 1
-#define HEATER_1_PIN       PB1
-
-#define HEATER_BED_PIN     PA3   // BED
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN       PA0   // Analog Input
-#define TEMP_0_PIN         PA1   // Analog Input
-#define TEMP_1_PIN         PA2   // Analog Input
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
-  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
-  #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
-  #else
-    #define LCD_PINS_RS         PB8
-    #define LCD_PINS_ENABLE     PD2
-    #define LCD_PINS_D4         PB12
-    #define LCD_PINS_D5         PB13
-    #define LCD_PINS_D6         PB14
-    #define LCD_PINS_D7         PB15
-    #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        33
-      // Buttons attached to a shift register
-      // Not wired yet
-      //#define SHIFT_CLK 38
-      //#define SHIFT_LD 42
-      //#define SHIFT_OUT 40
-      //#define SHIFT_EN 17
-    #endif
-  #endif
-
-  #if ENABLED(NEWPANEL)
-
-    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
-      #define BEEPER_PIN        37
-
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
-
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
-
-      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
-      #endif
-
-    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
-
-    #elif ENABLED(LCD_I2C_PANELOLU2)
-
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     -1
-      #define KILL_PIN          41
-
-    #elif ENABLED(LCD_I2C_VIKI)
-
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
-      #define BTN_ENC           -1
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     49
-
-    #elif ANY(VIKI2, miniVIKI)
-
-      #define BEEPER_PIN        33
-
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
-      #define LCD_SCREEN_ROT_180
-
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
-
-      #define SDSS              53
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
-
-      #define KILL_PIN          31
-
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
-
-    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
-      #define SD_DETECT_PIN     49
-      #define LCD_SDSS          53
-      #define KILL_PIN          41
-      #define BEEPER_PIN        23
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
-      #define LCD_BACKLIGHT_PIN 33
-
-    #elif ENABLED(MINIPANEL)
-
-      #define BEEPER_PIN        42
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS              53
-
-      #define KILL_PIN          64
-      // GLCD features
-      // Uncomment screen orientation
-      //#define LCD_SCREEN_ROT_90
-      //#define LCD_SCREEN_ROT_180
-      //#define LCD_SCREEN_ROT_270
-      // The encoder and click button
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
-      // not connected to a pin
-      #define SD_DETECT_PIN     49
-
-    #else
-
-      // Beeper on AUX-4
-      #define BEEPER_PIN        33
-
-      // Buttons directly attached to AUX-2
-      #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-      #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
-      #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
-      #endif
-
-      #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
-      #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
-      #endif
-
-    #endif
-  #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_STM3R_MINI.h b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
deleted file mode 100644
index 99f1cea35ce3..000000000000
--- a/Marlin/src/pins/stm32/pins_STM3R_MINI.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if !defined(__STM32F1__) && !defined(__STM32F4__)
-  #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
-#endif
-
-/**
- * 21017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME      "STM3R Mini"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-// Enable I2C_EEPROM for testing
-#define I2C_EEPROM
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PD0
-#define Y_STOP_PIN         PD1
-#define Z_STOP_PIN         PD4
-
-//
-// Steppers
-//
-#define X_STEP_PIN         PE1
-#define X_DIR_PIN          PE0
-#define X_ENABLE_PIN       PC0
-
-#define Y_STEP_PIN         PE3
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PC1
-
-#define Z_STEP_PIN         PE5
-#define Z_DIR_PIN          PE4
-#define Z_ENABLE_PIN       PC2
-
-#define E0_STEP_PIN        PE7
-#define E0_DIR_PIN         PE6
-#define E0_ENABLE_PIN      PC3
-
-#define E1_STEP_PIN        PE9
-#define E1_DIR_PIN         PE8
-#define E1_ENABLE_PIN      PC4
-
-#define E2_STEP_PIN        PE11
-#define E2_DIR_PIN         PE10
-#define E2_ENABLE_PIN      PC5
-
-//
-// Misc. Functions
-//
-#define SDSS               PA15
-#define LED_PIN            PB2
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PD12   // EXTRUDER 1
-//#define HEATER_1_PIN       PD13
-
-#define HEATER_BED_PIN     PB9   // BED
-//#define HEATER_BED2_PIN    -1   // BED2
-//#define HEATER_BED3_PIN    -1   // BED3
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PD14
-#endif
-#define FAN1_PIN           PD13
-
-#define FAN_SOFT_PWM
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN       PA0
-#define TEMP_0_PIN         PA1
-#define TEMP_1_PIN         PA2
-#define TEMP_2_PIN         PA3
-
-// Laser control
-#if HAS_CUTTER
-  #define SPINDLE_LASER_PWM_PIN     PB8
-  #define SPINDLE_LASER_ENA_PIN     PD5
-#endif
-
-//
-// LCD Pins
-//
-#if HAS_SPI_LCD
-
-  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS    49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE 51  // SID (MOSI)
-    #define LCD_PINS_D4    52   // SCK (CLK) clock
-  #elif BOTH(NEWPANEL, PANEL_ONE)
-    #define LCD_PINS_RS    PB8
-    #define LCD_PINS_ENABLE PD2
-    #define LCD_PINS_D4    PB12
-    #define LCD_PINS_D5    PB13
-    #define LCD_PINS_D6    PB14
-    #define LCD_PINS_D7    PB15
-  #else
-    #define LCD_PINS_RS    PB8
-    #define LCD_PINS_ENABLE PD2
-    #define LCD_PINS_D4    PB12
-    #define LCD_PINS_D5    PB13
-    #define LCD_PINS_D6    PB14
-    #define LCD_PINS_D7    PB15
-    #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN   33
-      // Buttons attached to a shift register
-      // Not wired yet
-      //#define SHIFT_CLK  38
-      //#define SHIFT_LD   42
-      //#define SHIFT_OUT  40
-      //#define SHIFT_EN   17
-    #endif
-  #endif
-
-  #if ENABLED(TOUCH_BUTTONS)
-
-    #define TOUCH_CS_PIN   PB12   // SPI2_NSS
-    #define TOUCH_SCK_PIN  PB13
-    #define TOUCH_MOSI_PIN PB14
-    #define TOUCH_MISO_PIN PB15
-    #define TOUCH_INT_PIN  PC6   // (PenIRQ coming from ADS7843)
-
-  #elif ENABLED(NEWPANEL)
-
-    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-
-      #define BEEPER_PIN        37
-
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
-
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
-
-      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
-      #endif
-
-    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-
-      #define BTN_EN1      64
-      #define BTN_EN2      59
-      #define BTN_ENC      63
-      #define SD_DETECT_PIN 42
-
-    #elif ENABLED(LCD_I2C_PANELOLU2)
-
-      #define BTN_EN1      47
-      #define BTN_EN2      43
-      #define BTN_ENC      32
-      #define LCD_SDSS     53
-      #define SD_DETECT_PIN -1
-      #define KILL_PIN     41
-
-    #elif ENABLED(LCD_I2C_VIKI)
-
-      #define BTN_EN1      22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2       7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-
-      #define BTN_ENC      -1
-      #define LCD_SDSS     53
-      #define SD_DETECT_PIN 49
-
-    #elif ANY(VIKI2, miniVIKI)
-
-      #define BEEPER_PIN   33
-
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0    44
-      #define DOGLCD_CS    45
-      #define LCD_SCREEN_ROT_180
-
-      #define BTN_EN1      22
-      #define BTN_EN2       7
-      #define BTN_ENC      39
-
-      #define SDSS         53
-      #define SD_DETECT_PIN -1   // Pin 49 for display sd interface, 72 for easy adapter board
-
-      #define KILL_PIN     31
-
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
-
-    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-
-      #define BTN_EN1      35
-      #define BTN_EN2      37
-      #define BTN_ENC      31
-      #define SD_DETECT_PIN 49
-      #define LCD_SDSS     53
-      #define KILL_PIN     41
-      #define BEEPER_PIN   23
-      #define DOGLCD_CS    29
-      #define DOGLCD_A0    27
-      #define LCD_BACKLIGHT_PIN 33
-
-    #elif ENABLED(MINIPANEL)
-
-      #define BEEPER_PIN   42
-      // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0    44
-      #define DOGLCD_CS    66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS         53
-
-      #define KILL_PIN     64
-      // GLCD features
-      // Uncomment screen orientation
-      //#define LCD_SCREEN_ROT_90
-      //#define LCD_SCREEN_ROT_180
-      //#define LCD_SCREEN_ROT_270
-      // The encoder and click button
-      #define BTN_EN1      40
-      #define BTN_EN2      63
-      #define BTN_ENC      59
-      // not connected to a pin
-      #define SD_DETECT_PIN 49
-
-    #else
-
-      // Beeper on AUX-4
-      #define BEEPER_PIN   33
-
-      // Buttons directly attached to AUX-2
-      #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1    64
-        #define BTN_EN2    59
-        #define BTN_ENC    63
-        #define SHIFT_OUT  40
-        #define SHIFT_CLK  44
-        #define SHIFT_LD   42
-      #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1    59   // AUX2 PIN 3
-        #define BTN_EN2    63   // AUX2 PIN 4
-        #define BTN_ENC    49   // AUX3 PIN 7
-      #else
-        #define BTN_EN1    37
-        #define BTN_EN2    35
-        #define BTN_ENC    31
-      #endif
-
-      #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN 49
-        #define KILL_PIN   41
-      #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
-      #endif
-
-    #endif
-  #endif // NEWPANEL
-
-#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_THE_BORG.h b/Marlin/src/pins/stm32/pins_THE_BORG.h
deleted file mode 100644
index bfc9507c451e..000000000000
--- a/Marlin/src/pins/stm32/pins_THE_BORG.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifndef STM32F7
-  #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
-#elif HOTENDS > 3 || E_STEPPERS > 3
-  #error "The-Borg supports up to 3 hotends / E-steppers."
-#endif
-
-#define BOARD_INFO_NAME      "The-Borge"
-#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
-
-#ifndef E2END
-  #define E2END 0xFFF   // EEPROM end address
-#endif
-
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN          PE9
-#define X_MAX_PIN          PE10
-#define Y_MIN_PIN          PE7
-#define Y_MAX_PIN          PE8
-#define Z_MIN_PIN          PF15
-#define Z_MAX_PIN          PG0
-#define E_MIN_PIN          PE2
-#define E_MAX_PIN          PE3
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PA4
-#endif
-
-//
-// Steppers
-//
-#define STEPPER_ENABLE_PIN PE0
-
-#define X_STEP_PIN         PC6   // 96, 39 in Arduino
-#define X_DIR_PIN          PC7
-#define X_ENABLE_PIN       PC8
-
-
-#define Y_STEP_PIN         PD9
-#define Y_DIR_PIN          PD10
-#define Y_ENABLE_PIN       PD11
-
-#define Z_STEP_PIN         PE15
-#define Z_DIR_PIN          PG1
-#define Z_ENABLE_PIN       PD8
-
-
-#define E0_STEP_PIN        PB1
-#define E0_DIR_PIN         PB2
-#define E0_ENABLE_PIN      PE11
-
-
-#define E1_STEP_PIN        PC4
-#define E1_DIR_PIN         PC5
-#define E1_ENABLE_PIN      PB0
-
-
-#define E2_STEP_PIN        PC13
-#define E2_DIR_PIN         PC14
-#define E2_ENABLE_PIN      PC15
-
-#define Z2_STEP_PIN        PC13
-#define Z2_DIR_PIN         PC14
-#define Z2_ENABLE_PIN      PC15
-
-
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
-
-#define SPI1_SCK_PIN       PA5
-#define SPI1_MISO_PIN      PA6
-#define SPI1_MOSI_PIN      PA7
-
-#define SPI6_SCK_PIN       PG13
-#define SPI6_MISO_PIN      PG12
-#define SPI6_MOSI_PIN      PG14
-
-//
-// Temperature Sensors
-//
-
-#define TEMP_0_PIN         PC3   // Analog Input
-#define TEMP_1_PIN         PC2   // Analog Input
-#define TEMP_2_PIN         PC1   // Analog Input
-#define TEMP_3_PIN         PC0   // Analog Input
-
-#define TEMP_BED_PIN       PF10  // Analog Input
-
-#define TEMP_5_PIN         PE12  // Analog Input, Probe temp
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN       PD15
-#define HEATER_1_PIN       PD14
-#define HEATER_BED_PIN     PF6
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PD13
-#endif
-#define FAN1_PIN           PA0
-#define FAN2_PIN           PA1
-
-#define ORIG_E0_AUTO_FAN_PIN  PA1   // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Misc. Functions
-//
-
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN      PF13
-
-//
-// Průša i3 MK2 Multi Material Multiplexer Support
-//
-
-#define E_MUX0_PIN         PG3
-#define E_MUX1_PIN         PG4
-
-//
-// Servos
-//
-
-#define SERVO0_PIN         PE13
-#define SERVO1_PIN         PE14
-
-
-#define SDSS               PA8
-#define SS_PIN             PA8
-#define LED_PIN            PA2   // Alive
-#define PS_ON_PIN          PA3
-#define KILL_PIN           -1 //PD5   // EXP2-10
-#define PWR_LOSS           PG5   // Power loss / nAC_FAULT
-
-//
-// MAX7219_DEBUG
-//
-#define MAX7219_CLK_PIN    PG10  // EXP1-1
-#define MAX7219_DIN_PIN    PD7   // EXP1-3
-#define MAX7219_LOAD_PIN   PD1   // EXP1-5
-
-//
-// LCD / Controller
-//
-//#define SD_DETECT_PIN      -1 //PB6)     // EXP2-4
-#define BEEPER_PIN         PG10  // EXP1-1
-#define LCD_PINS_RS        PG9   // EXP1-4
-#define LCD_PINS_ENABLE    PD7   // EXP1-3
-#define LCD_PINS_D4        PD1   // EXP1-5
-#define LCD_PINS_D5        PF0   // EXP1-6
-#define LCD_PINS_D6        PD3   // EXP1-7
-#define LCD_PINS_D7        PD4   // EXP1-8
-#define BTN_EN1            PD6   // EXP2-5
-#define BTN_EN2            PD0   // EXP2-3
-#define BTN_ENC            PG11  // EXP1-2
diff --git a/Marlin/src/pins/stm32/pins_VAKE403D.h b/Marlin/src/pins/stm32/pins_VAKE403D.h
deleted file mode 100644
index 35faf076abb2..000000000000
--- a/Marlin/src/pins/stm32/pins_VAKE403D.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#if !defined(STM32F4) && !defined(STM32F4xx)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "STM32F4 supports up to 2 hotends / E-steppers."
-#endif
-
-#define DEFAULT_MACHINE_NAME "STM32F446VET6"
-#define BOARD_NAME           "STM32F4 VAkE"
-
-//#define I2C_EEPROM
-
-#define E2END 0xFFF // EEPROM end address (4kB)
-
-//
-// Servos
-//
-//#define SERVO0_PIN         PE13
-//#define SERVO1_PIN         PE14
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN         PE10
-#define Y_STOP_PIN         PE9
-#define Z_STOP_PIN         PE8
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PA4
-#endif
-
-//
-// Filament runout
-//
-#define FIL_RUNOUT_PIN     PA3
-
-//
-// Steppers
-//
-
-#define STEPPER_ENABLE_PIN PB2
-
-#define X_STEP_PIN         PC6   // X_STEP
-#define X_DIR_PIN          PC7   // X_DIR
-#define X_ENABLE_PIN       PB2   //
-#ifndef X_CS_PIN
-  #define X_CS_PIN         PC8   // X_CS
-#endif
-
-#define Y_STEP_PIN         PD9   // Y_STEP
-#define Y_DIR_PIN          PD10  // Y_DIR
-#define Y_ENABLE_PIN       PB2   //
-#ifndef Y_CS_PIN
-  #define Y_CS_PIN         PD11  // Y_CS
-#endif
-
-#define Z_STEP_PIN         PE15  // Z_STEP
-#define Z_DIR_PIN          PB10  // Z_DIR
-#define Z_ENABLE_PIN       PB2
-#ifndef Z_CS_PIN
-  #define Z_CS_PIN         PD8
-#endif
-
-#define E0_STEP_PIN        PB1
-#define E0_DIR_PIN         PB13
-#define E0_ENABLE_PIN      PB2
-#ifndef E0_CS_PIN
-  #define E0_CS_PIN        PE11
-#endif
-
-#define E1_STEP_PIN        PC4
-#define E1_DIR_PIN         PC5
-#define E1_ENABLE_PIN      PB2
-#ifndef E1_CS_PIN
-  #define E1_CS_PIN        PB0
-#endif
-
-#define SCK_PIN            PE12  // PA5   // SPI1 for SD card
-#define MISO_PIN           PE13  // PA6
-#define MOSI_PIN           PE14  // PA7
-
-// added for SD card : optional or not ???
-//#define SD_CHIP_SELECT_PIN SDSS   // The default chip select pin for the SD card is SS.
-// The following three pins must not be redefined for hardware SPI.
-//#define SPI_MOSI_PIN MOSI_PIN       // SPI Master Out Slave In pin
-//#define SPI_MISO_PIN MISO_PIN       // SPI Master In Slave Out pin
-//#define SPI_SCK_PIN SCK_PIN         // SPI Clock pin
-
-//
-// Temperature Sensors (Analog inputs)
-//
-
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         PC1   // Analog Input
-#define TEMP_2_PIN         PC2   // Analog Input
-#define TEMP_3_PIN         PC3   // Analog Input
-#define TEMP_BED_PIN       PC3   // Analog Input
-
-//
-// Heaters / Fans
-//
-
-#define HEATER_0_PIN       PD15
-#define HEATER_1_PIN       PD14
-#define HEATER_BED_PIN     PD12
-
-#ifndef FAN_PIN
-  #define FAN_PIN          PD13
-#endif
-#define FAN1_PIN           PB5   // PA0
-#define FAN2_PIN           PB4   // PA1
-
-#define ORIG_E0_AUTO_FAN_PIN PD13   // Use this by NOT overriding E0_AUTO_FAN_PIN
-
-//
-// Misc. Functions
-//
-
-//#define CASE_LIGHT_PIN_CI PF13
-//#define CASE_LIGHT_PIN_DO PF14
-//#define NEOPIXEL_PIN      PF13
-
-//
-// Prusa i3 MK2 Multi Material Multiplexer Support
-//
-//#define E_MUX0_PIN         PG3
-//#define E_MUX1_PIN         PG4
-
-#define LED_PIN            PB14   // Alive
-#define PS_ON_PIN          PE0
-#define KILL_PIN           PD5
-#define POWER_LOSS_PIN     PA4   // ?? Power loss / nAC_FAULT
-
-#if ENABLED(SDSUPPORT)
-  #define SD_DETECT_PIN    PB7
-  #define SS_PIN           PB_15  // USD_CS -> CS for onboard SD
-#endif
-
-//
-// LCD / Controller
-//
-#if HAS_SPI_LCD
-  #if ENABLED(SDSUPPORT)
-    #define SDSS           PB6   // CS for SD card in LCD
-  #endif
-  #define BEEPER_PIN       PC9
-  #define LCD_PINS_RS      PC12
-  #define LCD_PINS_ENABLE  PD7
-  #define LCD_PINS_D4      PD1
-  #define LCD_PINS_D5      PD2
-  #define LCD_PINS_D6      PD3
-  #define LCD_PINS_D7      PD4
-  #define BTN_EN1          PD6
-  #define BTN_EN2          PD0
-  #define BTN_ENC          PB12
-#endif
-
-//
-// ST7920 Delays
-//
-#ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(96)
-#endif
-#ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(48)
-#endif
-#ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(715)
-#endif
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
similarity index 51%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
index f5c35bbdcdd6..fef8eeb61737 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -42,56 +42,56 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA1    // SERVOS
+#define SERVO0_PIN                          PA1   // SERVOS
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC1    // X-STOP
-#define Y_STOP_PIN         PC0    // Y-STOP
-#define Z_STOP_PIN         PC15   // Z-STOP
+#define X_STOP_PIN                          PC1   // X-STOP
+#define Y_STOP_PIN                          PC0   // Y-STOP
+#define Z_STOP_PIN                          PC15  // Z-STOP
 
 //
 // Z Probe must be this pin
 //
-#define Z_MIN_PROBE_PIN    PC14   // PROBE
+#define Z_MIN_PROBE_PIN                     PC14  // PROBE
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC2    // E0-STOP
+  #define FIL_RUNOUT_PIN                    PC2   // E0-STOP
 #endif
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PC7
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PB15
+#define X_ENABLE_PIN                        PC7
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PB15
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PC10
+  #define X_CS_PIN                          PC10
 #endif
 
-#define Y_ENABLE_PIN       PB14
-#define Y_STEP_PIN         PB13
-#define Y_DIR_PIN          PB12
+#define Y_ENABLE_PIN                        PB14
+#define Y_STEP_PIN                          PB13
+#define Y_DIR_PIN                           PB12
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PC11
+  #define Y_CS_PIN                          PC11
 #endif
 
-#define Z_ENABLE_PIN       PB11
-#define Z_STEP_PIN         PB10
-#define Z_DIR_PIN          PB2
+#define Z_ENABLE_PIN                        PB11
+#define Z_STEP_PIN                          PB10
+#define Z_DIR_PIN                           PB2
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PC12
+  #define Z_CS_PIN                          PC12
 #endif
 
-#define E0_ENABLE_PIN      PB1
-#define E0_STEP_PIN        PB0
-#define E0_DIR_PIN         PC5
+#define E0_ENABLE_PIN                       PB1
+#define E0_STEP_PIN                         PB0
+#define E0_DIR_PIN                          PC5
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PD2
+  #define E0_CS_PIN                         PD2
 #endif
 
 //
@@ -99,17 +99,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB5
+    #define TMC_SW_MOSI                     PB5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB4
+    #define TMC_SW_MISO                     PB4
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB3
+    #define TMC_SW_SCK                      PB3
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -124,17 +124,17 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PC10
-  #define X_SERIAL_RX_PIN  PC10
+  #define X_SERIAL_TX_PIN                   PC10
+  #define X_SERIAL_RX_PIN                   PC10
 
-  #define Y_SERIAL_TX_PIN  PC11
-  #define Y_SERIAL_RX_PIN  PC11
+  #define Y_SERIAL_TX_PIN                   PC11
+  #define Y_SERIAL_RX_PIN                   PC11
 
-  #define Z_SERIAL_TX_PIN  PC12
-  #define Z_SERIAL_RX_PIN  PC12
+  #define Z_SERIAL_TX_PIN                   PC12
+  #define Z_SERIAL_RX_PIN                   PC12
 
-  #define E0_SERIAL_TX_PIN PD2
-  #define E0_SERIAL_RX_PIN PD2
+  #define E0_SERIAL_TX_PIN                  PD2
+  #define E0_SERIAL_RX_PIN                  PD2
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -143,23 +143,23 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // Analog Input "TH0"
-#define TEMP_BED_PIN       PC3   // Analog Input "TB0"
+#define TEMP_0_PIN                          PA0   // Analog Input "TH0"
+#define TEMP_BED_PIN                        PC3   // Analog Input "TB0"
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC8   // HE
-#define HEATER_BED_PIN     PC9   // HB
-#define FAN_PIN            PA8   // FAN0
+#define HEATER_0_PIN                        PC8   // HE
+#define HEATER_BED_PIN                      PC9   // HB
+#define FAN_PIN                             PA8   // FAN0
 
 //
 // USB connect control
 //
-#define USB_CONNECT_PIN    PC13
+#define USB_CONNECT_PIN                     PC13
 #define USB_CONNECT_INVERTING false
 
-#define SD_DETECT_PIN      PC4
+#define SD_DETECT_PIN                       PC4
 
 /**
  *                 _____
@@ -172,27 +172,27 @@
  *                 EXP1
  */
 
-#define EXPA1_03_PIN       PB7
-#define EXPA1_04_PIN       PB8
-#define EXPA1_05_PIN       PB9
-#define EXPA1_06_PIN       PA10
-#define EXPA1_07_PIN       -1
-#define EXPA1_08_PIN       PA9
-#define EXPA1_09_PIN       PB6
-#define EXPA1_10_PIN       PA15
+#define EXPA1_03_PIN                        PB7
+#define EXPA1_04_PIN                        PB8
+#define EXPA1_05_PIN                        PB9
+#define EXPA1_06_PIN                        PA10
+#define EXPA1_07_PIN                        -1
+#define EXPA1_08_PIN                        PA9
+#define EXPA1_09_PIN                        PB6
+#define EXPA1_10_PIN                        PA15
 
 #if HAS_SPI_LCD
-  #define BTN_ENC          EXPA1_09_PIN
-  #define BTN_EN1          EXPA1_08_PIN
-  #define BTN_EN2          EXPA1_06_PIN
+  #define BTN_ENC                   EXPA1_09_PIN
+  #define BTN_EN1                   EXPA1_08_PIN
+  #define BTN_EN2                   EXPA1_06_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN     EXPA1_10_PIN
+    #define BEEPER_PIN              EXPA1_10_PIN
 
-    #define LCD_PINS_RS    EXPA1_04_PIN
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
-    #define LCD_PINS_D4    EXPA1_05_PIN
+    #define LCD_PINS_RS             EXPA1_04_PIN
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
+    #define LCD_PINS_D4             EXPA1_05_PIN
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
@@ -207,12 +207,12 @@
      *                    EXP1
      */
 
-    #define DOGLCD_CS    EXPA1_04_PIN
-    #define DOGLCD_A0    EXPA1_05_PIN
-    #define DOGLCD_SCK   EXPA1_10_PIN
-    #define DOGLCD_MOSI  EXPA1_03_PIN
+    #define DOGLCD_CS               EXPA1_04_PIN
+    #define DOGLCD_A0               EXPA1_05_PIN
+    #define DOGLCD_SCK              EXPA1_10_PIN
+    #define DOGLCD_MOSI             EXPA1_03_PIN
     #define FORCE_SOFT_SPI
-    #define LCD_BACKLIGHT_PIN -1
+    #define LCD_BACKLIGHT_PIN               -1
 
   #else
     #error "Only CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_E3_DIP."
@@ -226,8 +226,8 @@
 #define HAS_ONBOARD_SD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ON_BOARD_SPI_DEVICE 1    //SPI1
-#define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card
+#define ON_BOARD_SPI_DEVICE 1                     //SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
new file mode 100644
index 000000000000..15bc01263abb
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
@@ -0,0 +1,191 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef TARGET_STM32F1
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#endif
+
+// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
+#define DISABLE_JTAG
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+#define FLASH_EEPROM_EMULATION
+#define EEPROM_PAGE_SIZE     uint16(0x800) // 2KB
+#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
+#undef E2END
+#define E2END                (EEPROM_PAGE_SIZE - 1) // 2KB
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA1
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PC0
+#define Y_STOP_PIN                          PC1
+#define Z_STOP_PIN                          PC2
+
+//
+// Z Probe must be this pins
+//
+#define Z_MIN_PROBE_PIN                     PC14
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PC15  // "E0-STOP"
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PB14
+#define X_STEP_PIN                          PB13
+#define X_DIR_PIN                           PB12
+
+#define Y_ENABLE_PIN                        PB11
+#define Y_STEP_PIN                          PB10
+#define Y_DIR_PIN                           PB2
+
+#define Z_ENABLE_PIN                        PB1
+#define Z_STEP_PIN                          PB0
+#define Z_DIR_PIN                           PC5
+
+#define E0_ENABLE_PIN                       PD2
+#define E0_STEP_PIN                         PB3
+#define E0_DIR_PIN                          PB4
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PA0   // Analog Input
+#define TEMP_BED_PIN                        PC3   // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC8   // EXTRUDER
+#define HEATER_BED_PIN                      PC9   // BED
+#define FAN_PIN                             PA8
+
+//
+// USB connect control
+//
+#define USB_CONNECT_PIN                     PC13
+#define USB_CONNECT_INVERTING false
+
+#define SD_DETECT_PIN                       PC4
+
+/**
+ *                 _____
+ *             5V | 1 2 | GND
+ *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
+ *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
+ *          RESET | 7 8 | PA9  (BTN_EN1)
+ * (BTN_ENC) PB6  | 9 10| PB5  (BEEPER)
+ *                 -----
+ *                 EXP1
+ */
+
+#define EXPA1_03_PIN                        PB7
+#define EXPA1_04_PIN                        PB8
+#define EXPA1_05_PIN                        PB9
+#define EXPA1_06_PIN                        PA10
+#define EXPA1_07_PIN                        -1
+#define EXPA1_08_PIN                        PA9
+#define EXPA1_09_PIN                        PB6
+#define EXPA1_10_PIN                        PB5
+
+#if HAS_SPI_LCD
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define BEEPER_PIN              EXPA1_10_PIN
+
+    #define BTN_EN1                 EXPA1_08_PIN
+    #define BTN_EN2                 EXPA1_06_PIN
+    #define BTN_ENC                 EXPA1_09_PIN
+
+    #define LCD_PINS_RS             EXPA1_04_PIN
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
+    #define LCD_PINS_D4             EXPA1_05_PIN
+
+  #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
+    #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
+
+    #define LCD_PINS_RS             EXPA1_05_PIN
+    #define LCD_PINS_ENABLE         EXPA1_09_PIN
+    #define LCD_PINS_D4             EXPA1_04_PIN
+    #define LCD_PINS_D5             EXPA1_06_PIN
+    #define LCD_PINS_D6             EXPA1_08_PIN
+    #define LCD_PINS_D7             EXPA1_10_PIN
+    #define ADC_KEYPAD_PIN                  PA1   // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
+  #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+
+    /** Creality Ender-2 display pinout
+     *                   _____
+     *               5V | 1 2 | GND
+     *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
+     *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
+     *            RESET | 7 8 | PA9  (BTN_EN1)
+     *   (BTN_ENC) PB6  | 9 10| PB5  (SCK)
+     *                   -----
+     *                    EXP1
+     */
+    #define BTN_EN1                 EXPA1_08_PIN
+    #define BTN_EN2                 EXPA1_06_PIN
+    #define BTN_ENC                 EXPA1_09_PIN
+
+    #define DOGLCD_CS               EXPA1_04_PIN
+    #define DOGLCD_A0               EXPA1_05_PIN
+    #define DOGLCD_SCK              EXPA1_10_PIN
+    #define DOGLCD_MOSI             EXPA1_03_PIN
+    #define FORCE_SOFT_SPI
+    #define LCD_BACKLIGHT_PIN               -1
+
+  #else
+
+    #error "Only ZONESTAR_LCD, MKS_MINI_12864, ENDER2_STOCKDISPLAY, and CR10_STOCKDISPLAY are currently supported on the BIGTREE_SKR_MINI_E3."
+
+  #endif
+
+#endif // HAS_SPI_LCD
+
+//
+// SD Support
+//
+#define HAS_ONBOARD_SD
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#define ON_BOARD_SPI_DEVICE 1                     // SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
similarity index 70%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
index 5701dd5c5629..961620ee8ba2 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -25,26 +25,26 @@
 
 #define BOARD_INFO_NAME "BIGTREE SKR Mini E3 V1.2"
 
-#define NEOPIXEL_PIN       PC7  // LED driving pin
+#define NEOPIXEL_PIN                       PC7    // LED driving pin
 
 /**
  * TMC2208/TMC2209 stepper drivers
  */
-#if HAS_TMC220x
+#if HAS_TMC_UART
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PB15
-  #define X_SERIAL_RX_PIN  PB15
+  #define X_SERIAL_TX_PIN                  PB15
+  #define X_SERIAL_RX_PIN                  PB15
 
-  #define Y_SERIAL_TX_PIN  PC6
-  #define Y_SERIAL_RX_PIN  PC6
+  #define Y_SERIAL_TX_PIN                  PC6
+  #define Y_SERIAL_RX_PIN                  PC6
 
-  #define Z_SERIAL_TX_PIN  PC10
-  #define Z_SERIAL_RX_PIN  PC10
+  #define Z_SERIAL_TX_PIN                  PC10
+  #define Z_SERIAL_RX_PIN                  PC10
 
-  #define E0_SERIAL_TX_PIN PC11
-  #define E0_SERIAL_RX_PIN PC11
+  #define E0_SERIAL_TX_PIN                 PC11
+  #define E0_SERIAL_RX_PIN                 PC11
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
similarity index 51%
rename from Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
rename to Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
index 08f666882eca..fff3af5b6bc2 100644
--- a/Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
@@ -41,57 +41,57 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PC2
-#define X_MAX_PIN          PA2
-#define Y_MIN_PIN          PC1
-#define Y_MAX_PIN          PA1
-#define Z_MIN_PIN          PC0
-#define Z_MAX_PIN          PC3
+#define X_MIN_PIN                           PC2
+#define X_MAX_PIN                           PA2
+#define Y_MIN_PIN                           PC1
+#define Y_MAX_PIN                           PA1
+#define Z_MIN_PIN                           PC0
+#define Z_MAX_PIN                           PC3
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PC7
-#define X_ENABLE_PIN       PB15
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PC7
+#define X_ENABLE_PIN                        PB15
 
-#define Y_STEP_PIN         PB13
-#define Y_DIR_PIN          PB14
-#define Y_ENABLE_PIN       PB12
+#define Y_STEP_PIN                          PB13
+#define Y_DIR_PIN                           PB14
+#define Y_ENABLE_PIN                        PB12
 
-#define Z_STEP_PIN         PB10
-#define Z_DIR_PIN          PB11
-#define Z_ENABLE_PIN       PB2
+#define Z_STEP_PIN                          PB10
+#define Z_DIR_PIN                           PB11
+#define Z_ENABLE_PIN                        PB2
 
-#define E0_STEP_PIN        PC5
-#define E0_DIR_PIN         PB0
-#define E0_ENABLE_PIN      PC4
+#define E0_STEP_PIN                         PC5
+#define E0_DIR_PIN                          PB0
+#define E0_ENABLE_PIN                       PC4
 
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB3
+    #define TMC_SW_SCK                      PB3
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB4
+    #define TMC_SW_MISO                     PB4
   #endif
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB5
+    #define TMC_SW_MOSI                     PB5
   #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA8
-#define FAN_PIN            PC8
-#define HEATER_BED_PIN     PC9
+#define HEATER_0_PIN                        PA8
+#define FAN_PIN                             PC8
+#define HEATER_BED_PIN                      PC9
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PB1   // Analog Input
-#define TEMP_0_PIN         PA0   // Analog Input
+#define TEMP_BED_PIN                        PB1   // Analog Input
+#define TEMP_0_PIN                          PA0   // Analog Input
 
 //
 // LCD Pins
@@ -109,41 +109,41 @@
  */
 
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PC10
-  #define BTN_ENC          PC11
+  #define BEEPER_PIN                        PC10
+  #define BTN_ENC                           PC11
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PC15
+    #define LCD_PINS_RS                     PC15
 
-    #define BTN_EN1        PB6
-    #define BTN_EN2        PC13
+    #define BTN_EN1                         PB6
+    #define BTN_EN2                         PC13
 
-    #define LCD_PINS_ENABLE PC14
-    #define LCD_PINS_D4    PB7
+    #define LCD_PINS_ENABLE                 PC14
+    #define LCD_PINS_D4                     PB7
 
   #else
 
-    #define LCD_PINS_RS      PC12
+    #define LCD_PINS_RS                     PC12
 
-    #define BTN_EN1          PD2
-    #define BTN_EN2          PB8
+    #define BTN_EN1                         PD2
+    #define BTN_EN2                         PB8
 
-    #define LCD_PINS_ENABLE  PB6
+    #define LCD_PINS_ENABLE                 PB6
 
     #if ENABLED(FYSETC_MINI_12864)
 
-      #define LCD_BACKLIGHT_PIN -1
-      #define LCD_RESET_PIN  PC13
-      #define DOGLCD_A0      PC12
-      #define DOGLCD_CS      PB6
-      #define DOGLCD_SCK     PB3
-      #define DOGLCD_MOSI    PB5
+      #define LCD_BACKLIGHT_PIN             -1
+      #define LCD_RESET_PIN                 PC13
+      #define DOGLCD_A0                     PC12
+      #define DOGLCD_CS                     PB6
+      #define DOGLCD_SCK                    PB3
+      #define DOGLCD_MOSI                   PB5
 
-      #define FORCE_SOFT_SPI   // SPI MODE3
+      #define FORCE_SOFT_SPI                      // SPI MODE3
 
-      #define LED_PIN        PB7   // red pwm
-      //#define LED_PIN        PC15   // green
-      //#define LED_PIN        PC14   // blue
+      #define LED_PIN                       PB7   // red pwm
+      //#define LED_PIN                     PC15  // green
+      //#define LED_PIN                     PC14  // blue
 
       //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       //  #ifndef RGB_LED_R_PIN
@@ -159,13 +159,13 @@
       //  #define NEOPIXEL_PIN    PB7
       //#endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
-    #define LCD_PINS_D4    PC13
+    #define LCD_PINS_D4                     PC13
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PB7
-      #define LCD_PINS_D6  PC15
-      #define LCD_PINS_D7  PC14
+      #define LCD_PINS_D5                   PB7
+      #define LCD_PINS_D6                   PC15
+      #define LCD_PINS_D7                   PC14
     #endif
 
     #endif // !FYSETC_MINI_12864
@@ -182,26 +182,26 @@
 // set SDCARD_CONNECTION form 'ONBOARD' to 'LCD' and use an external SD (connected to LCD)
 #define HAS_ONBOARD_SD
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI3
-  #define SD_DETECT_PIN    PB9
-  #define SCK_PIN          PB3
-  #define MISO_PIN         PB4
-  #define MOSI_PIN         PB5
-  #define SS_PIN           PA15
+  #define SD_DETECT_PIN                     PB9
+  #define SCK_PIN                           PB3
+  #define MISO_PIN                          PB4
+  #define MOSI_PIN                          PB5
+  #define SS_PIN                            PA15
 #elif SD_CONNECTION_IS(ONBOARD)
   #define ENABLE_SPI1
-  #define SD_DETECT_PIN    PA3
-  #define SCK_PIN          PA5
-  #define MISO_PIN         PA6
-  #define MOSI_PIN         PA7
-  #define SS_PIN           PA4
+  #define SD_DETECT_PIN                     PA3
+  #define SCK_PIN                           PA5
+  #define MISO_PIN                          PA6
+  #define MOSI_PIN                          PA7
+  #define SS_PIN                            PA4
 #endif
-#define ON_BOARD_SPI_DEVICE 1    //SPI1
-#define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card
+#define ON_BOARD_SPI_DEVICE 1                     //SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
 
 #if HAS_GRAPHICAL_LCD
   #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
new file mode 100644
index 000000000000..b9272c721167
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -0,0 +1,281 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if !defined(__STM32F1__) && !defined(__STM32F4__)
+  #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 2017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME      "Chitu3D"
+#define DEFAULT_MACHINE_NAME "STM32F103RET6"
+
+// Enable I2C_EEPROM for testing
+//#define I2C_EEPROM
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PE5
+#define X_DIR_PIN                           PE6
+#define X_ENABLE_PIN                        PC13
+#define X_MIN_PIN                           PG10
+#define X_MAX_PIN                           -1
+
+#define Y_STEP_PIN                          PE2
+#define Y_DIR_PIN                           PE3
+#define Y_ENABLE_PIN                        PE4
+#define Y_MIN_PIN                           PA12
+#define Y_MAX_PIN
+
+#define Z_STEP_PIN                          PB9
+#define Z_DIR_PIN                           PE0
+#define Z_ENABLE_PIN                        PE1
+#define Z_MIN_PIN                           PA14
+#define Z_MAX_PIN                           -1
+
+#define Y2_STEP_PIN                         -1
+#define Y2_DIR_PIN                          -1
+#define Y2_ENABLE_PIN                       -1
+
+#define Z2_STEP_PIN                         -1
+#define Z2_DIR_PIN                          -1
+#define Z2_ENABLE_PIN                       -1
+
+#define E0_STEP_PIN                         PB4
+#define E0_DIR_PIN                          PB5
+#define E0_ENABLE_PIN                       PB8
+
+#define E1_STEP_PIN                         -1
+#define E1_DIR_PIN                          -1
+#define E1_ENABLE_PIN                       -1
+
+#define E2_STEP_PIN                         -1
+#define E2_DIR_PIN                          -1
+#define E2_ENABLE_PIN                       -1
+
+//
+// Misc. Functions
+//
+#define SDSS                                -1
+#define LED_PIN                             -1
+#define CASE_LIGHT_PIN                      PA8   // 8
+
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            PD6   // LED strip 24v
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PD12  // HOT-END
+#define HEATER_1_PIN                        -1
+#define HEATER_2_PIN                        -1
+
+#define HEATER_BED_PIN                      PG11  // HOT-BED
+#define HEATER_BED2_PIN                     -1    // BED2
+#define HEATER_BED3_PIN                     -1    // BED3
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PG14  // MAIN BOARD FAN
+#endif
+
+#define FAN_SOFT_PWM
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PA0   // Analog Input
+#define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_1_PIN                          -1    // Analog Input
+#define TEMP_2_PIN                          -1    // Analog Input
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+    #define LCD_PINS_RS                     PD1   // 49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PD3   // 51  // SID (MOSI)
+    #define LCD_PINS_D4                     PD4   // 52  // SCK (CLK) clock
+  #elif BOTH(NEWPANEL, PANEL_ONE)
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+  #else
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+    #if DISABLED(NEWPANEL)
+      #define BEEPER_PIN                    PC1   // 33
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK                   PC6   // 38
+      //#define SHIFT_LD                    PC10  // 42
+      //#define SHIFT_OUT                   PC8   // 40
+      //#define SHIFT_EN                    PA1   // 17
+    #endif
+  #endif
+
+  #if ENABLED(NEWPANEL)
+
+    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+      #define BEEPER_PIN                    PC5
+
+      #define BTN_EN1                       PB15  // 31
+      #define BTN_EN2                       PC1   // 33
+      #define BTN_ENC                       PC3   // 35
+
+      #define SD_DETECT_PIN                 PD1   // 49
+      #define KILL_PIN                      PC9   // 41
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        #define LCD_BACKLIGHT_PIN           PC7   // 39
+      #endif
+
+    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+      #define BTN_EN1                       PE0   // 64
+      #define BTN_EN2                       PD11  // 59
+      #define BTN_ENC                       PD15  // 63
+      #define SD_DETECT_PIN                 PC10  // 42
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      #define BTN_EN1                       PC15  // 47
+      #define BTN_EN2                       PC11  // 43
+      #define BTN_ENC                       PC0   // 32
+      #define LCD_SDSS                      PD5   // 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN                      PC9   // 41
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      #define BTN_EN1                       PB6   // 22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                       PA7   //  7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+      #define BTN_ENC                       -1
+      #define LCD_SDSS                      PD5   // 53
+      #define SD_DETECT_PIN                 PD1   // 49
+
+    #elif ANY(VIKI2, miniVIKI)
+
+      #define BEEPER_PIN                    PC1   // 33
+
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0                     PC12  // 44
+      #define DOGLCD_CS                     PC13  // 45
+      #define LCD_SCREEN_ROT_180
+
+      #define BTN_EN1                       PB6   // 22
+      #define BTN_EN2                       PA7   //  7
+      #define BTN_ENC                       PC7   // 39
+
+      #define SDSS                          PD5   // 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
+
+      #define KILL_PIN                      PB15  // 31
+
+      #define STAT_LED_RED_PIN              PC0   // 32
+      #define STAT_LED_BLUE_PIN             PC3   // 35
+
+    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+      #define BTN_EN1                       PC3   // 35
+      #define BTN_EN2                       PC5   // 37
+      #define BTN_ENC                       PB15  // 31
+      #define SD_DETECT_PIN                 PD1   // 49
+      #define LCD_SDSS                      PD5   // 53
+      #define KILL_PIN                      PC9   // 41
+      #define BEEPER_PIN                    PB7   // 23
+      #define DOGLCD_CS                     PB13  // 29
+      #define DOGLCD_A0                     PB11  // 27
+      #define LCD_BACKLIGHT_PIN             PC1   // 33
+
+    #elif ENABLED(MINIPANEL)
+
+      #define BEEPER_PIN                    PC10  // 42
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0                     PC12  // 44
+      #define DOGLCD_CS                     PE2   // 66
+      #define LCD_BACKLIGHT_PIN             PE1   // 65   // backlight LED on A11/D65
+      #define SDSS                          PD5   // 53
+
+      #define KILL_PIN                      PE0   // 64
+      // GLCD features
+      // Uncomment screen orientation
+      //#define LCD_SCREEN_ROT_90
+      //#define LCD_SCREEN_ROT_180
+      //#define LCD_SCREEN_ROT_270
+      // The encoder and click button
+      #define BTN_EN1                       PC8   // 40
+      #define BTN_EN2                       PD15  // 63
+      #define BTN_ENC                       PD11  // 59
+      // not connected to a pin
+      #define SD_DETECT_PIN                 PD1   // 49
+
+    #else
+
+      // Beeper on AUX-4
+      #define BEEPER_PIN                    PC1   // 33
+
+      // Buttons directly attached to AUX-2
+      #if ENABLED(REPRAPWORLD_KEYPAD)
+        #define BTN_EN1                     PE0   // 64
+        #define BTN_EN2                     PD11  // 59
+        #define BTN_ENC                     PD15  // 63
+        #define SHIFT_OUT                   PC8   // 40
+        #define SHIFT_CLK                   PC12  // 44
+        #define SHIFT_LD                    PC10  // 42
+      #elif ENABLED(PANEL_ONE)
+        #define BTN_EN1                     PD11  // 59   // AUX2 PIN 3
+        #define BTN_EN2                     PD15  // 63   // AUX2 PIN 4
+        #define BTN_ENC                     PD1   // 49   // AUX3 PIN 7
+      #else
+        #define BTN_EN1                     PC5   // 37
+        #define BTN_EN2                     PC3   // 35
+        #define BTN_ENC                     PB15  // 31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        #define SD_DETECT_PIN               PD1   // 49
+        #define KILL_PIN                    PC9   // 41
+      #else
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
+      #endif
+
+    #endif
+  #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
similarity index 55%
rename from Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
index db76042ab7f3..dcd1119c8648 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
@@ -46,55 +46,55 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PA1
-#define Y_STOP_PIN         PA0
-#define Z_STOP_PIN         PB14
+#define X_STOP_PIN                          PA1
+#define Y_STOP_PIN                          PA0
+#define Z_STOP_PIN                          PB14
 
 //
 // Filament runout
 //
 #ifdef pins_v2_20190128
-  #define FIL_RUNOUT_PIN   PB15
+  #define FIL_RUNOUT_PIN                    PB15
 #else
-  #define FIL_RUNOUT_PIN   PB5
+  #define FIL_RUNOUT_PIN                    PB5
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PB8
-#define X_DIR_PIN          PB9
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PB8
+#define X_DIR_PIN                           PB9
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PB2
+#define Y_STEP_PIN                          PB2
 #ifdef pins_v2_20190128
-  #define Y_DIR_PIN        PB3
+  #define Y_DIR_PIN                         PB3
 #else
-  #define Y_DIR_PIN        PB0
+  #define Y_DIR_PIN                         PB0
 #endif
-#define Y_ENABLE_PIN       PB1
+#define Y_ENABLE_PIN                        PB1
 
-#define Z_STEP_PIN         PC0
-#define Z_DIR_PIN          PC1
-#define Z_ENABLE_PIN       PC2
+#define Z_STEP_PIN                          PC0
+#define Z_DIR_PIN                           PC1
+#define Z_ENABLE_PIN                        PC2
 
-#define E0_STEP_PIN        PC15
-#define E0_DIR_PIN         PC14
-#define E0_ENABLE_PIN      PC13
+#define E0_STEP_PIN                         PC15
+#define E0_DIR_PIN                          PC14
+#define E0_ENABLE_PIN                       PC13
 
 //
 // Stepper current PWM
 //
 
 // X:PA2 Y:PA3 Z:PB12 E:PB13 // changed for test
-//#define MOTOR_CURRENT_PWM_XY_PIN PA3
-//#define MOTOR_CURRENT_PWM_Z_PIN  PA2 // PB12
-//#define MOTOR_CURRENT_PWM_XY_PIN PB6
-//#define MOTOR_CURRENT_PWM_Z_PIN  PB7 // PB12
-//#define MOTOR_CURRENT_PWM_E_PIN  -1  // PB13
+//#define MOTOR_CURRENT_PWM_XY_PIN          PA3
+//#define MOTOR_CURRENT_PWM_Z_PIN           PA2   // PB12
+//#define MOTOR_CURRENT_PWM_XY_PIN          PB6
+//#define MOTOR_CURRENT_PWM_Z_PIN           PB7   // PB12
+//#define MOTOR_CURRENT_PWM_E_PIN           -1    // PB13
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE 1500 // geo-f:old 2000
+  #define MOTOR_CURRENT_PWM_RANGE 1500            // geo-f:old 2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  {500, 500, 400} // geo-f:old 1300 1300 1250
 
@@ -112,37 +112,37 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC7
-#define HEATER_BED_PIN     PC6
+#define HEATER_0_PIN                        PC7
+#define HEATER_BED_PIN                      PC6
 #ifndef FAN_PIN
-  #define FAN_PIN          PC8
+  #define FAN_PIN                           PC8
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PC5   // Analog Input
-#define TEMP_0_PIN         PC4   // Analog Input
+#define TEMP_BED_PIN                        PC5   // Analog Input
+#define TEMP_0_PIN                          PC4   // Analog Input
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
+#define SDSS                                PA4
 
 //
 // LCD Pins
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       PC9
+  #define BEEPER_PIN                        PC9
 
   #if HAS_GRAPHICAL_LCD
 
-    #define DOGLCD_A0      PA15
+    #define DOGLCD_A0                       PA15
     #ifdef pins_v2_20190128
-      #define DOGLCD_CS    PB5
+      #define DOGLCD_CS                     PB5
     #else
-      #define DOGLCD_CS    PB7
+      #define DOGLCD_CS                     PB7
     #endif
 
     //#define LCD_CONTRAST_INIT 190
@@ -153,36 +153,36 @@
   #endif
 
   // not connected to a pin
-  #define SD_DETECT_PIN    PC3
+  #define SD_DETECT_PIN                     PC3
 
   #if ENABLED(NEWPANEL)
     // The encoder and click button
-    #define BTN_EN1        PC10
-    #define BTN_EN2        PC11
-    #define BTN_ENC        PC12
+    #define BTN_EN1                         PC10
+    #define BTN_EN2                         PC11
+    #define BTN_ENC                         PC12
   #endif
 
   #ifdef pins_v2_20190128
-    #define LCD_RESET_PIN  PB4
+    #define LCD_RESET_PIN                   PB4
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN PB0
+      #define RGB_LED_R_PIN                 PB0
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN PB6
+      #define RGB_LED_G_PIN                 PB6
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN PB7
+      #define RGB_LED_B_PIN                 PB7
     #endif
   #else
-    #define LCD_RESET_PIN  PB6
+    #define LCD_RESET_PIN                   PB6
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN PB3
+      #define RGB_LED_R_PIN                 PB3
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN PB4
+      #define RGB_LED_G_PIN                 PB4
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN PB5
+      #define RGB_LED_B_PIN                 PB5
     #endif
   #endif
 
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index a845ed161b7d..e726ca1831a7 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -44,38 +44,38 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA0
+#define SERVO0_PIN                          PA0
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PA1
-#define Y_STOP_PIN         PB4
-#define Z_STOP_PIN         PA15
+#define X_STOP_PIN                          PA1
+#define Y_STOP_PIN                          PB4
+#define Z_STOP_PIN                          PA15
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PB5
+#define FIL_RUNOUT_PIN                      PB5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PB8
-#define X_DIR_PIN          PB9
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PB8
+#define X_DIR_PIN                           PB9
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PB2
-#define Y_DIR_PIN          PB3
-#define Y_ENABLE_PIN       PB1
+#define Y_STEP_PIN                          PB2
+#define Y_DIR_PIN                           PB3
+#define Y_ENABLE_PIN                        PB1
 
-#define Z_STEP_PIN         PC0
-#define Z_DIR_PIN          PC1
-#define Z_ENABLE_PIN       PC2
+#define Z_STEP_PIN                          PC0
+#define Z_DIR_PIN                           PC1
+#define Z_ENABLE_PIN                        PC2
 
-#define E0_STEP_PIN        PC15
-#define E0_DIR_PIN         PC14
-#define E0_ENABLE_PIN      PC13
+#define E0_STEP_PIN                         PC15
+#define E0_DIR_PIN                          PC14
+#define E0_ENABLE_PIN                       PC13
 
 #define X_HARDWARE_SERIAL  MSerial2
 #define Y_HARDWARE_SERIAL  MSerial2
@@ -85,35 +85,35 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC6
-#define HEATER_BED_PIN     PC7
+#define HEATER_0_PIN                        PC6
+#define HEATER_BED_PIN                      PC7
 #ifndef FAN_PIN
-  #define FAN_PIN          PC8
+  #define FAN_PIN                           PC8
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PC5   // Analog Input
-#define TEMP_0_PIN         PC4   // Analog Input
+#define TEMP_BED_PIN                        PC5   // Analog Input
+#define TEMP_0_PIN                          PC4   // Analog Input
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
+#define SDSS                                PA4
 
 //
 // LCD Pins
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       PC9
+  #define BEEPER_PIN                        PC9
 
   #if HAS_GRAPHICAL_LCD
-    #define DOGLCD_A0      PB14
-    #define DOGLCD_CS      PB12
-    #define DOGLCD_SCK     PB13
-    #define DOGLCD_MOSI    PB15
+    #define DOGLCD_A0                       PB14
+    #define DOGLCD_CS                       PB12
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
     //#define LCD_SCREEN_ROT_90
     //#define LCD_SCREEN_ROT_180
     //#define LCD_SCREEN_ROT_270
@@ -123,29 +123,29 @@
     #endif
   #endif
 
-  #define LCD_PINS_RS      PB12   // CS -- SOFT SPI for ENDER3 LCD
-  #define LCD_PINS_D4      PB13   // SCLK
-  #define LCD_PINS_ENABLE  PB15   // DATA MOSI
+  #define LCD_PINS_RS                       PB12  // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                       PB13  // SCLK
+  #define LCD_PINS_ENABLE                   PB15  // DATA MOSI
 
   // not connected to a pin
-  #define SD_DETECT_PIN    PC3
+  #define SD_DETECT_PIN                     PC3
 
   #ifndef RGB_LED_R_PIN
-    #define RGB_LED_R_PIN  PB0
+    #define RGB_LED_R_PIN                   PB0
   #endif
   #ifndef RGB_LED_G_PIN
-    #define RGB_LED_G_PIN  PB7
+    #define RGB_LED_G_PIN                   PB7
   #endif
   #ifndef RGB_LED_B_PIN
-    #define RGB_LED_B_PIN  PB6
+    #define RGB_LED_B_PIN                   PB6
   #endif
 
   //#define LCD_CONTRAST_INIT 190
 
   #if ENABLED(NEWPANEL)
-    #define BTN_EN1        PC11
-    #define BTN_EN2        PC10
-    #define BTN_ENC        PC12
+    #define BTN_EN1                         PC11
+    #define BTN_EN2                         PC10
+    #define BTN_ENC                         PC12
   #endif
 
 #endif
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
similarity index 74%
rename from Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
rename to Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
index 5f7136c15654..9c6412c0cb53 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
@@ -36,9 +36,9 @@
 #undef RGB_LED_G_PIN
 #undef RGB_LED_B_PIN
 
-#define FAN1_PIN          PB0 // Fan1
+#define FAN1_PIN                           PB0    // Fan1
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
 
   /**
    * TMC2208/TMC2209 stepper drivers
@@ -47,17 +47,17 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PA11
-  #define X_SERIAL_RX_PIN  PA12
+  #define X_SERIAL_TX_PIN                  PA11
+  #define X_SERIAL_RX_PIN                  PA12
 
-  #define Y_SERIAL_TX_PIN  PB6
-  #define Y_SERIAL_RX_PIN  PB7
+  #define Y_SERIAL_TX_PIN                  PB6
+  #define Y_SERIAL_RX_PIN                  PB7
 
-  #define Z_SERIAL_TX_PIN  PB10
-  #define Z_SERIAL_RX_PIN  PB11
+  #define Z_SERIAL_TX_PIN                  PB10
+  #define Z_SERIAL_RX_PIN                  PB11
 
-  #define E0_SERIAL_TX_PIN PA2
-  #define E0_SERIAL_RX_PIN PA3
+  #define E0_SERIAL_TX_PIN                 PA2
+  #define E0_SERIAL_RX_PIN                 PA3
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
similarity index 54%
rename from Marlin/src/pins/stm32/pins_GTM32_MINI.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index a35bd298884b..38cc615f64c6 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE1   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE0   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE1   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE0   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXT0 port
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9   // EXT0 port, used as main extruder fan
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
+//#define FAN_PIN                           PB9   // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -138,19 +138,19 @@
     // Geeetech's LCD2004A Control Panel is very much like
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
   #else
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
@@ -167,9 +167,9 @@
   // RepRapDiscount Smart Controller, but adds an FFC40 connector
   // connected with a flat wire to J2 connector on the board.
   //
-  #define BTN_EN1          PE8
-  #define BTN_EN2          PE9
-  #define BTN_ENC          PE13
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE9
+  #define BTN_ENC                           PE13
 
   #define GTM32_PRO_VB_USE_LCD_BEEPER
   #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -182,10 +182,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -203,28 +203,28 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PC11
-  #define SCK_PIN          PC12
-  #define MOSI_PIN         PD2
-  #define MISO_PIN         PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PC11
+  #define SCK_PIN                           PC12
+  #define MOSI_PIN                          PD2
+  #define MISO_PIN                          PC8
+  #define SD_DETECT_PIN                     PC7
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index 4c14165f799d..873d02b065a2 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE0   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE1   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE0   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE1   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXT0 port
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9   // EXT0 port, used as main extruder fan
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
+//#define FAN_PIN                           PB9   // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -139,16 +139,16 @@
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     // connected with a flat wire to J2 connector on the board.
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
-    #define BTN_EN1          PE8
-    #define BTN_EN2          PE9
-    #define BTN_ENC          PE13
+    #define BTN_EN1                         PE8
+    #define BTN_EN2                         PE9
+    #define BTN_ENC                         PE13
 
     #define GTM32_PRO_VB_USE_LCD_BEEPER
     #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -157,8 +157,8 @@
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
@@ -182,10 +182,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -203,28 +203,28 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PC11
-  #define SCK_PIN          PC12
-  #define MOSI_PIN         PD2
-  #define MISO_PIN         PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PC11
+  #define SCK_PIN                           PC12
+  #define MOSI_PIN                          PD2
+  #define MISO_PIN                          PC8
+  #define SD_DETECT_PIN                     PC7
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
similarity index 54%
rename from Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index a35bd298884b..38cc615f64c6 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE1   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE0   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE1   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE0   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXT0 port
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define ORIG_E0_AUTO_FAN_PIN PB9   // EXT0 port, used as main extruder fan
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
+//#define FAN_PIN                           PB9   // EXT0 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -138,19 +138,19 @@
     // Geeetech's LCD2004A Control Panel is very much like
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
   #else
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
@@ -167,9 +167,9 @@
   // RepRapDiscount Smart Controller, but adds an FFC40 connector
   // connected with a flat wire to J2 connector on the board.
   //
-  #define BTN_EN1          PE8
-  #define BTN_EN2          PE9
-  #define BTN_ENC          PE13
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE9
+  #define BTN_ENC                           PE13
 
   #define GTM32_PRO_VB_USE_LCD_BEEPER
   #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -182,10 +182,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -203,28 +203,28 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PC11
-  #define SCK_PIN          PC12
-  #define MOSI_PIN         PD2
-  #define MISO_PIN         PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PC11
+  #define SCK_PIN                           PC12
+  #define MOSI_PIN                          PD2
+  #define MISO_PIN                          PC8
+  #define SD_DETECT_PIN                     PC7
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
similarity index 52%
rename from Marlin/src/pins/stm32/pins_GTM32_REV_B.h
rename to Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index e02b8b9377b5..24196ad892ff 100644
--- a/Marlin/src/pins/stm32/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -53,32 +53,32 @@
 
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #define FLASH_EEPROM_EMULATION
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PE5   // ENDSTOPS 15,17
-#define X_MAX_PIN          PE4   // ENDSTOPS 16,18
-#define Y_MIN_PIN          PE3   // ENDSTOPS 9,11
-#define Y_MAX_PIN          PE2   // ENDSTOPS 10,12
-#define Z_MIN_PIN          PE1   // ENDSTOPS 3,5
-#define Z_MAX_PIN          PE0   // ENDSTOPS 4,6
+#define X_MIN_PIN                           PE5   // ENDSTOPS 15,17
+#define X_MAX_PIN                           PE4   // ENDSTOPS 16,18
+#define Y_MIN_PIN                           PE3   // ENDSTOPS 9,11
+#define Y_MAX_PIN                           PE2   // ENDSTOPS 10,12
+#define Z_MIN_PIN                           PE1   // ENDSTOPS 3,5
+#define Z_MAX_PIN                           PE0   // ENDSTOPS 4,6
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PC6
-#define X_DIR_PIN          PD13
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PD13
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PA12
-#define Y_DIR_PIN          PA11
-#define Y_ENABLE_PIN       PA15
+#define Y_STEP_PIN                          PA12
+#define Y_DIR_PIN                           PA11
+#define Y_ENABLE_PIN                        PA15
 
-#define Z_STEP_PIN         PD6
-#define Z_DIR_PIN          PD3
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PB3
 
 // Extruder stepper pins
 // NOTE: Numbering here is made according to EXT connector numbers,
@@ -86,46 +86,46 @@
 //       That is, E0_*_PIN are the E2_* lines connected to E2_A1 step
 //       stick that drives the EXT0 output on the board.
 //
-#define E0_STEP_PIN        PC14
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PC15
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
 
-#define E1_STEP_PIN        PA0
-#define E1_DIR_PIN         PB6
-#define E1_ENABLE_PIN      PA1
+#define E1_STEP_PIN                         PA0
+#define E1_DIR_PIN                          PB6
+#define E1_ENABLE_PIN                       PA1
 
-#define E2_STEP_PIN        PB2
-#define E2_DIR_PIN         PB11
-#define E2_ENABLE_PIN      PC4
+#define E2_STEP_PIN                         PB2
+#define E2_DIR_PIN                          PB11
+#define E2_ENABLE_PIN                       PC4
 
 //
 // Heaters / Fans - INFO: Extruders ports are in reverse order. Pin numbers here differ from schematic. Original firmware assumes heater, fan and temp sensor on port EXT0 PB0, PB9, PC2.
 //
-#define HEATER_0_PIN       PB0   // EXT0 port.
-#define HEATER_1_PIN       PB5   // EXT1 port
-#define HEATER_2_PIN       PB4   // EXT2 port
-#define HEATER_BED_PIN     PB1   // CON2X3 hotbed port
+#define HEATER_0_PIN                        PB0   // EXT0 port.
+#define HEATER_1_PIN                        PB5   // EXT1 port
+#define HEATER_2_PIN                        PB4   // EXT2 port
+#define HEATER_BED_PIN                      PB1   // CON2X3 hotbed port
 
 //
 // These are FAN PWM pins on EXT0..EXT2 connectors.
 //
-//#define FAN_PIN            PB9   // EXT0 port
-#define FAN1_PIN           PB8   // EXT1 port
-#define FAN2_PIN           PB7   // EXT2 port
-#define ORIG_E0_AUTO_FAN_PIN  PB9  // EXT0 port, used as main extruder fan
+//#define FAN_PIN                           PB9   // EXT0 port
+#define FAN1_PIN                            PB8   // EXT1 port
+#define FAN2_PIN                            PB7   // EXT2 port
+#define ORIG_E0_AUTO_FAN_PIN                PB9   // EXT0 port, used as main extruder fan
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2   // EXT0 port
-#define TEMP_1_PIN         PC1   // EXT1 port
-#define TEMP_2_PIN         PC0   // EXT2 port
-#define TEMP_BED_PIN       PC3   // CON2X3 hotbed port
+#define TEMP_0_PIN                          PC2   // EXT0 port
+#define TEMP_1_PIN                          PC1   // EXT1 port
+#define TEMP_2_PIN                          PC0   // EXT2 port
+#define TEMP_BED_PIN                        PC3   // CON2X3 hotbed port
 
 //
 // Misc. Functions
 //
-#define LED_PWM            PD12   // External LED, pin 2 on LED labeled connector
+#define LED_PWM                             PD12  // External LED, pin 2 on LED labeled connector
 
 //
 // LCD / Controller
@@ -140,16 +140,16 @@
     // RepRapDiscount Smart Controller, but adds an FFC40 connector
     // connected with a flat wire to J2 connector on the board.
     //
-    #define LCD_PINS_RS    PE6   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE PE14 // SID (MOSI)
-    #define LCD_PINS_D4    PD8   // SCK (CLK) clock
-    #define LCD_PINS_D5    PD9
-    #define LCD_PINS_D6    PD10
-    #define LCD_PINS_D7    PE15
+    #define LCD_PINS_RS                     PE6   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 PE14  // SID (MOSI)
+    #define LCD_PINS_D4                     PD8   // SCK (CLK) clock
+    #define LCD_PINS_D5                     PD9
+    #define LCD_PINS_D6                     PD10
+    #define LCD_PINS_D7                     PE15
 
-    #define BTN_EN1        PE8
-    #define BTN_EN2        PE9
-    #define BTN_ENC        PE13
+    #define BTN_EN1                         PE8
+    #define BTN_EN2                         PE9
+    #define BTN_ENC                         PE13
 
     //#define GTM32_PRO_VB_USE_LCD_BEEPER
     #define GTM32_PRO_VB_USE_EXT_SDCARD
@@ -158,19 +158,19 @@
     //
     // Serial LCDs can be implemented in ExtUI
     //
-    //#define LCD_UART_TX    PD8
-    //#define LCD_UART_RX    PD9
+    //#define LCD_UART_TX                   PD8
+    //#define LCD_UART_RX                   PD9
   #endif
 
   #if HAS_GRAPHICAL_LCD
     #ifndef ST7920_DELAY_1
-      #define ST7920_DELAY_1 DELAY_NS(96)
+      #define ST7920_DELAY_1        DELAY_NS(96)
     #endif
     #ifndef ST7920_DELAY_2
-      #define ST7920_DELAY_2 DELAY_NS(48)
+      #define ST7920_DELAY_2        DELAY_NS(48)
     #endif
     #ifndef ST7920_DELAY_3
-      #define ST7920_DELAY_3 DELAY_NS(715)
+      #define ST7920_DELAY_3       DELAY_NS(715)
     #endif
   #endif
 
@@ -183,10 +183,10 @@
   // This is pin 32 on J2 FFC40 and pin, goes to the beeper
   // on Geeetech's version of RepRapDiscount Smart Controller
   // (e.g. on Rostock 301)
-  #define BEEPER_PIN       PE12
+  #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
-  #define BEEPER_PIN       PB10
+  #define BEEPER_PIN                        PB10
 #endif
 
 /**
@@ -204,29 +204,29 @@
   //
   // SD Card on RepRapDiscount Smart Controller (J2) or on SD_CARD connector
   //
-  #define SS_PIN           PB12   // PC11
-  #define SCK_PIN          PB13   // PC12 // PC1
-  #define MOSI_PIN         PB15   // PD2  // PD2
-  #define MISO_PIN         PB14   // PC8
-  #define SD_DETECT_PIN    PC7
+  #define SS_PIN                            PB12  // PC11
+  #define SCK_PIN                           PB13  // PC12 // PC1
+  #define MOSI_PIN                          PB15  // PD2  // PD2
+  #define MISO_PIN                          PB14  // PC8
+  #define SD_DETECT_PIN                     PC7
 
 #else
   //
   // Use the on-board card socket labeled TF_CARD_SOCKET
   //
-  #define SS_PIN           PA4
-  #define SCK_PIN          PA5
-  #define MOSI_PIN         PA7
-  #define MISO_PIN         PA6 // PA6
-  #define SD_DETECT_PIN    -1  // Card detect is not connected
+  #define SS_PIN                            PA4
+  #define SCK_PIN                           PA5
+  #define MOSI_PIN                          PA7
+  #define MISO_PIN                          PA6   // PA6
+  #define SD_DETECT_PIN                     -1    // Card detect is not connected
 #endif
 
-#define SDSS               SS_PIN
+#define SDSS                              SS_PIN
 
 //
 // ESP WiFi can be soldered to J9 connector which is wired to USART2.
 // Must define WIFISUPPORT in Configuration.h for the printer.
 //
-#define ESP_WIFI_MODULE_COM       2
-#define ESP_WIFI_MODULE_BAUDRATE  115200
-#define ESP_WIFI_MODULE_RESET_PIN -1
+#define ESP_WIFI_MODULE_COM 2
+#define ESP_WIFI_MODULE_BAUDRATE 115200
+#define ESP_WIFI_MODULE_RESET_PIN           -1
diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
similarity index 51%
rename from Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
rename to Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index 3849af3ae3a7..6395f6efc934 100644
--- a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -42,10 +42,10 @@
 // #define MCU_STM32F103ZE // not yet required
 // Enable EEPROM Emulation for this board, so that we don't overwrite factory data
 
-//#define I2C_EEPROM   // AT24C64
-//#define E2END 0x7FFF // 64KB
+//#define I2C_EEPROM                              // AT24C64
+//#define E2END 0x7FFF                            // 64KB
 //#define FLASH_EEPROM_EMULATION
-//#define E2END 0xFFF // 4KB
+//#define E2END 0xFFF                             // 4KB
 //#define E2END uint32(EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE * 2) - 1)
 //#define EEPROM_CHITCHAT
 //#define DEBUG_EEPROM_READWRITE
@@ -53,78 +53,78 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC6
-#define Y_STOP_PIN         PG8
-#define Z_STOP_PIN         PG7
-//#define X_MAX_PIN          PC5
-//#define Y_MAX_PIN          PC4
-//#define Z_MAX_PIN          PB0
+#define X_STOP_PIN                          PC6
+#define Y_STOP_PIN                          PG8
+#define Z_STOP_PIN                          PG7
+//#define X_MAX_PIN                         PC5
+//#define Y_MAX_PIN                         PC4
+//#define Z_MAX_PIN                         PB0
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PD6
-#define X_DIR_PIN          PD3
-#define X_ENABLE_PIN       PG9
+#define X_STEP_PIN                          PD6
+#define X_DIR_PIN                           PD3
+#define X_ENABLE_PIN                        PG9
 
-#define Y_STEP_PIN         PG12
-#define Y_DIR_PIN          PG11
-#define Y_ENABLE_PIN       PG13
+#define Y_STEP_PIN                          PG12
+#define Y_DIR_PIN                           PG11
+#define Y_ENABLE_PIN                        PG13
 
-#define Z_STEP_PIN         PG15
-#define Z_DIR_PIN          PG14
-#define Z_ENABLE_PIN       PB8
+#define Z_STEP_PIN                          PG15
+#define Z_DIR_PIN                           PG14
+#define Z_ENABLE_PIN                        PB8
 
-#define E0_STEP_PIN        PE2
-#define E0_DIR_PIN         PB9
-#define E0_ENABLE_PIN      PE3
+#define E0_STEP_PIN                         PE2
+#define E0_DIR_PIN                          PB9
+#define E0_ENABLE_PIN                       PE3
 
-#define E1_STEP_PIN        PE5
-#define E1_DIR_PIN         PE4
-#define E1_ENABLE_PIN      PE6
+#define E1_STEP_PIN                         PE5
+#define E1_DIR_PIN                          PE4
+#define E1_ENABLE_PIN                       PE6
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC2
-#define TEMP_BED_PIN       PC1
+#define TEMP_0_PIN                          PC2
+#define TEMP_BED_PIN                        PC1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA2
-#define HEATER_BED_PIN     PA3
+#define HEATER_0_PIN                        PA2
+#define HEATER_BED_PIN                      PA3
 
-#define FAN_PIN            PA1
+#define FAN_PIN                             PA1
 
-#define FIL_RUNOUT_PIN     PC7
+#define FIL_RUNOUT_PIN                      PC7
 
 //
 // LCD
 //
-#define LCD_BACKLIGHT_PIN  PF11
-#define FSMC_CS_PIN        PD7
-#define FSMC_RS_PIN        PG0
+#define LCD_BACKLIGHT_PIN                   PF11
+#define FSMC_CS_PIN                         PD7
+#define FSMC_RS_PIN                         PG0
 
-#define LCD_USE_DMA_FSMC          // Use DMA transfers to send data to the TFT
-#define FSMC_DMA_DEV       DMA2
-#define FSMC_DMA_CHANNEL   DMA_CH5
+#define LCD_USE_DMA_FSMC                          // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV                        DMA2
+#define FSMC_DMA_CHANNEL                 DMA_CH5
 
 //
 // SD Card
 //
-#define SD_DETECT_PIN      PF10
+#define SD_DETECT_PIN                       PF10
 
 //
 // Misc.
 //
-#define BEEPER_PIN         PC3    // use PB7 to shut up if desired
-#define LED_PIN            PC13
+#define BEEPER_PIN                          PC3   // use PB7 to shut up if desired
+#define LED_PIN                             PC13
 
 //
 // Touch support
 //
 #if ENABLED(TOUCH_BUTTONS)
-  #define TOUCH_CS_PIN     PA4
-  #define TOUCH_INT_PIN    PC4
+  #define TOUCH_CS_PIN                      PA4
+  #define TOUCH_INT_PIN                     PC4
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
new file mode 100644
index 000000000000..83881c128de7
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -0,0 +1,170 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Longer3D LK1/LK2 & Alfawise U20/U30 (STM32F103VET6) board pin assignments
+ */
+
+#if !defined(__STM32F1__) && !defined(STM32F1xx)
+  #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 1 || E_STEPPERS > 1
+  #error "Longer3D board only supports 1 hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "Longer3D"
+#define ALFAWISE_UX0                              // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
+
+//#define DISABLE_DEBUG                           //  We still want to debug with STLINK...
+#define DISABLE_JTAG                              //  We free the jtag pins (PA15) but keep STLINK
+                                                  //  Release PB4 (STEP_X_PIN) from JTAG NRST role.
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PC1   // pin 16
+#define X_MAX_PIN                           PC0   // pin 15 (Filament sensor on Alfawise setup)
+#define Y_MIN_PIN                           PC15  // pin 9
+#define Y_MAX_PIN                           PC14  // pin 8 (Unused in stock Alfawise setup)
+#define Z_MIN_PIN                           PE6   // pin 5 Standard Endstop or Z_Probe endstop function
+#define Z_MAX_PIN                           PE5   // pin 4 (Unused in stock Alfawise setup)
+                                 // May be used for BLTouch Servo function on older variants (<= V08)
+#define ONBOARD_ENDSTOPPULLUPS
+
+//
+// Filament Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PC0   // XMAX plug on PCB used as filament runout sensor on Alfawise boards (inverting true)
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PB5   // pin 91
+#define X_STEP_PIN                          PB4   // pin 90
+#define X_DIR_PIN                           PB3   // pin 89
+
+#define Y_ENABLE_PIN                        PB8   // pin 95
+#define Y_STEP_PIN                          PB7   // pin 93
+#define Y_DIR_PIN                           PB6   // pin 92
+
+#define Z_ENABLE_PIN                        PE1   // pin 98
+#define Z_STEP_PIN                          PE0   // pin 97
+#define Z_DIR_PIN                           PB9   // pin 96
+
+#define E0_ENABLE_PIN                       PE4   // pin 3
+#define E0_STEP_PIN                         PE3   // pin 2
+#define E0_DIR_PIN                          PE2   // pin 1
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PA0   // pin 23 (Nozzle 100K/3950 thermistor)
+#define TEMP_BED_PIN                        PA1   // pin 24 (Hot Bed 100K/3950 thermistor)
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PD3   // pin 84 (Nozzle Heat Mosfet)
+#define HEATER_BED_PIN                      PA8   // pin 67 (Hot Bed Mosfet)
+
+#define FAN_PIN                             PA15  // pin 77 (4cm Fan)
+#define FAN_SOFT_PWM                              // Required to avoid issues with heating or STLink
+#define FAN_MIN_PWM 35                            // Fan will not start in 1-30 range
+#define FAN_MAX_PWM 255
+
+//#define BEEPER_PIN                        PD13  // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor
+                                 // Can drive a PC Buzzer, if connected between PWM and 5V pins
+
+#define LED_PIN                             PC2   // pin 17
+
+//
+// PWM for a servo probe
+// Other servo devices are not supported on this board!
+//
+#if HAS_Z_SERVO_PROBE
+  #define SERVO0_PIN                        PD13  // Open drain PWM pin on the V0G (GND or floating 5V)
+  #define SERVO0_PWM_OD                           // Comment this if using PE5
+
+  //#define SERVO0_PIN                      PE5   // Pulled up PWM pin on the V08 (3.3V or 0)
+  //#undef Z_MAX_PIN                              // Uncomment if using ZMAX connector (PE5)
+#endif
+
+/**
+ * Note: Alfawise screens use various TFT controllers. Supported screens
+ * are based on the ILI9341, ILI9328 and ST7798V. Define init sequences for
+ * other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
+ *
+ * If the screen stays white, disable 'LCD_RESET_PIN' to let the bootloader
+ * init the screen.
+ *
+ * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
+ * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
+ */
+
+#define LCD_RESET_PIN                       PC4   // pin 33
+#define LCD_BACKLIGHT_PIN                   PD12  // pin 59
+#define FSMC_CS_PIN                         PD7   // pin 88 = FSMC_NE1
+#define FSMC_RS_PIN                         PD11  // pin 58 A16 Register. Only one address needed
+
+#define LCD_USE_DMA_FSMC                          // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV                        DMA2
+#define FSMC_DMA_CHANNEL                 DMA_CH5
+
+#define DOGLCD_MOSI                         -1    // Prevent auto-define by Conditionals_post.h
+#define DOGLCD_SCK                          -1
+
+/**
+ * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
+ * mixed up MOSI and MISO pins. SPI is managed in SW, and needs pins
+ * declared below.
+ */
+#if ENABLED(TOUCH_BUTTONS)
+  #define TOUCH_CS_PIN                      PB12  // pin 51 SPI2_NSS
+  #define TOUCH_SCK_PIN                     PB13  // pin 52
+  #define TOUCH_MOSI_PIN                    PB14  // pin 53
+  #define TOUCH_MISO_PIN                    PB15  // pin 54
+  #define TOUCH_INT_PIN                     PC6   // pin 63 (PenIRQ coming from ADS7843)
+#endif
+
+//
+// Persistent Storage
+// If no option is selected below the SD Card will be used
+//
+//#define SPI_EEPROM
+#define FLASH_EEPROM_EMULATION
+
+#undef E2END
+#if ENABLED(SPI_EEPROM)
+  // SPI1 EEPROM Winbond W25Q64 (8MB/64Mbits)
+  #define SPI_CHAN_EEPROM1 1
+  #define SPI_EEPROM1_CS                    PC5   // pin 34
+  #define EEPROM_SCK          BOARD_SPI1_SCK_PIN  // PA5 pin 30
+  #define EEPROM_MISO        BOARD_SPI1_MISO_PIN  // PA6 pin 31
+  #define EEPROM_MOSI        BOARD_SPI1_MOSI_PIN  // PA7 pin 32
+  #define EEPROM_PAGE_SIZE 0x1000U                // 4KB (from datasheet)
+  #define E2END ((16 * EEPROM_PAGE_SIZE)-1) // Limit to 64KB for now...
+#elif ENABLED(FLASH_EEPROM_EMULATION)
+  // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
+  #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
+  #define EEPROM_PAGE_SIZE     (0x800U)     // 2KB, but will use 2x more (4KB)
+  #define E2END (EEPROM_PAGE_SIZE - 1)
+#else
+  #define E2END (0x7FFU) // On SD, Limit to 2KB, require this amount of RAM
+#endif
diff --git a/Marlin/src/pins/stm32/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
similarity index 56%
rename from Marlin/src/pins/stm32/pins_MALYAN_M200.h
rename to Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
index 624c59ebea78..9829018d8df4 100644
--- a/Marlin/src/pins/stm32/pins_MALYAN_M200.h
+++ b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
@@ -36,7 +36,7 @@
 // but it is literally the only board which uses it.
 #define FLASH_EEPROM_EMULATION
 
-#define SDSS SS_PIN
+#define SDSS                              SS_PIN
 
 // Based on PWM timer usage, we have to use these timers and soft PWM for the fans
 // On STM32F103:
@@ -50,43 +50,43 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB4
-#define Y_MIN_PIN          PA15
-#define Z_MIN_PIN          PB5
+#define X_MIN_PIN                           PB4
+#define Y_MIN_PIN                           PA15
+#define Z_MIN_PIN                           PB5
 
 //
 // Steppers
 //
 // X & Y enable are the same
-#define X_STEP_PIN         PB14
-#define X_DIR_PIN          PB15
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PB14
+#define X_DIR_PIN                           PB15
+#define X_ENABLE_PIN                        PA8
 
-#define Y_STEP_PIN         PB12
-#define Y_DIR_PIN          PB13
-#define Y_ENABLE_PIN       PA8
+#define Y_STEP_PIN                          PB12
+#define Y_DIR_PIN                           PB13
+#define Y_ENABLE_PIN                        PA8
 
-#define Z_STEP_PIN         PB10
-#define Z_DIR_PIN          PB2
-#define Z_ENABLE_PIN       PB11
+#define Z_STEP_PIN                          PB10
+#define Z_DIR_PIN                           PB2
+#define Z_ENABLE_PIN                        PB11
 
-#define E0_STEP_PIN        PB0
-#define E0_DIR_PIN         PC13
-#define E0_ENABLE_PIN      PB1
+#define E0_STEP_PIN                         PB0
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PB1
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA0   // Analog Input (HOTEND0 thermistor)
-#define TEMP_BED_PIN       PA1   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                          PA0   // Analog Input (HOTEND0 thermistor)
+#define TEMP_BED_PIN                        PA1   // Analog Input (BED thermistor)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB6   // HOTEND0 MOSFET
-#define HEATER_BED_PIN     PB7   // BED MOSFET
+#define HEATER_0_PIN                        PB6   // HOTEND0 MOSFET
+#define HEATER_BED_PIN                      PB7   // BED MOSFET
 
-#define MALYAN_FAN1_PIN    PB8   // FAN1 header on board - PRINT FAN
-#define MALYAN_FAN2_PIN    PB3   // FAN2 header on board - CONTROLLER FAN
+#define MALYAN_FAN1_PIN                     PB8   // FAN1 header on board - PRINT FAN
+#define MALYAN_FAN2_PIN                     PB3   // FAN2 header on board - CONTROLLER FAN
 
-#define FAN1_PIN           MALYAN_FAN2_PIN
+#define FAN1_PIN                 MALYAN_FAN2_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
new file mode 100644
index 000000000000..a8c6d30eb450
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -0,0 +1,194 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin (STM32F130ZET6) board pin assignments
+ *
+ * https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin/Hardware
+ */
+
+#ifndef __STM32F1__
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS Robin"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_JTAG
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PC3   // XS1 - 5
+#define SERVO1_PIN                          PA1   // XS1 - 6
+#define SERVO2_PIN                          PF9   // XS2 - 5
+#define SERVO3_PIN                          PF8   // XS2 - 6
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PB12
+#define X_MAX_PIN                           PB0
+#define Y_MIN_PIN                           PC5
+#define Y_MAX_PIN                           PC4
+#define Z_MIN_PIN                           PA4
+#define Z_MAX_PIN                           PF7
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PB9
+#define X_STEP_PIN                          PB8
+#define X_DIR_PIN                           PB5
+
+#define Y_ENABLE_PIN                        PB4
+#define Y_STEP_PIN                          PG15
+#define Y_DIR_PIN                           PG10
+
+#define Z_ENABLE_PIN                        PD7
+#define Z_STEP_PIN                          PD3
+#define Z_DIR_PIN                           PG14
+
+#define E0_ENABLE_PIN                       PG13
+#define E0_STEP_PIN                         PG8
+#define E0_DIR_PIN                          PA15
+
+#define E1_ENABLE_PIN                       PA12
+#define E1_STEP_PIN                         PA11
+#define E1_DIR_PIN                          PA8
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_BED_PIN                        PC0   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC7   // HEATER1
+#define HEATER_1_PIN                        PA6   // HEATER2
+#define HEATER_BED_PIN                      PC6   // HOT BED
+
+#define FAN_PIN                             PA7   // FAN
+
+/**
+ * Note: MKS Robin board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
+ */
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
+
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PA3   // PW_OFF
+#define FIL_RUNOUT_PIN                      PF11  // MT_DET
+
+#define BEEPER_PIN                          PC13
+#define LED_PIN                             PB2
+
+/**
+ * Note: MKS Robin TFT screens use various TFT controllers
+ * Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
+ * ILI9488 is not supported
+ * Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
+ *
+ * If the screen stays white, disable 'LCD_RESET_PIN'
+ * to let the bootloader init the screen.
+ *
+ * Setting an 'LCD_RESET_PIN' may cause a flicker when entering the LCD menu
+ * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
+ */
+//#define LCD_RESET_PIN                     PF6
+#define LCD_BACKLIGHT_PIN                   PG11
+#define FSMC_CS_PIN                         PG12  // NE4
+#define FSMC_RS_PIN                         PF0   // A0
+
+#define LCD_USE_DMA_FSMC                          // Use DMA transfers to send data to the TFT
+#define FSMC_DMA_DEV                        DMA2
+#define FSMC_DMA_CHANNEL                 DMA_CH5
+
+#if ENABLED(TOUCH_BUTTONS)
+  #define TOUCH_CS_PIN                      PB1   // SPI2_NSS
+  #define TOUCH_SCK_PIN                     PB13  // SPI2_SCK
+  #define TOUCH_MISO_PIN                    PB14  // SPI2_MISO
+  #define TOUCH_MOSI_PIN                    PB15  // SPI2_MOSI
+#endif
+
+// SPI1(PA7) & SPI3(PB5) not available
+#define ENABLE_SPI2
+
+#if ENABLED(SDIO_SUPPORT)
+  #define SCK_PIN                           PB13  // SPI2
+  #define MISO_PIN                          PB14  // SPI2
+  #define MOSI_PIN                          PB15  // SPI2
+  #define SS_PIN                            -1    // PB12 is X-
+  #define SD_DETECT_PIN                     PF12  // SD_CD
+#else
+  // SD as custom software SPI (SDIO pins)
+  #define SCK_PIN                           PC12
+  #define MISO_PIN                          PC8
+  #define MOSI_PIN                          PD2
+  #define SS_PIN                            -1
+  #define ONBOARD_SD_CS_PIN                 PC11
+  #define SDSS                              PD2
+  #define SD_DETECT_PIN                     -1
+#endif
+
+#if HAS_TMC_UART
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   */
+  //#define X_HARDWARE_SERIAL  Serial1
+  //#define X2_HARDWARE_SERIAL Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y2_HARDWARE_SERIAL Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z2_HARDWARE_SERIAL Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial1
+  //#define E2_HARDWARE_SERIAL Serial1
+  //#define E3_HARDWARE_SERIAL Serial1
+  //#define E4_HARDWARE_SERIAL Serial1
+
+  // Unused servo pins may be repurposed with SoftwareSerialM
+  //#define X_SERIAL_TX_PIN                 PF8   // SERVO3_PIN
+  //#define Y_SERIAL_TX_PIN                 PF9   // SERVO2_PIN
+  //#define Z_SERIAL_TX_PIN                 PA1   // SERVO1_PIN
+  //#define E0_SERIAL_TX_PIN                PC3   // SERVO0_PIN
+  //#define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
+  //#define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
+  //#define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
+  //#define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
+
+  // Reduce baud rate for software serial reliability
+  #if HAS_TMC_SW_SERIAL
+    #define TMC_BAUD_RATE 19200
+  #endif
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
new file mode 100644
index 000000000000..4c10a310bf7d
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -0,0 +1,137 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef __STM32F1__
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 1 || E_STEPPERS > 1
+  #error "MKS Robin Lite supports only 1 hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "MKS Robin Lite"
+#endif
+#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
+
+//#define DISABLE_DEBUG
+#define DISABLE_JTAG
+#define ENABLE_SPI2
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PC13
+#define Y_STOP_PIN                          PC0
+#define Z_MIN_PIN                           PC12
+#define Z_MAX_PIN                           PB9
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PC6
+#define X_DIR_PIN                           PB12
+#define X_ENABLE_PIN                        PB10
+
+#define Y_STEP_PIN                          PB11
+#define Y_DIR_PIN                           PB2
+#define Y_ENABLE_PIN                        PB10
+
+#define Z_STEP_PIN                          PB1
+#define Z_DIR_PIN                           PC5
+#define Z_ENABLE_PIN                        PB10
+
+#define E0_STEP_PIN                         PC4
+#define E0_DIR_PIN                          PA5
+#define E0_ENABLE_PIN                       PA4
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC9
+#define FAN_PIN                             PA8
+#define HEATER_BED_PIN                      PC8
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PA1
+#define TEMP_0_PIN                          PA0
+
+#define FIL_RUNOUT_PIN                      PB8   // MT_DET
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+  #define BEEPER_PIN                        PD2
+  #define BTN_ENC                           PB3
+  #define LCD_PINS_RS                       PC3
+
+  #define BTN_EN1                           PB5
+  #define BTN_EN2                           PB4
+
+  #define LCD_PINS_ENABLE                   PC2
+
+  #if ENABLED(MKS_MINI_12864)
+
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   -1
+    #define DOGLCD_A0                       PC1
+    #define DOGLCD_CS                       PC2
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
+
+  #else                                           // !MKS_MINI_12864
+
+    #define LCD_PINS_D4                     PC1
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5                   -1
+      #define LCD_PINS_D6                   -1
+      #define LCD_PINS_D7                   -1
+    #endif
+
+  #endif // !MKS_MINI_12864
+
+#endif // HAS_SPI_LCD
+
+// Motor current PWM pins
+#define MOTOR_CURRENT_PWM_XY_PIN            PB0
+#define MOTOR_CURRENT_PWM_Z_PIN             PA7
+#define MOTOR_CURRENT_PWM_E_PIN             PA6
+#define MOTOR_CURRENT_PWM_RANGE (65535/10/3.3) // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
+#define DEFAULT_PWM_MOTOR_CURRENT { 1000, 1000, 1000 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
+
+//
+// SD Card
+//
+#define ENABLE_SPI2
+#define SD_DETECT_PIN                       PC10
+#define SCK_PIN                             PB13
+#define MISO_PIN                            P1B4
+#define MOSI_PIN                            P1B5
+#define SS_PIN                              PA15
+
+#if HAS_GRAPHICAL_LCD
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
new file mode 100644
index 000000000000..466bdecc8141
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -0,0 +1,153 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin Lite 3 (STM32F103RCT6) board pin assignments
+ */
+
+#ifndef __STM32F1__
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS Robin Lite3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "MKS Robin Lite3"
+#endif
+#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
+
+//#define DISABLE_DEBUG
+#define DISABLE_JTAG
+#define ENABLE_SPI2
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA3
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA12
+#define Y_STOP_PIN                          PA11
+#define Z_MIN_PIN                           PC6
+#define Z_MAX_PIN                           PB1
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PC0
+#define X_DIR_PIN                           PB2
+#define X_ENABLE_PIN                        PC13
+
+#define Y_STEP_PIN                          PC2
+#define Y_DIR_PIN                           PB9
+#define Y_ENABLE_PIN                        PB12
+
+#define Z_STEP_PIN                          PB7
+#define Z_DIR_PIN                           PB6
+#define Z_ENABLE_PIN                        PB8
+
+#define E0_STEP_PIN                         PB4
+#define E0_DIR_PIN                          PB3
+#define E0_ENABLE_PIN                       PB5
+
+#define E1_STEP_PIN                         PC12
+#define E1_DIR_PIN                          PC11
+#define E1_ENABLE_PIN                       PD2
+
+//
+// Heaters 0,1 / Fans / Bed
+//
+#define HEATER_0_PIN                        PC9
+#define HEATER_1_PIN                        PC7
+#define FAN_PIN                             PA8
+#define HEATER_BED_PIN                      PC8
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PA1   //TB
+#define TEMP_0_PIN                          PA0   //TH1
+#define TEMP_1_PIN                          PA2   //TH2
+
+#define FIL_RUNOUT_PIN                      PB10  // MT_DET
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+  #define BEEPER_PIN                        PC1
+  #define BTN_ENC                           PC3
+  #define LCD_PINS_ENABLE                   PA4
+  #define LCD_PINS_RS                       PA5
+  #define BTN_EN1                           PB11
+  #define BTN_EN2                           PB0
+
+  // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
+  #if ENABLED(MKS_MINI_12864)
+
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   -1
+    #define DOGLCD_A0                       PC4
+    #define DOGLCD_CS                       PA7
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
+
+    // Required for MKS_MINI_12864 with this board
+    #define MKS_LCD12864B
+    #undef SHOW_BOOTSCREEN
+
+  #else                                           // !MKS_MINI_12864
+
+    #define LCD_PINS_D4                     PA6
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5                   PA7
+      #define LCD_PINS_D6                   PC4
+      #define LCD_PINS_D7                   PC5
+    #endif
+
+  #endif // !MKS_MINI_12864
+
+#endif // HAS_SPI_LCD
+
+//
+// SD Card
+//
+#define ENABLE_SPI2
+#define SD_DETECT_PIN                       PC10
+#define SCK_PIN                             PB13
+#define MISO_PIN                            PB14
+#define MOSI_PIN                            PB15
+#define SS_PIN                              PA15
+
+#ifndef ST7920_DELAY_1
+  #define ST7920_DELAY_1           DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_2
+  #define ST7920_DELAY_2           DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_3
+  #define ST7920_DELAY_3           DELAY_NS(125)
+#endif
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
similarity index 50%
rename from Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
rename to Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index 16e74b169e97..50babad2746e 100644
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -52,67 +52,67 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PA15
-#define Y_STOP_PIN         PA12
-#define Z_MIN_PIN          PA11
-#define Z_MAX_PIN          PC4
+#define X_STOP_PIN                          PA15
+#define Y_STOP_PIN                          PA12
+#define Z_MIN_PIN                           PA11
+#define Z_MAX_PIN                           PC4
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA4  // MT_DET
+  #define FIL_RUNOUT_PIN                    PA4   // MT_DET
 #endif
 
 //
 // Steppers
 //
-#define X_ENABLE_PIN       PE4
-#define X_STEP_PIN         PE3
-#define X_DIR_PIN          PE2
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
 
-#define Y_ENABLE_PIN       PE1
-#define Y_STEP_PIN         PE0
-#define Y_DIR_PIN          PB9
+#define Y_ENABLE_PIN                        PE1
+#define Y_STEP_PIN                          PE0
+#define Y_DIR_PIN                           PB9
 
-#define Z_ENABLE_PIN       PB8
-#define Z_STEP_PIN         PB5
-#define Z_DIR_PIN          PB4
+#define Z_ENABLE_PIN                        PB8
+#define Z_STEP_PIN                          PB5
+#define Z_DIR_PIN                           PB4
 
-#define E0_ENABLE_PIN      PB3
-#define E0_STEP_PIN        PD6
-#define E0_DIR_PIN         PD3
+#define E0_ENABLE_PIN                       PB3
+#define E0_STEP_PIN                         PD6
+#define E0_DIR_PIN                          PD3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // TH1
-#define TEMP_BED_PIN       PC0   // TB1
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_BED_PIN                        PC0   // TB1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PC3   // HEATER1
-#define HEATER_BED_PIN     PA0   // HOT BED
+#define HEATER_0_PIN                        PC3   // HEATER1
+#define HEATER_BED_PIN                      PA0   // HOT BED
 
-#define FAN_PIN            PB1   // FAN
+#define FAN_PIN                             PB1   // FAN
 
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN     PE5  // TC1 - CS1
-//#define MAX6675_SS_PIN     PE6  // TC2 - CS2
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
 
 //
 // Misc. Functions
 //
-#define POWER_LOSS_PIN     PA2   // PW_DET
-#define PS_ON_PIN          PA3   // PW_OFF
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PA3   // PW_OFF
 
-//#define LED_PIN            PB2
+//#define LED_PIN                           PB2
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         PC5
-#define SD_DETECT_PIN      PD12
+#define BEEPER_PIN                          PC5
+#define SD_DETECT_PIN                       PD12
 
 /**
  * Note: MKS Robin TFT screens use various TFT controllers.
@@ -120,27 +120,27 @@
  * to let the bootloader init the screen.
  */
 #if ENABLED(FSMC_GRAPHICAL_TFT)
-  #define FSMC_CS_PIN      PD7    // NE4
-  #define FSMC_RS_PIN      PD11   // A0
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
 
-  #define LCD_RESET_PIN    PC6
-  #define NO_LCD_REINIT           // Suppress LCD re-initialization
+  #define LCD_RESET_PIN                     PC6
+  #define NO_LCD_REINIT                           // Suppress LCD re-initialization
 
-  #define LCD_BACKLIGHT_PIN PD13
+  #define LCD_BACKLIGHT_PIN                 PD13
 
   #if ENABLED(TOUCH_BUTTONS)
-    #define TOUCH_CS_PIN   PC2
-    #define TOUCH_SCK_PIN  PB13
-    #define TOUCH_MOSI_PIN PB15
-    #define TOUCH_MISO_PIN PB14
+    #define TOUCH_CS_PIN                    PC2
+    #define TOUCH_SCK_PIN                   PB13
+    #define TOUCH_MOSI_PIN                  PB15
+    #define TOUCH_MISO_PIN                  PB14
   #endif
 #endif
 
 // Motor current PWM pins
-#define MOTOR_CURRENT_PWM_XY_PIN   PA6
-#define MOTOR_CURRENT_PWM_Z_PIN    PA7
-#define MOTOR_CURRENT_PWM_E_PIN    PB0
-#define MOTOR_CURRENT_PWM_RANGE    1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
+#define MOTOR_CURRENT_PWM_XY_PIN            PA6
+#define MOTOR_CURRENT_PWM_Z_PIN             PA7
+#define MOTOR_CURRENT_PWM_E_PIN             PB0
+#define MOTOR_CURRENT_PWM_RANGE 1500              // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1030, 1030, 1030 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.
 
 // This is a kind of workaround in case native marlin "digipot" interface won't work.
@@ -149,6 +149,6 @@
 //  #define MKS_ROBIN_MINI_VREF_PWM
 //#endif
 
-//#define VREF_XY_PIN        PA6
-//#define VREF_Z_PIN         PA7
-//#define VREF_E1_PIN        PB0
+//#define VREF_XY_PIN                       PA6
+//#define VREF_Z_PIN                        PA7
+//#define VREF_E1_PIN                       PB0
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
new file mode 100644
index 000000000000..ae9118e6d0e2
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -0,0 +1,137 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin nano (STM32F130VET6) board pin assignments
+ */
+
+#ifndef __STM32F1__
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS Robin nano"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA15
+#define Y_STOP_PIN                          PA12
+#define Z_MIN_PIN                           PA11
+#define Z_MAX_PIN                           PC4
+
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PA4   // MT_DET
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
+
+#define Y_ENABLE_PIN                        PE1
+#define Y_STEP_PIN                          PE0
+#define Y_DIR_PIN                           PB9
+
+#define Z_ENABLE_PIN                        PB8
+#define Z_STEP_PIN                          PB5
+#define Z_DIR_PIN                           PB4
+
+#define E0_ENABLE_PIN                       PB3
+#define E0_STEP_PIN                         PD6
+#define E0_DIR_PIN                          PD3
+
+#define E1_ENABLE_PIN                       PA3
+#define E1_STEP_PIN                         PA6
+#define E1_DIR_PIN                          PA1
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_BED_PIN                        PC0   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC3   // HEATER1
+#define HEATER_1_PIN                        PB0   // HEATER2
+#define HEATER_BED_PIN                      PA0   // HOT BED
+
+#define FAN_PIN                             PB1   // FAN
+
+//
+// Thermocouples
+//
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
+
+//
+// Misc. Functions
+//
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PA3   // PW_OFF
+
+#define LED_PIN                             PB2
+
+//
+// SD Card
+//
+#define SDIO_SUPPORT
+#define SD_DETECT_PIN                       PD12
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN                          PC5
+
+/**
+ * Note: MKS Robin TFT screens use various TFT controllers.
+ * If the screen stays white, disable 'LCD_RESET_PIN'
+ * to let the bootloader init the screen.
+ */
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
+
+  #define LCD_RESET_PIN                     PC6   // FSMC_RST
+  #define NO_LCD_REINIT                           // Suppress LCD re-initialization
+
+  #define LCD_BACKLIGHT_PIN                 PD13
+
+  #if ENABLED(TOUCH_BUTTONS)
+    #define TOUCH_CS_PIN                    PA7   // SPI2_NSS
+    #define TOUCH_SCK_PIN                   PB13  // SPI2_SCK
+    #define TOUCH_MISO_PIN                  PB14  // SPI2_MISO
+    #define TOUCH_MOSI_PIN                  PB15  // SPI2_MOSI
+  #endif
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
new file mode 100644
index 000000000000..b42856721d0f
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -0,0 +1,274 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin pro (STM32F103ZET6) board pin assignments
+ */
+
+#ifndef __STM32F1__
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+  #error "MKS Robin pro supports up to 3 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "MKS Robin pro"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
+//
+// Note: MKS Robin board is using SPI2 interface.
+//
+//#define SPI_MODULE 2
+#define ENABLE_SPI2
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA8   // BLTOUCH
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PA15
+#define X_MAX_PIN                           PG7
+#define Y_MIN_PIN                           PA12
+#define Y_MAX_PIN                           PG8
+#define Z_MIN_PIN                           PA11
+#define Z_MAX_PIN                           PC4
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PF8
+#endif
+
+#define Y_ENABLE_PIN                        PE1
+#define Y_STEP_PIN                          PE0
+#define Y_DIR_PIN                           PB9
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PF3
+#endif
+
+#define Z_ENABLE_PIN                        PB8
+#define Z_STEP_PIN                          PB5
+#define Z_DIR_PIN                           PB4
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PF6
+#endif
+
+#define E0_ENABLE_PIN                       PB3
+#define E0_STEP_PIN                         PD6
+#define E0_DIR_PIN                          PD3
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PG15
+#endif
+
+#define E1_ENABLE_PIN                       PA3
+#define E1_STEP_PIN                         PA6
+#define E1_DIR_PIN                          PA1
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PG10
+#endif
+
+#define E2_ENABLE_PIN                       PF0
+#define E2_STEP_PIN                         PF2
+#define E2_DIR_PIN                          PF1
+#ifndef E2_CS_PIN
+  #define E2_CS_PIN                         PG9
+#endif
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PB15
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO                     PB14
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PB13
+  #endif
+#endif
+
+#if HAS_TMC_UART
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   */
+  //#define X_HARDWARE_SERIAL  Serial
+  //#define X2_HARDWARE_SERIAL Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y2_HARDWARE_SERIAL Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z2_HARDWARE_SERIAL Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial1
+  //#define E2_HARDWARE_SERIAL Serial1
+  //#define E3_HARDWARE_SERIAL Serial1
+  //#define E4_HARDWARE_SERIAL Serial1
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                   PF7
+  #define X_SERIAL_RX_PIN                   PF8
+
+  #define Y_SERIAL_TX_PIN                   PF4
+  #define Y_SERIAL_RX_PIN                   PF3
+
+  #define Z_SERIAL_TX_PIN                   PF5
+  #define Z_SERIAL_RX_PIN                   PF6
+
+  #define E0_SERIAL_TX_PIN                  PG13
+  #define E0_SERIAL_RX_PIN                  PG15
+
+  #define E1_SERIAL_TX_PIN                  PG12
+  #define E1_SERIAL_RX_PIN                  PG10
+
+  #define E2_SERIAL_TX_PIN                  PC13
+  #define E2_SERIAL_RX_PIN                  PG9
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_2_PIN                          PC3   // TH3
+#define TEMP_BED_PIN                        PC0   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PF10  // +HE0-
+#define HEATER_1_PIN                        PB0   // +HE1-
+#define HEATER_2_PIN                        PF9   // +HE2-
+#define HEATER_BED_PIN                      PA0   // +HOT-BED-
+#define FAN_PIN                             PB1   // +FAN-
+
+/**
+ * Note: MKS Robin Pro board is using SPI2 interface. Make sure your stm32duino library is configured accordingly
+ */
+//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
+//#define MAX6675_SS_PIN                    PF11  // TC2 - CS2
+
+#define POWER_LOSS_PIN                      PA2   // PW_DET
+#define PS_ON_PIN                           PG11  // PW_OFF
+#define FIL_RUNOUT_PIN                      PA4   // MT_DET1
+//#define FIL_RUNOUT_PIN                    PE6   // MT_DET2
+//#define FIL_RUNOUT_PIN                    PG14  // MT_DET3
+
+//
+// SD Card
+//
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(LCD)
+  #define ENABLE_SPI2
+  #define SD_DETECT_PIN                     PG3
+  #define SCK_PIN                           PB13
+  #define MISO_PIN                          PB14
+  #define MOSI_PIN                          PB15
+  #define SS_PIN                            PG6
+#elif SD_CONNECTION_IS(ONBOARD)
+  #define SDIO_SUPPORT
+  #define SD_DETECT_PIN                     PD12
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "No custom SD drive cable defined for this board."
+#endif
+
+/**
+ * Note: MKS Robin TFT screens use various TFT controllers.
+ * If the screen stays white, disable 'LCD_RESET_PIN'
+ * to let the bootloader init the screen.
+ */
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
+
+  #define LCD_RESET_PIN                     PF6
+  #define NO_LCD_REINIT                           // Suppress LCD re-initialization
+
+  #define LCD_BACKLIGHT_PIN                 PD13
+
+  #if ENABLED(TOUCH_BUTTONS)
+    #define TOUCH_CS_PIN                    PA7
+  #else
+    #define BEEPER_PIN                      PC5
+    #define BTN_ENC                         PG2
+    #define BTN_EN1                         PG5
+    #define BTN_EN2                         PG4
+  #endif
+
+#elif HAS_SPI_LCD
+
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PG2
+  #define LCD_PINS_ENABLE                   PG0
+  #define LCD_PINS_RS                       PG1
+  #define BTN_EN1                           PG5
+  #define BTN_EN2                           PG4
+
+  // MKS MINI12864 and MKS LCD12864B. If using MKS LCD12864A (Need to remove RPK2 resistor)
+  #if ENABLED(MKS_MINI_12864)
+
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   -1
+    #define DOGLCD_A0                       PF12
+    #define DOGLCD_CS                       PF15
+    #define DOGLCD_SCK                      PB13
+    #define DOGLCD_MOSI                     PB15
+
+  #else                                           // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
+
+    #define LCD_PINS_D4                     PF14
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5                   PF15
+      #define LCD_PINS_D6                   PF12
+      #define LCD_PINS_D7                   PF13
+    #endif
+
+  #endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
+#endif
+
+#ifndef ST7920_DELAY_1
+  #define ST7920_DELAY_1           DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_2
+  #define ST7920_DELAY_2           DELAY_NS(125)
+#endif
+#ifndef ST7920_DELAY_3
+  #define ST7920_DELAY_3           DELAY_NS(125)
+#endif
diff --git a/Marlin/src/pins/stm32/pins_MORPHEUS.h b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_MORPHEUS.h
rename to Marlin/src/pins/stm32f1/pins_MORPHEUS.h
index 8c583434e486..7311d91a80ff 100644
--- a/Marlin/src/pins/stm32/pins_MORPHEUS.h
+++ b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
@@ -39,53 +39,53 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          PB14
-#define Y_MIN_PIN          PB13
-#define Z_MIN_PIN          PB12
+#define X_MIN_PIN                           PB14
+#define Y_MIN_PIN                           PB13
+#define Z_MIN_PIN                           PB12
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PB9
+  #define Z_MIN_PROBE_PIN                   PB9
 #endif
 
 //
 // Steppers
 //
 // X & Y enable are the same
-#define X_STEP_PIN         PB7
-#define X_DIR_PIN          PB6
-#define X_ENABLE_PIN       PB8
+#define X_STEP_PIN                          PB7
+#define X_DIR_PIN                           PB6
+#define X_ENABLE_PIN                        PB8
 
-#define Y_STEP_PIN         PB5
-#define Y_DIR_PIN          PB4
-#define Y_ENABLE_PIN       PB8
+#define Y_STEP_PIN                          PB5
+#define Y_DIR_PIN                           PB4
+#define Y_ENABLE_PIN                        PB8
 
-#define Z_STEP_PIN         PA15
-#define Z_DIR_PIN          PA10
-#define Z_ENABLE_PIN       PB3
+#define Z_STEP_PIN                          PA15
+#define Z_DIR_PIN                           PA10
+#define Z_ENABLE_PIN                        PB3
 
-#define E0_STEP_PIN        PA8
-#define E0_DIR_PIN         PB15
-#define E0_ENABLE_PIN      PA9
+#define E0_STEP_PIN                         PA8
+#define E0_DIR_PIN                          PB15
+#define E0_ENABLE_PIN                       PA9
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PB1   // Analog Input (HOTEND thermistor)
-#define TEMP_BED_PIN       PB0   // Analog Input (BED thermistor)
+#define TEMP_0_PIN                          PB1   // Analog Input (HOTEND thermistor)
+#define TEMP_BED_PIN                        PB0   // Analog Input (BED thermistor)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PA2   // HOTEND MOSFET
-#define HEATER_BED_PIN     PA0   // BED MOSFET
+#define HEATER_0_PIN                        PA2   // HOTEND MOSFET
+#define HEATER_BED_PIN                      PA0   // BED MOSFET
 
-#define FAN_PIN            PA1   // FAN1 header on board - PRINT FAN
+#define FAN_PIN                             PA1   // FAN1 header on board - PRINT FAN
 
 //
 // Misc.
 //
-#define LED_PIN            PC13
-#define SDSS               PA3
+#define LED_PIN                             PC13
+#define SDSS                                PA3
diff --git a/Marlin/src/pins/stm32f1/pins_STM32F1R.h b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
new file mode 100644
index 000000000000..d144c0e69244
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
@@ -0,0 +1,261 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef __STM32F1__
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 21017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME      "Misc. STM32F1R"
+#define DEFAULT_MACHINE_NAME "STM32F103RET6"
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PB3
+#define Y_STOP_PIN                          PB4
+#define Z_STOP_PIN                          PB5
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PC0
+#define X_DIR_PIN                           PC1
+#define X_ENABLE_PIN                        PA8
+
+#define Y_STEP_PIN                          PC2
+#define Y_DIR_PIN                           PC3
+#define Y_ENABLE_PIN                        PA8
+
+#define Z_STEP_PIN                          PC4
+#define Z_DIR_PIN                           PC5
+#define Z_ENABLE_PIN                        PA8
+
+#define E0_STEP_PIN                         PC6
+#define E0_DIR_PIN                          PC7
+#define E0_ENABLE_PIN                       PA8
+
+/**
+ * TODO: Currently using same Enable pin to all steppers.
+ */
+
+#define E1_STEP_PIN                         PC8
+#define E1_DIR_PIN                          PC9
+#define E1_ENABLE_PIN                       PA8
+
+#define E2_STEP_PIN                         PC10
+#define E2_DIR_PIN                          PC11
+#define E2_ENABLE_PIN                       PA8
+
+//
+// Misc. Functions
+//
+#define SDSS                                PA4
+#define LED_PIN                             PD2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PB0   // EXTRUDER 1
+#define HEATER_1_PIN                        PB1
+
+#define HEATER_BED_PIN                      PA3   // BED
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PA0   // Analog Input
+#define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_1_PIN                          PA2   // Analog Input
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+    #define LCD_PINS_RS 49                        // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE 51                    // SID (MOSI)
+    #define LCD_PINS_D4 52                        // SCK (CLK) clock
+  #elif BOTH(NEWPANEL, PANEL_ONE)
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+  #else
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+    #if DISABLED(NEWPANEL)
+      #define BEEPER_PIN 33
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK 38
+      //#define SHIFT_LD 42
+      //#define SHIFT_OUT 40
+      //#define SHIFT_EN 17
+    #endif
+  #endif
+
+  #if ENABLED(NEWPANEL)
+
+    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+      #define BEEPER_PIN 37
+
+      #define BTN_EN1 31
+      #define BTN_EN2 33
+      #define BTN_ENC 35
+
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        #define LCD_BACKLIGHT_PIN 39
+      #endif
+
+    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+      #define BTN_EN1 64
+      #define BTN_EN2 59
+      #define BTN_ENC 63
+      #define SD_DETECT_PIN 42
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      #define BTN_EN1 47
+      #define BTN_EN2 43
+      #define BTN_ENC 32
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN 41
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      #define BTN_EN1 22                          // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2 7                           // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+      #define BTN_ENC                       -1
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN 49
+
+    #elif ANY(VIKI2, miniVIKI)
+
+      #define BEEPER_PIN 33
+
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 45
+      #define LCD_SCREEN_ROT_180
+
+      #define BTN_EN1 22
+      #define BTN_EN2 7
+      #define BTN_ENC 39
+
+      #define SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
+
+      #define KILL_PIN 31
+
+      #define STAT_LED_RED_PIN 32
+      #define STAT_LED_BLUE_PIN 35
+
+    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+      #define BTN_EN1 35
+      #define BTN_EN2 37
+      #define BTN_ENC 31
+      #define SD_DETECT_PIN 49
+      #define LCD_SDSS 53
+      #define KILL_PIN 41
+      #define BEEPER_PIN 23
+      #define DOGLCD_CS 29
+      #define DOGLCD_A0 27
+      #define LCD_BACKLIGHT_PIN 33
+
+    #elif ENABLED(MINIPANEL)
+
+      #define BEEPER_PIN 42
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
+
+      #define KILL_PIN 64
+      // GLCD features
+      // Uncomment screen orientation
+      //#define LCD_SCREEN_ROT_90
+      //#define LCD_SCREEN_ROT_180
+      //#define LCD_SCREEN_ROT_270
+      // The encoder and click button
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
+      // not connected to a pin
+      #define SD_DETECT_PIN 49
+
+    #else
+
+      // Beeper on AUX-4
+      #define BEEPER_PIN 33
+
+      // Buttons directly attached to AUX-2
+      #if ENABLED(REPRAPWORLD_KEYPAD)
+        #define BTN_EN1 64
+        #define BTN_EN2 59
+        #define BTN_ENC 63
+        #define SHIFT_OUT 40
+        #define SHIFT_CLK 44
+        #define SHIFT_LD 42
+      #elif ENABLED(PANEL_ONE)
+        #define BTN_EN1 59                        // AUX2 PIN 3
+        #define BTN_EN2 63                        // AUX2 PIN 4
+        #define BTN_ENC 49                        // AUX3 PIN 7
+      #else
+        #define BTN_EN1 37
+        #define BTN_EN2 35
+        #define BTN_ENC 31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        #define SD_DETECT_PIN 49
+        #define KILL_PIN 41
+      #else
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
+      #endif
+
+    #endif
+  #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
new file mode 100644
index 000000000000..58b13b90dfe9
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
@@ -0,0 +1,285 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if !defined(__STM32F1__) && !defined(__STM32F4__)
+  #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 21017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME      "STM3R Mini"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+// Enable I2C_EEPROM for testing
+#define I2C_EEPROM
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PD0
+#define Y_STOP_PIN                          PD1
+#define Z_STOP_PIN                          PD4
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PE1
+#define X_DIR_PIN                           PE0
+#define X_ENABLE_PIN                        PC0
+
+#define Y_STEP_PIN                          PE3
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PC1
+
+#define Z_STEP_PIN                          PE5
+#define Z_DIR_PIN                           PE4
+#define Z_ENABLE_PIN                        PC2
+
+#define E0_STEP_PIN                         PE7
+#define E0_DIR_PIN                          PE6
+#define E0_ENABLE_PIN                       PC3
+
+#define E1_STEP_PIN                         PE9
+#define E1_DIR_PIN                          PE8
+#define E1_ENABLE_PIN                       PC4
+
+#define E2_STEP_PIN                         PE11
+#define E2_DIR_PIN                          PE10
+#define E2_ENABLE_PIN                       PC5
+
+//
+// Misc. Functions
+//
+#define SDSS                                PA15
+#define LED_PIN                             PB2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PD12  // EXTRUDER 1
+//#define HEATER_1_PIN                      PD13
+
+#define HEATER_BED_PIN                      PB9   // BED
+//#define HEATER_BED2_PIN                   -1    // BED2
+//#define HEATER_BED3_PIN                   -1    // BED3
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PD14
+#endif
+#define FAN1_PIN                            PD13
+
+#define FAN_SOFT_PWM
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PA0
+#define TEMP_0_PIN                          PA1
+#define TEMP_1_PIN                          PA2
+#define TEMP_2_PIN                          PA3
+
+// Laser control
+#if HAS_CUTTER
+  #define SPINDLE_LASER_PWM_PIN             PB8
+  #define SPINDLE_LASER_ENA_PIN             PD5
+#endif
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+    #define LCD_PINS_RS 49                        // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE 51                    // SID (MOSI)
+    #define LCD_PINS_D4 52                        // SCK (CLK) clock
+  #elif BOTH(NEWPANEL, PANEL_ONE)
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+  #else
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+    #if DISABLED(NEWPANEL)
+      #define BEEPER_PIN 33
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK 38
+      //#define SHIFT_LD 42
+      //#define SHIFT_OUT 40
+      //#define SHIFT_EN 17
+    #endif
+  #endif
+
+  #if ENABLED(TOUCH_BUTTONS)
+
+    #define TOUCH_CS_PIN                    PB12  // SPI2_NSS
+    #define TOUCH_SCK_PIN                   PB13
+    #define TOUCH_MOSI_PIN                  PB14
+    #define TOUCH_MISO_PIN                  PB15
+    #define TOUCH_INT_PIN                   PC6   // (PenIRQ coming from ADS7843)
+
+  #elif ENABLED(NEWPANEL)
+
+    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+      #define BEEPER_PIN 37
+
+      #define BTN_EN1 31
+      #define BTN_EN2 33
+      #define BTN_ENC 35
+
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        #define LCD_BACKLIGHT_PIN 39
+      #endif
+
+    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+      #define BTN_EN1 64
+      #define BTN_EN2 59
+      #define BTN_ENC 63
+      #define SD_DETECT_PIN 42
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      #define BTN_EN1 47
+      #define BTN_EN2 43
+      #define BTN_ENC 32
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN 41
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      #define BTN_EN1 22                          // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2 7                           // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+      #define BTN_ENC                       -1
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN 49
+
+    #elif ANY(VIKI2, miniVIKI)
+
+      #define BEEPER_PIN 33
+
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 45
+      #define LCD_SCREEN_ROT_180
+
+      #define BTN_EN1 22
+      #define BTN_EN2 7
+      #define BTN_ENC 39
+
+      #define SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
+
+      #define KILL_PIN 31
+
+      #define STAT_LED_RED_PIN 32
+      #define STAT_LED_BLUE_PIN 35
+
+    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+
+      #define BTN_EN1 35
+      #define BTN_EN2 37
+      #define BTN_ENC 31
+      #define SD_DETECT_PIN 49
+      #define LCD_SDSS 53
+      #define KILL_PIN 41
+      #define BEEPER_PIN 23
+      #define DOGLCD_CS 29
+      #define DOGLCD_A0 27
+      #define LCD_BACKLIGHT_PIN 33
+
+    #elif ENABLED(MINIPANEL)
+
+      #define BEEPER_PIN 42
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
+
+      #define KILL_PIN 64
+      // GLCD features
+      // Uncomment screen orientation
+      //#define LCD_SCREEN_ROT_90
+      //#define LCD_SCREEN_ROT_180
+      //#define LCD_SCREEN_ROT_270
+      // The encoder and click button
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
+      // not connected to a pin
+      #define SD_DETECT_PIN 49
+
+    #else
+
+      // Beeper on AUX-4
+      #define BEEPER_PIN 33
+
+      // Buttons directly attached to AUX-2
+      #if ENABLED(REPRAPWORLD_KEYPAD)
+        #define BTN_EN1 64
+        #define BTN_EN2 59
+        #define BTN_ENC 63
+        #define SHIFT_OUT 40
+        #define SHIFT_CLK 44
+        #define SHIFT_LD 42
+      #elif ENABLED(PANEL_ONE)
+        #define BTN_EN1 59                        // AUX2 PIN 3
+        #define BTN_EN2 63                        // AUX2 PIN 4
+        #define BTN_ENC 49                        // AUX3 PIN 7
+      #else
+        #define BTN_EN1 37
+        #define BTN_EN2 35
+        #define BTN_ENC 31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        #define SD_DETECT_PIN 49
+        #define KILL_PIN 41
+      #else
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
+      #endif
+
+    #endif
+  #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
new file mode 100644
index 000000000000..ddbe09c355fd
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -0,0 +1,231 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+//  https://github.com/ktand/Armed
+
+#pragma once
+
+#ifndef STM32F4
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "Arm'ed supports up to 2 hotends / E-steppers."
+#endif
+
+#ifndef ARMED_V1_0
+  #define ARMED_V1_1
+#endif
+
+#undef BOARD_INFO_NAME                            // Defined on the command line by Arduino Core STM32
+#define BOARD_INFO_NAME      "Arm'ed"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#define I2C_EEPROM
+
+#undef E2END                                      // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
+#define E2END 0xFFF                               // 4KB
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PE0
+#define Y_STOP_PIN                          PE1
+#define Z_STOP_PIN                          PE14
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+//#ifndef Z_MIN_PROBE_PIN
+//  #define Z_MIN_PROBE_PIN  PA4
+//#endif
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PA3
+#endif
+
+//
+// Steppers
+//
+
+#ifdef ARMED_SWAP_X_E1
+  #define X_STEP_PIN                        PE4
+  #define X_DIR_PIN                         PE2
+  #define X_ENABLE_PIN                      PE3
+  #define X_CS_PIN                          PE5
+#else
+  #define X_STEP_PIN                        PD3
+  #define X_DIR_PIN                         PD2
+  #define X_ENABLE_PIN                      PD0
+  #define X_CS_PIN                          PD1
+#endif
+
+#define Y_STEP_PIN                          PE11
+#define Y_DIR_PIN                           PE10
+#define Y_ENABLE_PIN                        PE13
+#define Y_CS_PIN                            PE12
+
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD7
+#define Z_ENABLE_PIN                        PD4
+#define Z_CS_PIN                            PD5
+
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB6
+#ifdef ARMED_V1_1
+  #define E0_ENABLE_PIN                     PC12
+#else
+  #define E0_ENABLE_PIN                     PB3
+#endif
+#define E0_CS_PIN                           PB4
+
+#ifdef ARMED_SWAP_X_E1
+  #define E1_STEP_PIN                       PD3
+  #define E1_DIR_PIN                        PD2
+  #define E1_ENABLE_PIN                     PD0
+  #define E1_CS_PIN                         PD1
+#else
+  #define E1_STEP_PIN                       PE4
+  #define E1_DIR_PIN                        PE2
+  #define E1_ENABLE_PIN                     PE3
+  #define E1_CS_PIN                         PE5
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_BED_PIN                        PC2   // Analog Input
+
+#if HOTENDS == 1 && TEMP_SENSOR_PROBE
+  #define TEMP_PROBE_PIN                    PC1
+#endif
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PA1   // Hardware PWM
+#define HEATER_1_PIN                        PA2   // Hardware PWM
+#define HEATER_BED_PIN                      PA0   // Hardware PWM
+
+#define FAN_PIN                             PC6   // Hardware PWM, Part cooling fan
+#define FAN1_PIN                            PC7   // Hardware PWM, Extruder fan
+#define FAN2_PIN                            PC8   // Hardware PWM, Controller fan
+
+//
+// Misc functions
+//
+#define SDSS                                PE7
+#define LED_PIN                             PB7   // Heart beat
+#define PS_ON_PIN                           PA10
+#define KILL_PIN                            PA8
+#define PWR_LOSS                            PA4   // Power loss / nAC_FAULT
+
+//
+// LCD / Controller
+//
+#define SD_DETECT_PIN                       PA15
+#define BEEPER_PIN                          PC9
+
+#if ENABLED(FYSETC_MINI_12864)
+  //
+  // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+  //
+  #define DOGLCD_A0                         PE9
+  #define DOGLCD_CS                         PE8
+
+  #define LCD_BACKLIGHT_PIN                 -1
+
+  #define LCD_RESET_PIN                     PB12  // Must be high or open for LCD to operate normally.
+
+  #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+    #ifndef RGB_LED_R_PIN
+      #define RGB_LED_R_PIN                 PB13
+    #endif
+    #ifndef RGB_LED_G_PIN
+      #define RGB_LED_G_PIN                 PB14
+    #endif
+    #ifndef RGB_LED_B_PIN
+      #define RGB_LED_B_PIN                 PB15
+    #endif
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
+    #define NEOPIXEL_PIN                    PB13
+  #endif
+#else
+  #define LCD_PINS_RS                       PE9
+  #define LCD_PINS_ENABLE                   PE8
+  #define LCD_PINS_D4                       PB12
+  #define LCD_PINS_D5                       PB13
+  #define LCD_PINS_D6                       PB14
+  #define LCD_PINS_D7                       PB15
+
+  #if ENABLED(MKS_MINI_12864)
+    #define DOGLCD_CS                       PB13
+    #define DOGLCD_A0                       PB14
+  #endif
+#endif
+
+#define BTN_EN1                             PC4
+#define BTN_EN2                             PC5
+#define BTN_ENC                             PC3
+
+//
+// Extension pins
+//
+#define EXT0_PIN                            PB0
+#define EXT1_PIN                            PB1
+#define EXT2_PIN                            PB2
+#define EXT3_PIN                            PD8
+#define EXT4_PIN                            PD9
+#define EXT5_PIN                            PD10
+#define EXT6_PIN                            PD11
+#define EXT7_PIN                            PD12
+#define EXT8_PIN                            PB10
+#define EXT9_PIN                            PB11
+
+#if HAS_TMC_UART
+  // TMC2208/TMC2209 stepper drivers
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN               EXT0_PIN
+  #define X_SERIAL_RX_PIN               EXT0_PIN
+
+  #define Y_SERIAL_TX_PIN               EXT1_PIN
+  #define Y_SERIAL_RX_PIN               EXT1_PIN
+
+  #define Z_SERIAL_TX_PIN               EXT2_PIN
+  #define Z_SERIAL_RX_PIN               EXT2_PIN
+
+  #define E0_SERIAL_TX_PIN              EXT3_PIN
+  #define E0_SERIAL_RX_PIN              EXT3_PIN
+
+  #define E1_SERIAL_RX_PIN              EXT4_PIN
+  #define E1_SERIAL_TX_PIN              EXT4_PIN
+
+  #define Z2_SERIAL_RX_PIN              EXT4_PIN
+  #define Z2_SERIAL_TX_PIN              EXT4_PIN
+
+  #define TMC_BAUD_RATE 19200
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_BEAST.h b/Marlin/src/pins/stm32f4/pins_BEAST.h
new file mode 100644
index 000000000000..5be4368789f0
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BEAST.h
@@ -0,0 +1,285 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if !defined(__STM32F1__) && !defined(__STM32F4__)
+  #error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
+#endif
+
+/**
+ * 21017 Victor Perez Marlin for stm32f1 test
+ */
+
+#define BOARD_INFO_NAME      "Beast STM32"
+#define DEFAULT_MACHINE_NAME "STM32F103RET6"
+
+// Enable I2C_EEPROM for testing
+#define I2C_EEPROM
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PE0
+#define X_DIR_PIN                           PE1
+#define X_ENABLE_PIN                        PC0
+#define X_MIN_PIN                           PD5
+#define X_MAX_PIN                           -1
+
+#define Y_STEP_PIN                          PE2
+#define Y_DIR_PIN                           PE3
+#define Y_ENABLE_PIN                        PC1
+#define Y_MIN_PIN                           PD6
+#define Y_MAX_PIN
+
+#define Z_STEP_PIN                          PE4
+#define Z_DIR_PIN                           PE5
+#define Z_ENABLE_PIN                        PC2
+#define Z_MIN_PIN                           PD7
+#define Z_MAX_PIN                           -1
+
+#define Y2_STEP_PIN                         -1
+#define Y2_DIR_PIN                          -1
+#define Y2_ENABLE_PIN                       -1
+
+#define Z2_STEP_PIN                         -1
+#define Z2_DIR_PIN                          -1
+#define Z2_ENABLE_PIN                       -1
+
+#define E0_STEP_PIN                         PE6
+#define E0_DIR_PIN                          PE7
+#define E0_ENABLE_PIN                       PC3
+
+/**
+ * TODO: Currently using same Enable pin to all steppers.
+ */
+
+#define E1_STEP_PIN                         PE8
+#define E1_DIR_PIN                          PE9
+#define E1_ENABLE_PIN                       PC4
+
+#define E2_STEP_PIN                         PE10
+#define E2_DIR_PIN                          PE11
+#define E2_ENABLE_PIN                       PC5
+
+//
+// Misc. Functions
+//
+#define SDSS                                PA15
+#define LED_PIN                             PB2
+
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            -1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PD12  // EXTRUDER 1
+#define HEATER_1_PIN                        PD13
+#define HEATER_2_PIN                        PD14
+
+#define HEATER_BED_PIN                      PB9   // BED
+#define HEATER_BED2_PIN                     -1    // BED2
+#define HEATER_BED3_PIN                     -1    // BED3
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PB10
+#endif
+
+#define FAN_SOFT_PWM
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PA0   // Analog Input
+#define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_1_PIN                          PA2   // Analog Input
+#define TEMP_2_PIN                          PA3   // Analog Input
+
+//
+// LCD Pins
+//
+#if HAS_SPI_LCD
+
+  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+    #define LCD_PINS_RS 49                        // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE 51                    // SID (MOSI)
+    #define LCD_PINS_D4 52                        // SCK (CLK) clock
+  #elif BOTH(NEWPANEL, PANEL_ONE)
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+  #else
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE                 PD2
+    #define LCD_PINS_D4                     PB12
+    #define LCD_PINS_D5                     PB13
+    #define LCD_PINS_D6                     PB14
+    #define LCD_PINS_D7                     PB15
+    #if DISABLED(NEWPANEL)
+      #define BEEPER_PIN 33
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK 38
+      //#define SHIFT_LD 42
+      //#define SHIFT_OUT 40
+      //#define SHIFT_EN 17
+    #endif
+  #endif
+
+  #if ENABLED(NEWPANEL)
+
+    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+
+      #define BEEPER_PIN 37
+
+      #define BTN_EN1 31
+      #define BTN_EN2 33
+      #define BTN_ENC 35
+
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        #define LCD_BACKLIGHT_PIN 39
+      #endif
+
+    #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+      #define BTN_EN1 64
+      #define BTN_EN2 59
+      #define BTN_ENC 63
+      #define SD_DETECT_PIN 42
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      #define BTN_EN1 47
+      #define BTN_EN2 43
+      #define BTN_ENC 32
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN                 -1
+      #define KILL_PIN 41
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      #define BTN_EN1 22                          // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2 7                           // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+      #define BTN_ENC                       -1
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN 49
+
+    #elif ANY(VIKI2, miniVIKI)
+
+      #define BEEPER_PIN 33
+
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 45
+      #define LCD_SCREEN_ROT_180
+
+      #define BTN_EN1 22
+      #define BTN_EN2 7
+      #define BTN_ENC 39
+
+      #define SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
+
+      #define KILL_PIN 31
+
+      #define STAT_LED_RED_PIN 32
+      #define STAT_LED_BLUE_PIN 35
+
+    #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+
+      #define BTN_EN1 35
+      #define BTN_EN2 37
+      #define BTN_ENC 31
+      #define SD_DETECT_PIN 49
+      #define LCD_SDSS 53
+      #define KILL_PIN 41
+      #define BEEPER_PIN 23
+      #define DOGLCD_CS 29
+      #define DOGLCD_A0 27
+      #define LCD_BACKLIGHT_PIN 33
+
+    #elif ENABLED(MINIPANEL)
+
+      #define BEEPER_PIN 42
+      // Pins for DOGM SPI LCD Support
+      #define DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
+
+      #define KILL_PIN 64
+      // GLCD features
+      // Uncomment screen orientation
+      //#define LCD_SCREEN_ROT_90
+      //#define LCD_SCREEN_ROT_180
+      //#define LCD_SCREEN_ROT_270
+      // The encoder and click button
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
+      // not connected to a pin
+      #define SD_DETECT_PIN 49
+
+    #else
+
+      // Beeper on AUX-4
+      #define BEEPER_PIN 33
+
+      // Buttons directly attached to AUX-2
+      #if ENABLED(REPRAPWORLD_KEYPAD)
+        #define BTN_EN1 64
+        #define BTN_EN2 59
+        #define BTN_ENC 63
+        #define SHIFT_OUT 40
+        #define SHIFT_CLK 44
+        #define SHIFT_LD 42
+      #elif ENABLED(PANEL_ONE)
+        #define BTN_EN1 59                        // AUX2 PIN 3
+        #define BTN_EN2 63                        // AUX2 PIN 4
+        #define BTN_ENC 49                        // AUX3 PIN 7
+      #else
+        #define BTN_EN1 37
+        #define BTN_EN2 35
+        #define BTN_ENC 31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        #define SD_DETECT_PIN 49
+        #define KILL_PIN 41
+      #else
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
+      #endif
+
+    #endif
+  #endif // NEWPANEL
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
new file mode 100644
index 000000000000..170b90368bdd
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@@ -0,0 +1,155 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * STM32F407VET6 with RAMPS-like shield
+ * 'Black' STM32F407VET6 board - http://wiki.stm32duino.com/index.php?title=STM32F407
+ * Shield - https://github.com/jmz52/Hardware
+ */
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "Black STM32F4VET6"
+#endif
+
+#define DEFAULT_MACHINE_NAME "STM32F407VET6"
+
+//#define I2C_EEPROM
+//#define E2END 0x1FFF                            // 8KB
+#define SRAM_EEPROM_EMULATION
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PC6
+#define SERVO1_PIN                          PC7
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PC13
+#define X_MAX_PIN                           PA15
+#define Y_MIN_PIN                           PA5
+#define Y_MAX_PIN                           PD12
+#define Z_MIN_PIN                           PD14
+#define Z_MAX_PIN                           PD15
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PC4
+#define X_DIR_PIN                           PA4
+#define X_ENABLE_PIN                        PE7
+
+#define Y_STEP_PIN                          PE5
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PE6
+
+#define Z_STEP_PIN                          PD5
+#define Z_DIR_PIN                           PD3
+#define Z_ENABLE_PIN                        PD6
+
+#define E0_STEP_PIN                         PD7
+#define E0_DIR_PIN                          PD0
+#define E0_ENABLE_PIN                       PB9
+
+#define E1_STEP_PIN                         PE0
+#define E1_DIR_PIN                          PE1
+#define E1_ENABLE_PIN                       PB8
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC0   // T0
+#define TEMP_1_PIN                          PC1   // T1
+#define TEMP_BED_PIN                        PC2   // TB
+
+#ifndef TEMP_CHAMBER_PIN
+  #define TEMP_CHAMBER_PIN                  PC3   // TC
+#endif
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PA2   // Heater0
+#define HEATER_1_PIN                        PA3   // Heater1
+#define HEATER_BED_PIN                      PA1   // Hotbed
+
+#define FAN_PIN                             PE9   // Fan0
+#define FAN1_PIN                            PE11  // Fan1
+#define FAN2_PIN                            PE13  // Fan2
+#define FAN3_PIN                            PE14  // Fan3
+
+//
+// Misc. Functions
+//
+#define LED_PIN                             PA6
+//#define LED_PIN                           PA7
+#define KILL_PIN                            PB1
+
+//
+// LCD / Controller
+//
+//#define SD_DETECT_PIN                     PC5
+//#define SD_DETECT_PIN                     PA8   // SDIO SD_DETECT_PIN, external SDIO card reader only
+
+#define BEEPER_PIN                          PD10
+#define LCD_PINS_RS                         PE15
+#define LCD_PINS_ENABLE                     PD8
+#define LCD_PINS_D4                         PE10
+#define LCD_PINS_D5                         PE12
+#define LCD_PINS_D6                         PD1
+#define LCD_PINS_D7                         PE8
+#define BTN_ENC                             PD9
+#define BTN_EN1                             PD4
+#define BTN_EN2                             PD13
+
+#define DOGLCD_CS                    LCD_PINS_D5
+#define DOGLCD_A0                    LCD_PINS_D6
+
+//
+// Onboard SD support
+//
+#define SDIO_D0_PIN                         PC8
+#define SDIO_D1_PIN                         PC9
+#define SDIO_D2_PIN                         PC10
+#define SDIO_D3_PIN                         PC11
+#define SDIO_CK_PIN                         PC12
+#define SDIO_CMD_PIN                        PD2
+
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
+
+  #ifndef SDIO_SUPPORT
+    #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
+    #define SDSS                     SDIO_D3_PIN
+    #define SCK_PIN                  SDIO_CK_PIN
+    #define MISO_PIN                 SDIO_D0_PIN
+    #define MOSI_PIN                SDIO_CMD_PIN
+  #endif
+#endif
diff --git a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
rename to Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
index bfae524743a8..ee5c4da1fe57 100644
--- a/Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -30,8 +30,8 @@
 #define BOARD_INFO_NAME "BIGTREE Btt002 1.0"
 
 // Use one of these or SDCard-based Emulation will be used
-//#define SRAM_EEPROM_EMULATION   // Use BackSRAM-based EEPROM emulation
-#define FLASH_EEPROM_EMULATION  // Use Flash-based EEPROM emulation
+//#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
+#define FLASH_EEPROM_EMULATION                    // Use Flash-based EEPROM emulation
 
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
@@ -39,60 +39,60 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PD3
-#define Y_STOP_PIN         PD2
-#define Z_STOP_PIN         PD1   // Shares J4 connector with PC3
+#define X_STOP_PIN                          PD3
+#define Y_STOP_PIN                          PD2
+#define Z_STOP_PIN                          PD1   // Shares J4 connector with PC3
 
 //
 // Z Probe must be this pin
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  PD1
+  #define Z_MIN_PROBE_PIN                   PD1
 #endif
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA15
+  #define FIL_RUNOUT_PIN                    PA15
 #endif
 
 //
 // Power Loss Detection
 //
 #ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN   PD4
+  #define POWER_LOSS_PIN                    PD4
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PA9
-#define X_DIR_PIN          PA10
-#define X_ENABLE_PIN       PA8
+#define X_STEP_PIN                          PA9
+#define X_DIR_PIN                           PA10
+#define X_ENABLE_PIN                        PA8
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PE2
+  #define X_CS_PIN                          PE2
 #endif
 
-#define Y_STEP_PIN         PC8
-#define Y_DIR_PIN          PC9
-#define Y_ENABLE_PIN       PC7
+#define Y_STEP_PIN                          PC8
+#define Y_DIR_PIN                           PC9
+#define Y_ENABLE_PIN                        PC7
  #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PE3
+  #define Y_CS_PIN                          PE3
 #endif
 
-#define Z_STEP_PIN         PD15
-#define Z_DIR_PIN          PC6
-#define Z_ENABLE_PIN       PD14
+#define Z_STEP_PIN                          PD15
+#define Z_DIR_PIN                           PC6
+#define Z_ENABLE_PIN                        PD14
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PE4
+  #define Z_CS_PIN                          PE4
 #endif
 
-#define E0_STEP_PIN        PD12
-#define E0_DIR_PIN         PD13
-#define E0_ENABLE_PIN      PD11
+#define E0_STEP_PIN                         PD12
+#define E0_DIR_PIN                          PD13
+#define E0_ENABLE_PIN                       PD11
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PD7
+  #define E0_CS_PIN                         PD7
 #endif
 
 //
@@ -100,17 +100,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PB15
+    #define TMC_SW_MOSI                     PB15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB14
+    #define TMC_SW_MISO                     PB14
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB13
+    #define TMC_SW_SCK                      PB13
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -132,17 +132,17 @@
   //
   // Software serial  ##
   //
-  #define X_SERIAL_TX_PIN  PE2
-  #define X_SERIAL_RX_PIN  PE2
+  #define X_SERIAL_TX_PIN                   PE2
+  #define X_SERIAL_RX_PIN                   PE2
 
-  #define Y_SERIAL_TX_PIN  PE3
-  #define Y_SERIAL_RX_PIN  PE3
+  #define Y_SERIAL_TX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN                   PE3
 
-  #define Z_SERIAL_TX_PIN  PE4
-  #define Z_SERIAL_RX_PIN  PE4
+  #define Z_SERIAL_TX_PIN                   PE4
+  #define Z_SERIAL_RX_PIN                   PE4
 
-  #define E0_SERIAL_TX_PIN PD7
-  #define E0_SERIAL_RX_PIN PD7
+  #define E0_SERIAL_TX_PIN                  PD7
+  #define E0_SERIAL_RX_PIN                  PD7
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -151,32 +151,32 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PA2   // T0 <-> E0
-#define TEMP_1_PIN         PA0   // T1 <-> E1
-#define TEMP_BED_PIN       PA1   // T2 <-> Bed
-#define TEMP_PROBE_PIN     PC3   // Shares J4 connector with PD1
+#define TEMP_0_PIN                          PA2   // T0 <-> E0
+#define TEMP_1_PIN                          PA0   // T1 <-> E1
+#define TEMP_BED_PIN                        PA1   // T2 <-> Bed
+#define TEMP_PROBE_PIN                      PC3   // Shares J4 connector with PD1
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PE6   // Heater0
-#define HEATER_BED_PIN     PE5   // Hotbed
-#define FAN_PIN            PB8   // Fan1
-#define FAN1_PIN           PB9   // Fan0
+#define HEATER_0_PIN                        PE6   // Heater0
+#define HEATER_BED_PIN                      PE5   // Hotbed
+#define FAN_PIN                             PB8   // Fan1
+#define FAN1_PIN                            PB9   // Fan0
 
 // HAL SPI1 pins
 #define CUSTOM_SPI_PINS
 #if ENABLED(CUSTOM_SPI_PINS)
-  #define SCK_PIN          PA5   // SPI1 SCLK
-  #define SS_PIN           PA4   // SPI1 SSEL
-  #define MISO_PIN         PA6   // SPI1 MISO
-  #define MOSI_PIN         PA7   // SPI1 MOSI
+  #define SCK_PIN                           PA5   // SPI1 SCLK
+  #define SS_PIN                            PA4   // SPI1 SSEL
+  #define MISO_PIN                          PA6   // SPI1 MISO
+  #define MOSI_PIN                          PA7   // SPI1 MOSI
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
+#define SDSS                                PA4
 
 /**
  * -------------------------------------BTT002 V1.0-----------------------------------------------
@@ -194,35 +194,35 @@
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PE7
-  #define BTN_ENC          PB1
+  #define BEEPER_PIN                        PE7
+  #define BTN_ENC                           PB1
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PE12
+    #define LCD_PINS_RS                     PE12
 
-    #define BTN_EN1        PE9
-    #define BTN_EN2        PE10
+    #define BTN_EN1                         PE9
+    #define BTN_EN2                         PE10
 
-    #define LCD_PINS_ENABLE PE13
-    #define LCD_PINS_D4    PE11
+    #define LCD_PINS_ENABLE                 PE13
+    #define LCD_PINS_D4                     PE11
 
   #else
 
-    #define LCD_PINS_RS    PE8
+    #define LCD_PINS_RS                     PE8
 
-    #define BTN_EN1        PC5
-    #define BTN_EN2        PB0
-    #define SD_DETECT_PIN  PC4
+    #define BTN_EN1                         PC5
+    #define BTN_EN2                         PB0
+    #define SD_DETECT_PIN                   PC4
 
-    #define LCD_SDSS       PA4
+    #define LCD_SDSS                        PA4
 
-    #define LCD_PINS_ENABLE PE9
-    #define LCD_PINS_D4    PE10
+    #define LCD_PINS_ENABLE                 PE9
+    #define LCD_PINS_D4                     PE10
 
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PE11
-      #define LCD_PINS_D6  PE12
-      #define LCD_PINS_D7  PE13
+      #define LCD_PINS_D5                   PE11
+      #define LCD_PINS_D6                   PE12
+      #define LCD_PINS_D7                   PE13
     #endif
 
   #endif
@@ -240,14 +240,14 @@
 // RGB LEDs
 //
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN    PB5
+  #define RGB_LED_R_PIN                     PB5
 #endif
 #ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN    PB4
+  #define RGB_LED_G_PIN                     PB4
 #endif
 #ifndef RGB_LED_B_PIN
-  #define RGB_LED_B_PIN    PB3
+  #define RGB_LED_B_PIN                     PB3
 #endif
 #ifndef RGB_LED_W_PIN
-  #define RGB_LED_W_PIN    -1
+  #define RGB_LED_W_PIN                     -1
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
new file mode 100644
index 000000000000..ac8b731aae55
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -0,0 +1,391 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef TARGET_STM32F4
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 8 || E_STEPPERS > 8
+  #error "BIGTREE GTR V1.0 supports up to 8 hotends / E-steppers."
+#elif HOTENDS > MAX_EXTRUDERS || E_STEPPERS > MAX_EXTRUDERS
+  #error "Marlin extruder/hotends limit! Increase MAX_EXTRUDERS to continue."
+#endif
+
+#define BOARD_INFO_NAME "BIGTREE GTR 1.0"
+
+// Use one of these or SDCard-based Emulation will be used
+//#define I2C_EEPROM
+//#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
+//#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
+
+#define TP                                        // Enable to define servo and probe pins
+
+//
+// Servos
+//
+#if ENABLED(TP)
+  #define SERVO0_PIN                        PB11
+#endif
+
+#define PS_ON_PIN                           PH6
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PF2
+#define X_MAX_PIN                           PG14
+#define Y_MIN_PIN                           PC13
+#define Y_MAX_PIN                           PG9
+#define Z_MIN_PIN                           PE0
+#define Z_MAX_PIN                           PD3
+
+//
+// Pins on the extender
+//
+//#define X_MIN_PIN                         PI4
+//#define X2_MIN_PIN                        PF12
+//#define Y_MIN_PIN                         PF4
+//#define Y2_MIN_PIN                        PI7
+//#define Z_MIN_PIN                         PF6
+
+#if ENABLED(TP) && !defined(Z_MIN_PROBE_PIN)
+  #define Z_MIN_PROBE_PIN                   PH11  // Z Probe must be PH11
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PC15
+#define X_DIR_PIN                           PF0
+#define X_ENABLE_PIN                        PF1
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PC14
+#endif
+
+#define Y_STEP_PIN                          PE3
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PE4
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PE1
+#endif
+
+#define Z_STEP_PIN                          PB8
+#define Z_DIR_PIN                           PB7   // PB7
+#define Z_ENABLE_PIN                        PB9
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PB5
+#endif
+
+#define E0_STEP_PIN                         PG12
+#define E0_DIR_PIN                          PG11
+#define E0_ENABLE_PIN                       PG13
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PG10
+#endif
+
+#define E1_STEP_PIN                         PD6
+#define E1_DIR_PIN                          PD5
+#define E1_ENABLE_PIN                       PD7
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PD4
+#endif
+
+#define E2_STEP_PIN                         PD1
+#define E2_DIR_PIN                          PD0
+#define E2_ENABLE_PIN                       PD2
+#ifndef E2_CS_PIN
+  #define E2_CS_PIN                         PC12
+#endif
+
+#define E3_STEP_PIN                         PF3
+#define E3_DIR_PIN                          PG3
+#define E3_ENABLE_PIN                       PF8
+#ifndef E3_CS_PIN
+  #define E3_CS_PIN                         PG4
+#endif
+
+#define E4_STEP_PIN                         PD14
+#define E4_DIR_PIN                          PD11
+#define E4_ENABLE_PIN                       PG2
+#ifndef E4_CS_PIN
+  #define E4_CS_PIN                         PE15
+#endif
+
+#define E5_STEP_PIN                         PE12
+#define E5_DIR_PIN                          PE10
+#define E5_ENABLE_PIN                       PF14
+#ifndef E5_CS_PIN
+  #define E5_CS_PIN                         PE7
+#endif
+
+#define E6_STEP_PIN                         PG0
+#define E6_DIR_PIN                          PG1
+#define E6_ENABLE_PIN                       PE8
+#ifndef E6_CS_PIN
+  #define E6_CS_PIN                         PF15
+#endif
+
+#define E7_STEP_PIN                         PH12
+#define E7_DIR_PIN                          PH15
+#define E7_ENABLE_PIN                       PI0
+#ifndef E7_CS_PIN
+  #define E7_CS_PIN                         PH14
+#endif
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PG15
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO                     PB6
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PB3
+  #endif
+#endif
+
+#if HAS_TMC_UART
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   */
+  //#define X_HARDWARE_SERIAL  Serial
+  //#define X2_HARDWARE_SERIAL Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y2_HARDWARE_SERIAL Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z2_HARDWARE_SERIAL Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial1
+  //#define E2_HARDWARE_SERIAL Serial1
+  //#define E3_HARDWARE_SERIAL Serial1
+  //#define E4_HARDWARE_SERIAL Serial1
+  //#define E5_HARDWARE_SERIAL Serial1
+  //#define E6_HARDWARE_SERIAL Serial1
+  //#define E7_HARDWARE_SERIAL Serial1
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                   PC14
+  #define X_SERIAL_RX_PIN                   PC14
+
+  #define Y_SERIAL_TX_PIN                   PE1
+  #define Y_SERIAL_RX_PIN                   PE1
+
+  #define Z_SERIAL_TX_PIN                   PB5
+  #define Z_SERIAL_RX_PIN                   PB5
+
+  #define E0_SERIAL_TX_PIN                  PG10
+  #define E0_SERIAL_RX_PIN                  PG10
+
+  #define E1_SERIAL_TX_PIN                  PD4
+  #define E1_SERIAL_RX_PIN                  PD4
+
+  #define E2_SERIAL_TX_PIN                  PC12
+  #define E2_SERIAL_RX_PIN                  PC12
+
+  #define E3_SERIAL_TX_PIN                  PG4
+  #define E3_SERIAL_RX_PIN                  PG4
+
+  #define E4_SERIAL_TX_PIN                  PE15
+  #define E4_SERIAL_RX_PIN                  PE15
+
+  #define E5_SERIAL_TX_PIN                  PE7
+  #define E5_SERIAL_RX_PIN                  PE7
+
+  #define E6_SERIAL_TX_PIN                  PF15
+  #define E6_SERIAL_RX_PIN                  PF15
+
+  #define E7_SERIAL_TX_PIN                  PH14
+  #define E7_SERIAL_RX_PIN                  PH14
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE 19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // T1 <-> E0
+#define TEMP_1_PIN                          PC2   // T2 <-> E1
+#define TEMP_2_PIN                          PC3   // T3 <-> E2
+
+#define TEMP_3_PIN                          PA3   // T4 <-> E3
+#define TEMP_4_PIN                          PF9   // T5 <-> E4
+#define TEMP_5_PIN                          PF10  // T6 <-> E5
+#define TEMP_6_PIN                          PF7   // T7 <-> E6
+#define TEMP_7_PIN                          PF5   // T8 <-> E7
+
+#define TEMP_BED_PIN                        PC0   // T0 <-> Bed
+
+// SPI for Max6675 or Max31855 Thermocouple
+// Uses a separate SPI bus
+// If you have a two-way thermocouple, you can customize two THERMO_CSx_PIN pins (x:1~2)
+
+#define THERMO_SCK_PIN                      PI1   // SCK
+#define THERMO_DO_PIN                       PI2   // MISO
+#define THERMO_CS1_PIN                      PH9   // CS1
+#define THERMO_CS2_PIN                      PH2   // CS2
+
+#define MAX6675_SS_PIN            THERMO_CS1_PIN
+#define MAX6675_SS2_PIN           THERMO_CS2_PIN
+#define MAX6675_SCK_PIN           THERMO_SCK_PIN
+#define MAX6675_DO_PIN             THERMO_DO_PIN
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PB1   // Heater0
+#define HEATER_1_PIN                        PA1   // Heater1
+#define HEATER_2_PIN                        PB0   // Heater2
+
+#define HEATER_3_PIN                        PD15  // Heater3
+#define HEATER_4_PIN                        PD13  // Heater4
+#define HEATER_5_PIN                        PD12  // Heater5
+#define HEATER_6_PIN                        PE13  // Heater6
+#define HEATER_7_PIN                        PI6   // Heater7
+
+#define HEATER_BED_PIN                      PA2   // Hotbed
+
+#define FAN_PIN                             PE5   // Fan0
+#define FAN1_PIN                            PE6   // Fan1
+#define FAN2_PIN                            PC8   // Fan2
+
+#define FAN3_PIN                            PI5   // Fan3
+#define FAN4_PIN                            PE9   // Fan4
+#define FAN5_PIN                            PE11  // Fan5
+//#define FAN6_PIN                          PC9   // Fan6
+//#define FAN7_PIN                          PE14  // Fan7
+
+//
+// By default the onboard SD (SPI1) is enabled
+//
+#define CUSTOM_SPI_PINS
+#if DISABLED(CUSTOM_SPI_PINS)
+  #define SDSS                              PB12
+#endif
+
+// HAL SPI1 pins group
+#if ENABLED(CUSTOM_SPI_PINS)
+  #define SDSS                              PA4
+  #define SD_DETECT_PIN                     PC4
+  #define LCD_SDSS                          PA4
+
+  #define SCK_PIN                           PA5
+  #define MISO_PIN                          PA6
+  #define MOSI_PIN                          PA7
+  #define SS_PIN                            PA4   // Chip select for SD card used by Marlin
+#endif
+
+/**
+ *               _____                                             _____
+ *           NC | · · | GND                                    5V | · · | GND
+ *        RESET | · · | PB10(SD_DETECT)             (LCD_D7)  PG5 | · · | PG6  (LCD_D6)
+ *   (MOSI)PB15 | · · | PH10(BTN_EN2)               (LCD_D5)  PG7 | · · | PG8  (LCD_D4)
+ *  (SD_SS)PB12 | · · | PD10(BTN_EN1)               (LCD_RS)  PA8 | · · | PC10 (LCD_EN)
+ *    (SCK)PB13 | · · | PB14(MISO)                 (BTN_ENC) PA15 | · · | PC11  (BEEPER)
+ *               ￣￣                                               ￣￣
+ *               EXP2                                              EXP1
+ */
+
+//
+// LCDs and Controllers
+//
+#if HAS_SPI_LCD
+  #define BEEPER_PIN                        PC11
+  #define BTN_ENC                           PA15
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define LCD_PINS_RS                     PA8
+
+    #define BTN_EN1                         PD10
+    #define BTN_EN2                         PH10
+
+    #define LCD_PINS_ENABLE                 PG7
+    #define LCD_PINS_D4                     PG8
+
+    //#undef ST7920_DELAY_1
+    //#undef ST7920_DELAY_2
+    //#undef ST7920_DELAY_3
+
+  #else
+
+    #define LCD_PINS_RS                     PA8
+
+    #define BTN_EN1                         PD10
+    #define BTN_EN2                         PH10
+
+    #if DISABLED(CUSTOM_SPI_PINS)
+      #define SD_DETECT_PIN                 PB10
+      #define LCD_SDSS                      PB12
+    #endif
+
+    #define LCD_PINS_ENABLE                 PC10
+    #define LCD_PINS_D4                     PG8
+
+    #if ENABLED(FYSETC_MINI_12864)
+      #define DOGLCD_CS                     PC10
+      #define DOGLCD_A0                     PA8
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN                 PG8   // Must be high or open for LCD to operate normally.
+      #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+        #ifndef RGB_LED_R_PIN
+          #define RGB_LED_R_PIN             PG7
+        #endif
+        #ifndef RGB_LED_G_PIN
+          #define RGB_LED_G_PIN             PG6
+        #endif
+        #ifndef RGB_LED_B_PIN
+          #define RGB_LED_B_PIN             PG5
+        #endif
+      #elif ENABLED(FYSETC_MINI_12864_2_1)
+        #define NEOPIXEL_PIN                PF13
+      #endif
+    #endif // !FYSETC_MINI_12864
+
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5                   PG7
+      #define LCD_PINS_D6                   PG6
+      #define LCD_PINS_D7                   PG5
+    #endif
+
+  #endif
+
+  // Alter timing for graphical display
+  #if HAS_GRAPHICAL_LCD
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+  #endif
+
+  //#define DOGLCD_CS                       PB12
+  //#define DOGLCD_A0                       PA8
+  //#define LCD_PINS_DC                     PB14
+  //#define DOGLCD_MOSI                     PB15
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
new file mode 100644
index 000000000000..4dbdf0e77f60
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
@@ -0,0 +1,284 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef TARGET_STM32F4
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+  #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "BIGTREE SKR Pro 1.1" // redefined?
+
+// Use one of these or SDCard-based Emulation will be used
+//#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
+//#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA1
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PB10
+#define X_MAX_PIN                           PE15
+#define Y_MIN_PIN                           PE12
+#define Y_MAX_PIN                           PE10
+#define Z_MIN_PIN                           PG8
+#define Z_MAX_PIN                           PG5
+
+//
+// Z Probe must be this pins
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PA2
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PE9
+#define X_DIR_PIN                           PF1
+#define X_ENABLE_PIN                        PF2
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PA15
+#endif
+
+#define Y_STEP_PIN                          PE11
+#define Y_DIR_PIN                           PE8
+#define Y_ENABLE_PIN                        PD7
+ #ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PB8
+#endif
+
+#define Z_STEP_PIN                          PE13
+#define Z_DIR_PIN                           PC2
+#define Z_ENABLE_PIN                        PC0
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PB9
+#endif
+
+#define E0_STEP_PIN                         PE14
+#define E0_DIR_PIN                          PA0
+#define E0_ENABLE_PIN                       PC3
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PB3
+#endif
+
+#define E1_STEP_PIN                         PD15
+#define E1_DIR_PIN                          PE7
+#define E1_ENABLE_PIN                       PA3
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PG15
+#endif
+
+#define E2_STEP_PIN                         PD13
+#define E2_DIR_PIN                          PG9
+#define E2_ENABLE_PIN                       PF0
+#ifndef E2_CS_PIN
+  #define E2_CS_PIN                         PG12
+#endif
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PC12
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO                     PC11
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PC10
+  #endif
+#endif
+
+#if HAS_TMC_UART
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   */
+  //#define X_HARDWARE_SERIAL  Serial
+  //#define X2_HARDWARE_SERIAL Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Y2_HARDWARE_SERIAL Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define Z2_HARDWARE_SERIAL Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial1
+  //#define E2_HARDWARE_SERIAL Serial1
+  //#define E3_HARDWARE_SERIAL Serial1
+  //#define E4_HARDWARE_SERIAL Serial1
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                   PC13
+  #define X_SERIAL_RX_PIN                   PC13
+
+  #define Y_SERIAL_TX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN                   PE3
+
+  #define Z_SERIAL_TX_PIN                   PE1
+  #define Z_SERIAL_RX_PIN                   PE1
+
+  #define E0_SERIAL_TX_PIN                  PD4
+  #define E0_SERIAL_RX_PIN                  PD4
+
+  #define E1_SERIAL_TX_PIN                  PD1
+  #define E1_SERIAL_RX_PIN                  PD1
+
+  #define E2_SERIAL_TX_PIN                  PD6
+  #define E2_SERIAL_RX_PIN                  PD6
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE 19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PF4   // T1 <-> E0
+#define TEMP_1_PIN                          PF5   // T2 <-> E1
+#define TEMP_2_PIN                          PF6   // T3 <-> E2
+#define TEMP_BED_PIN                        PF3   // T0 <-> Bed
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PB1   // Heater0
+#define HEATER_1_PIN                        PD14  // Heater1
+#define HEATER_2_PIN                        PB0   // Heater1
+#define HEATER_BED_PIN                      PD12  // Hotbed
+#define FAN_PIN                             PC8   // Fan0
+#define FAN1_PIN                            PE5   // Fan1
+#define FAN2_PIN                            PE6   // Fan2
+
+//
+// Misc. Functions
+//
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION                  LCD
+#endif
+
+//
+// Onboard SD card
+//   NOT compatible with LCD
+//
+#if SDCARD_CONNECTION == ONBOARD && !HAS_SPI_LCD
+  #define SOFTWARE_SPI                            // Use soft SPI for onboard SD
+  #define SDSS                              PA4
+  #define SCK_PIN                           PA5
+  #define MISO_PIN                          PA6
+  #define MOSI_PIN                          PB5
+#else
+  #define SDSS                              PB12
+#endif
+
+/**
+ *               _____                                             _____
+ *           NC | · · | GND                                    5V | · · | GND
+ *        RESET | · · | PF12(SD_DETECT)             (LCD_D7)  PG7 | · · | PG6  (LCD_D6)
+ *   (MOSI)PB15 | · · | PF11(BTN_EN2)               (LCD_D5)  PG3 | · · | PG2  (LCD_D4)
+ *  (SD_SS)PB12 | · · | PG10(BTN_EN1)               (LCD_RS) PD10 | · · | PD11 (LCD_EN)
+ *    (SCK)PB13 | · · | PB14(MISO)                 (BTN_ENC)  PA8 | · · | PG4  (BEEPER)
+ *               ￣￣                                               ￣￣
+ *               EXP2                                              EXP1
+ */
+
+//
+// LCDs and Controllers
+//
+#if HAS_SPI_LCD
+  #define BEEPER_PIN                        PG4
+  #define BTN_ENC                           PA8
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+    #define LCD_PINS_RS                     PG6
+
+    #define BTN_EN1                         PD11
+    #define BTN_EN2                         PG2
+
+    #define LCD_PINS_ENABLE                 PG7
+    #define LCD_PINS_D4                     PG3
+
+    // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
+    // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
+    #undef ST7920_DELAY_1
+    #undef ST7920_DELAY_2
+    #undef ST7920_DELAY_3
+
+  #else
+
+    #define LCD_PINS_RS                     PD10
+
+    #define BTN_EN1                         PG10
+    #define BTN_EN2                         PF11
+    #define SD_DETECT_PIN                   PF12
+
+    #define LCD_SDSS                        PB12
+
+    #define LCD_PINS_ENABLE                 PD11
+    #define LCD_PINS_D4                     PG2
+
+    #if ENABLED(FYSETC_MINI_12864)
+      #define DOGLCD_CS                     PD11
+      #define DOGLCD_A0                     PD10
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN                 PG2   // Must be high or open for LCD to operate normally.
+      #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+        #ifndef RGB_LED_R_PIN
+          #define RGB_LED_R_PIN             PG3
+        #endif
+        #ifndef RGB_LED_G_PIN
+          #define RGB_LED_G_PIN             PG6
+        #endif
+        #ifndef RGB_LED_B_PIN
+          #define RGB_LED_B_PIN             PG7
+        #endif
+      #elif ENABLED(FYSETC_MINI_12864_2_1)
+        #define NEOPIXEL_PIN                PG3
+      #endif
+    #endif // !FYSETC_MINI_12864
+
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5                   PG3
+      #define LCD_PINS_D6                   PG6
+      #define LCD_PINS_D7                   PG7
+    #endif
+
+  #endif
+
+  // Alter timing for graphical display
+  #if HAS_GRAPHICAL_LCD
+    #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+    #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
+  #endif
+
+#endif // HAS_SPI_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
new file mode 100644
index 000000000000..8205cd9f4db0
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -0,0 +1,265 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 6 || E_STEPPERS > 6
+  #error "FLYF407ZG supports up to 6 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME      "FLYF407ZG"
+#define BOARD_WEBSITE_URL    "github.com/FLYmaker/FLYF407ZG"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#undef E2END
+#define E2END 0xFFF                               // 4KB
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PE11
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PC3
+#define X_MAX_PIN                           PC2
+#define Y_MIN_PIN                           PF2
+#define Y_MAX_PIN                           PF1
+#define Z_MIN_PIN                           PF0
+#define Z_MAX_PIN                           PC15
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#define Z_MIN_PROBE_PIN                     PC14  // Z3_PIN
+
+//
+// Steppers
+//
+
+#define X_STEP_PIN                          PB9
+#define X_DIR_PIN                           PE0
+#define X_ENABLE_PIN                        PE1
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PG13
+#endif
+
+#define Y_STEP_PIN                          PB8
+#define Y_DIR_PIN                           PG11
+#define Y_ENABLE_PIN                        PG12
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PG10
+#endif
+
+#define Z_STEP_PIN                          PA8
+#define Z_DIR_PIN                           PD6
+#define Z_ENABLE_PIN                        PD7
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PD5
+#endif
+
+#define E0_STEP_PIN                         PC7
+#define E0_DIR_PIN                          PD3
+#define E0_ENABLE_PIN                       PD4
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PD1
+#endif
+
+#define E1_STEP_PIN                         PC6
+#define E1_DIR_PIN                          PA15
+#define E1_ENABLE_PIN                       PD0
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PA14
+#endif
+
+#define E2_STEP_PIN                         PD15
+#define E2_DIR_PIN                          PG7
+#define E2_ENABLE_PIN                       PG8
+#ifndef E2_CS_PIN
+  #define E2_CS_PIN                         PG6
+#endif
+
+#define E3_STEP_PIN                         PD14
+#define E3_DIR_PIN                          PG4
+#define E3_ENABLE_PIN                       PG5
+#ifndef E3_CS_PIN
+  #define E3_CS_PIN                         PG3
+#endif
+
+#define E4_STEP_PIN                         PD13
+#define E4_DIR_PIN                          PD11
+#define E4_ENABLE_PIN                       PG2
+#ifndef E4_CS_PIN
+  #define E4_CS_PIN                         PD10
+#endif
+
+#define E5_STEP_PIN                         PD12
+#define E5_DIR_PIN                          PD8
+#define E5_ENABLE_PIN                       PD9
+#ifndef E5_CS_PIN
+  #define E5_CS_PIN                         PB12
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PA0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_2_PIN                          PC0   // Analog Input
+#define TEMP_3_PIN                          PF10  // Analog Input
+#define TEMP_4_PIN                          PF5   // Analog Input
+#define TEMP_5_PIN                          PF4   // Analog Input
+#define TEMP_BED_PIN                        PF3   // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PF7
+#define HEATER_1_PIN                        PF6
+#define HEATER_2_PIN                        PE6
+#define HEATER_3_PIN                        PE5
+#define HEATER_4_PIN                        PE4
+#define HEATER_5_PIN                        PA2
+#define HEATER_BED_PIN                      PE2
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PF8
+#endif
+#define FAN1_PIN                            PF9
+#define FAN2_PIN                            PE3
+#define FAN3_PIN                            PA1
+#define FAN4_PIN                            PE13
+#define FAN5_PIN                            PB11
+
+//
+// Onboard SD support
+//
+
+#define SDIO_D0_PIN                         PC8
+#define SDIO_D1_PIN                         PC9
+//#define SD_CARD_DETECT_PIN                PC13
+#define SDIO_D2_PIN                         PC10
+#define SDIO_D3_PIN                         PC11
+#define SDIO_CK_PIN                         PC12
+#define SDIO_CMD_PIN                        PD2
+
+#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
+
+  #ifndef SDIO_SUPPORT
+    #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
+    #define SDSS                     SDIO_D3_PIN
+    #define SCK_PIN                  SDIO_CK_PIN
+    #define MISO_PIN                 SDIO_D0_PIN
+    #define MOSI_PIN                SDIO_CMD_PIN
+  #endif
+#endif
+
+//
+// Trinamic Software SPI
+//
+
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PB15
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO                     PB14
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PB13
+  #endif
+#endif
+
+//
+// Trinamic Software Serial
+//
+
+#if HAS_TMC_UART
+  #define X_SERIAL_TX_PIN                   PG13
+  #define X_SERIAL_RX_PIN                   PG13
+
+  #define Y_SERIAL_TX_PIN                   PG10
+  #define Y_SERIAL_RX_PIN                   PG10
+
+  #define Z_SERIAL_TX_PIN                   PD5
+  #define Z_SERIAL_RX_PIN                   PD5
+
+  #define E0_SERIAL_TX_PIN                  PD1
+  #define E0_SERIAL_RX_PIN                  PD1
+
+  #define E1_SERIAL_TX_PIN                  PA14
+  #define E1_SERIAL_RX_PIN                  PA14
+
+  #define E2_SERIAL_TX_PIN                  PG6
+  #define E2_SERIAL_RX_PIN                  PG6
+
+  #define E3_SERIAL_TX_PIN                  PG3
+  #define E3_SERIAL_RX_PIN                  PG3
+
+  #define E4_SERIAL_TX_PIN                  PD10
+  #define E4_SERIAL_RX_PIN                  PD10
+
+  #define E5_SERIAL_TX_PIN                  PB12
+  #define E5_SERIAL_RX_PIN                  PB12
+
+#endif
+
+//
+// LCD / Controller
+//
+#define SCK_PIN                             PB13
+#define MISO_PIN                            PB14
+#define MOSI_PIN                            PB15
+#define SDSS                                PF11
+#define SD_DETECT_PIN                       PB2
+#define BEEPER_PIN                          PB10
+#define LCD_PINS_RS                         PE12
+#define LCD_PINS_ENABLE                     PE14
+#define LCD_PINS_D4                         PE10
+#define LCD_PINS_D5                         PE9
+#define LCD_PINS_D6                         PE8
+#define LCD_PINS_D7                         PE7
+#define BTN_EN1                             PC4
+#define BTN_EN2                             PC5
+#define BTN_ENC                             PE15
+
+//
+// Filament runout
+//
+
+#define FIL_RUNOUT_PIN                      PA3
+
+//
+// ST7920 Delays
+//
+#ifndef ST7920_DELAY_1
+  #define ST7920_DELAY_1            DELAY_NS(96)
+#endif
+#ifndef ST7920_DELAY_2
+  #define ST7920_DELAY_2            DELAY_NS(48)
+#endif
+#ifndef ST7920_DELAY_3
+  #define ST7920_DELAY_3           DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
new file mode 100644
index 000000000000..bdadbe36c20f
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -0,0 +1,266 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef STM32F4
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+  #error "RUMBA32 supports up to 3 hotends / E-steppers."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "FYSETC_S6"
+#endif
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+#endif
+
+// change the prio to 3 , 2 is for software serial
+//#define TEMP_TIMER_IRQ_PRIO 3
+
+//
+// EEPROM Emulation
+//
+#define FLASH_EEPROM_EMULATION
+#if ENABLED(FLASH_EEPROM_EMULATION)
+  #define FLASH_EEPROM_LEVELING
+#endif
+//#define SRAM_EEPROM_EMULATION
+//#define I2C_EEPROM
+#ifdef I2C_EEPROM
+  #undef E2END                                    // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
+  #define E2END 0xFFF                             // 4KB
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA3
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PB14
+#define X_MAX_PIN                           PA1
+#define Y_MIN_PIN                           PB13
+#define Y_MAX_PIN                           PA2
+#define Z_MIN_PIN                           PA0
+#define Z_MAX_PIN                           PA3
+
+//
+// Filament Sensor
+// share with X_MAX_PIN
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PA1
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PE11
+#define X_DIR_PIN                           PE10
+#define X_ENABLE_PIN                        PE12
+#define X_CS_PIN                            PE7
+
+#define Y_STEP_PIN                          PD8
+#define Y_DIR_PIN                           PB12
+#define Y_ENABLE_PIN                        PD9
+#define Y_CS_PIN                            PE15
+
+#define Z_STEP_PIN                          PD14
+#define Z_DIR_PIN                           PD13
+#define Z_ENABLE_PIN                        PD15
+#define Z_CS_PIN                            PD10
+
+#define E0_STEP_PIN                         PD5
+#define E0_DIR_PIN                          PD6
+#define E0_ENABLE_PIN                       PD4
+#define E0_CS_PIN                           PD7
+
+#define E1_STEP_PIN                         PE6
+#define E1_DIR_PIN                          PC13
+#define E1_ENABLE_PIN                       PE5
+#define E1_CS_PIN                           PC14
+
+#define E2_STEP_PIN                         PE2
+#define E2_DIR_PIN                          PE4
+#define E2_ENABLE_PIN                       PE3
+#define E2_CS_PIN                           PC15
+
+#if HAS_TMC_UART
+  //
+  // TMC2208/TMC2209 stepper drivers
+  //
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                   PE9
+  #define X_SERIAL_RX_PIN                   PE8
+
+  #define Y_SERIAL_TX_PIN                   PE14
+  #define Y_SERIAL_RX_PIN                   PE13
+
+  #define Z_SERIAL_TX_PIN                   PD11
+  #define Z_SERIAL_RX_PIN                   PD12
+
+  #define E0_SERIAL_TX_PIN                  PD3
+  #define E0_SERIAL_RX_PIN                  PA15
+
+  #define E1_SERIAL_TX_PIN                  PC4
+  #define E1_SERIAL_RX_PIN                  PC5
+
+  #define E2_SERIAL_TX_PIN                  PE1
+  #define E2_SERIAL_RX_PIN                  PE0
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC0
+#define TEMP_1_PIN                          PC1
+#define TEMP_2_PIN                          PC2
+#define TEMP_BED_PIN                        PC3
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PB3
+#define HEATER_1_PIN                        PB4
+#define HEATER_2_PIN                        PB15
+#define HEATER_BED_PIN                      PC8
+
+#define FAN_PIN                             PB0
+#define FAN1_PIN                            PB1
+#define FAN2_PIN                            PB2
+
+//
+// SPI
+//
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
+
+//
+// Misc. Functions
+//
+//#define LED_PIN                           PB14
+//#define BTN_PIN                           PC10
+//#define PS_ON_PIN                         PE11
+//#define KILL_PIN                          PC5
+
+#define SDSS                                PA4
+#define SD_DETECT_PIN                       PB10
+
+//
+// LCD / Controller
+//
+#if HAS_SPI_LCD
+  #define BEEPER_PIN                        PC9
+  #define BTN_ENC                           PA8
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+    #define LCD_PINS_RS                     PD0
+
+    #define BTN_EN1                         PC11
+    #define BTN_EN2                         PC10
+
+    #define LCD_PINS_ENABLE                 PD1
+    #define LCD_PINS_D4                     PC12
+
+    // CR10_Stock Display needs a different delay setting on SKR PRO v1.1, so undef it here.
+    // It will be defined again at the #HAS_GRAPHICAL_LCD section below.
+    #undef ST7920_DELAY_1
+    #undef ST7920_DELAY_2
+    #undef ST7920_DELAY_3
+
+  #else
+
+    #define LCD_PINS_RS                     PD2
+
+    #define BTN_EN1                         PC6
+    #define BTN_EN2                         PC7
+
+    #define LCD_SDSS                        PA4
+
+    #define LCD_PINS_ENABLE                 PC11
+    #define LCD_PINS_D4                     PC10
+
+    #if ENABLED(FYSETC_MINI_12864)
+     // See https://wiki.fysetc.com/Mini12864_Panel
+      #define DOGLCD_CS                     PC11
+      #define DOGLCD_A0                     PD2
+      #if ENABLED(FYSETC_GENERIC_12864_1_1)
+        #define LCD_BACKLIGHT_PIN           PD0
+      #endif
+      #define LCD_RESET_PIN                 PC10  // Must be high or open for LCD to operate normally.
+      #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
+        #ifndef RGB_LED_R_PIN
+          #define RGB_LED_R_PIN             PC12
+        #endif
+        #ifndef RGB_LED_G_PIN
+          #define RGB_LED_G_PIN             PD0
+        #endif
+        #ifndef RGB_LED_B_PIN
+          #define RGB_LED_B_PIN             PD1
+        #endif
+      #elif ENABLED(FYSETC_MINI_12864_2_1)
+        #define NEOPIXEL_PIN                PC12
+      #endif
+    #endif // !FYSETC_MINI_12864
+
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5                   PC12
+      #define LCD_PINS_D6                   PD0
+      #define LCD_PINS_D7                   PD1
+    #endif
+
+  #endif
+
+  // Alter timing for graphical display
+  #if HAS_GRAPHICAL_LCD
+    #ifndef ST7920_DELAY_1
+      #define ST7920_DELAY_1        DELAY_NS(96)
+    #endif
+    #ifndef ST7920_DELAY_2
+      #define ST7920_DELAY_2        DELAY_NS(48)
+    #endif
+    #ifndef ST7920_DELAY_3
+      #define ST7920_DELAY_3       DELAY_NS(600)
+    #endif
+  #endif
+
+#endif // HAS_SPI_LCD
+
+#ifndef RGB_LED_R_PIN
+  #define RGB_LED_R_PIN                     PB6
+#endif
+#ifndef RGB_LED_G_PIN
+  #define RGB_LED_G_PIN                     PB5
+#endif
+#ifndef RGB_LED_B_PIN
+  #define RGB_LED_B_PIN                     PB7
+#endif
+#ifndef RGB_LED_W_PIN
+  #define RGB_LED_W_PIN                     -1
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
new file mode 100644
index 000000000000..924b94c4f1fe
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
@@ -0,0 +1,189 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * To build with Arduino IDE use "Discovery F407VG"
+ * To build with PlatformIO use environment "STM32F4"
+ */
+#if !defined(STM32F4) && !defined(STM32F4xx)
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "STM32F4 supports up to 2 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME      "Misc. STM32F4"
+#define DEFAULT_MACHINE_NAME "STM32F407VET6"
+
+//#define I2C_EEPROM
+
+#ifndef E2END
+  #define E2END 0xFFF                             // 4KB
+#endif
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PE0
+#define X_MAX_PIN                           -1
+#define Y_MIN_PIN                           PE1
+#define Y_MAX_PIN                           -1
+#define Z_MIN_PIN                           PE14
+#define Z_MAX_PIN                           -1
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+
+//#ifndef Z_MIN_PROBE_PIN
+//  #define Z_MIN_PROBE_PIN  PA4
+//#endif
+
+//
+// Steppers
+//
+
+#define X_STEP_PIN                          PD3
+#define X_DIR_PIN                           PD2
+#define X_ENABLE_PIN                        PD0
+//#ifndef X_CS_PIN
+//  #define X_CS_PIN         PD1
+//#endif
+
+#define Y_STEP_PIN                          PE11
+#define Y_DIR_PIN                           PE10
+#define Y_ENABLE_PIN                        PE13
+//#ifndef Y_CS_PIN
+//  #define Y_CS_PIN         PE12
+//#endif
+
+#define Z_STEP_PIN                          PD6
+#define Z_DIR_PIN                           PD7
+#define Z_ENABLE_PIN                        PD4
+//#ifndef Z_CS_PIN
+//  #define Z_CS_PIN         PD5
+//#endif
+
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB6
+#define E0_ENABLE_PIN                       PB3
+//#ifndef E0_CS_PIN
+//  #define E0_CS_PIN         PB4
+//#endif
+
+#define E1_STEP_PIN                         PE4
+#define E1_DIR_PIN                          PE2
+#define E1_ENABLE_PIN                       PE3
+//#ifndef E1_CS_PIN
+//  #define E1_CS_PIN         PE5
+//#endif
+
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
+
+//
+// Temperature Sensors
+//
+
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_BED_PIN                        PC2   // Analog Input
+
+//
+// Heaters / Fans
+//
+
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        PA2
+#define HEATER_BED_PIN                      PA0
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PC6
+#endif
+#define FAN1_PIN                            PC7
+#define FAN2_PIN                            PC8
+
+#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN  // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Misc. Functions
+//
+
+//#define CASE_LIGHT_PIN_CI                 PF13
+//#define CASE_LIGHT_PIN_DO                 PF14
+//#define NEOPIXEL_PIN                      PF13
+
+//
+// Průša i3 MK2 Multi Material Multiplexer Support
+//
+
+//#define E_MUX0_PIN                        PG3
+//#define E_MUX1_PIN                        PG4
+
+//
+// Servos
+//
+
+//#define SERVO0_PIN                        PE13
+//#define SERVO1_PIN                        PE14
+
+#define SDSS                                PE7
+#define SS_PIN                              PE7
+#define LED_PIN                             PB7   //Alive
+#define PS_ON_PIN                           PA10
+#define KILL_PIN                            PA8
+#define PWR_LOSS                            PA4   //Power loss / nAC_FAULT
+
+//
+// LCD / Controller
+//
+
+#define SD_DETECT_PIN                       PA15
+#define BEEPER_PIN                          PC9
+#define LCD_PINS_RS                         PE9
+#define LCD_PINS_ENABLE                     PE8
+#define LCD_PINS_D4                         PB12
+#define LCD_PINS_D5                         PB13
+#define LCD_PINS_D6                         PB14
+#define LCD_PINS_D7                         PB15
+#define BTN_EN1                             PC4
+#define BTN_EN2                             PC5
+#define BTN_ENC                             PC3
+
+//
+// Filament runout
+//
+
+#define FIL_RUNOUT_PIN                      PA3
+
+//
+// ST7920 Delays
+//
+#if HAS_GRAPHICAL_LCD
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
new file mode 100644
index 000000000000..d21cdd09583c
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -0,0 +1,177 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "LERDGE K supports up to 2 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME      "Lerdge K"
+#define DEFAULT_MACHINE_NAME "LERDGE"
+
+#define I2C_EEPROM
+
+// Ignore temp readings during develpment.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Servos
+//
+//#define SERVO0_PIN                        PD12
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PG3
+#define Y_STOP_PIN                          PG4
+#define Z_STOP_PIN                          PG5
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+//#ifndef Z_MIN_PROBE_PIN
+//  #define Z_MIN_PROBE_PIN  PB15
+//#endif
+
+//
+// Filament runout
+//
+#define FIL_RUNOUT_PIN                      PE6
+#define FIL_RUNOUT2_PIN                     PE7
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PG1
+#define X_DIR_PIN                           PB10
+#define X_ENABLE_PIN                        PG0
+//#ifndef X_CS_PIN
+//  #define X_CS_PIN       PE0
+//#endif
+
+#define Y_STEP_PIN                          PF14
+#define Y_DIR_PIN                           PF15
+#define Y_ENABLE_PIN                        PF13
+//#ifndef Y_CS_PIN
+//  #define Y_CS_PIN       PE1
+//#endif
+
+#define Z_STEP_PIN                          PF11
+#define Z_DIR_PIN                           PF12
+#define Z_ENABLE_PIN                        PC5
+//#ifndef Z_CS_PIN
+//  #define Z_CS_PIN       PE2
+//#endif
+
+#define E0_STEP_PIN                         PC14
+#define E0_DIR_PIN                          PC13
+#define E0_ENABLE_PIN                       PC15
+//#ifndef E0_CS_PIN
+//  #define E0_CS_PIN      PE3
+//#endif
+
+#define E1_STEP_PIN                         PF1
+#define E1_DIR_PIN                          PF0
+#define E1_ENABLE_PIN                       PF2
+//#ifndef E1_CS_PIN
+//  #define E1_CS_PIN      PE4
+//#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // Analog Input
+#define TEMP_1_PIN                          PC2   // Analog Input
+#define TEMP_BED_PIN                        PC0   // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        PA0
+#define HEATER_BED_PIN                      PA2
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PC15
+#endif
+#define FAN1_PIN                            PF6
+#define FAN2_PIN                            PF7
+
+#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN  // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// LED / Lighting
+//
+//#define CASE_LIGHT_PIN_CI                 -1
+//#define CASE_LIGHT_PIN_DO                 -1
+//#define NEOPIXEL_PIN                      -1
+
+//
+// Prusa i3 MK2 Multi-Material Multiplexer Support
+//
+//#define E_MUX0_PIN                        -1
+//#define E_MUX1_PIN                        -1
+
+//
+// SD support
+//
+#define SDIO_SUPPORT
+
+//
+// Misc. Functions
+//
+#define SDSS                                PC11
+#define LED_PIN                             PC7   // Alive
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            -1
+#define POWER_LOSS_PIN                      -1    // Power-loss / nAC_FAULT
+
+#define SCK_PIN                             PC12
+#define MISO_PIN                            PC8
+#define MOSI_PIN                            PD2
+#define SS_PIN                              PC11
+
+//
+// LCD / Controller
+//
+
+// TODO: Replace these with the correct FSMC pins, once known
+#define SD_DETECT_PIN                       -1
+#define BEEPER_PIN                          PD12
+#define LCD_PINS_RS                         -1
+#define LCD_PINS_ENABLE                     -1
+#define LCD_PINS_D4                         -1
+#define LCD_PINS_D5                         -1
+#define LCD_PINS_D6                         -1
+#define LCD_PINS_D7                         -1
+
+#define BTN_EN1                             PE3
+#define BTN_EN2                             PE4
+#define BTN_ENC                             PE2
+
+//
+// ST7920 Delays
+//
+#if HAS_GRAPHICAL_LCD
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
new file mode 100644
index 000000000000..c54c5c180681
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -0,0 +1,174 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "LERDGE X supports up to 2 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME      "Lerdge X"
+#define DEFAULT_MACHINE_NAME "LERDGE"
+
+//#define I2C_EEPROM
+
+//
+// Servos
+//
+//#define SERVO0_PIN                        PD12
+//#define SERVO1_PIN                        -1
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PB12
+#define Y_STOP_PIN                          PB13
+#define Z_STOP_PIN                          PB14
+
+//
+// Filament runout
+//
+#define FIL_RUNOUT_PIN                      PE1
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+//#ifndef Z_MIN_PROBE_PIN
+//  #define Z_MIN_PROBE_PIN  PB15
+//#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PB10
+#define X_DIR_PIN                           PB2
+#define X_ENABLE_PIN                        PB11
+//#ifndef X_CS_PIN
+//  #define X_CS_PIN       PD1
+//#endif
+
+#define Y_STEP_PIN                          PB0
+#define Y_DIR_PIN                           PC5
+#define Y_ENABLE_PIN                        PB1
+//#ifndef Y_CS_PIN
+//  #define Y_CS_PIN       PE12
+//#endif
+
+#define Z_STEP_PIN                          PA7
+#define Z_DIR_PIN                           PA6
+#define Z_ENABLE_PIN                        PC4
+//#ifndef Z_CS_PIN
+//  #define Z_CS_PIN       PD5
+//#endif
+
+#define E0_STEP_PIN                         PA4
+#define E0_DIR_PIN                          PA3
+#define E0_ENABLE_PIN                       PA5
+//#ifndef E0_CS_PIN
+//  #define E0_CS_PIN      PB4
+//#endif
+
+#define E1_STEP_PIN                         -1
+#define E1_DIR_PIN                          -1
+#define E1_ENABLE_PIN                       -1
+//#ifndef E1_CS_PIN
+//  #define E1_CS_PIN      PE5
+//#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          -1    // Analog Input
+#define TEMP_BED_PIN                        PC1   // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        -1
+#define HEATER_BED_PIN                      PA2
+
+#ifndef FAN_PIN
+//  #define FAN_PIN        PC15
+#endif
+#define FAN1_PIN                            PC15
+#define FAN2_PIN                            PA0
+
+#define ORIG_E0_AUTO_FAN_PIN                PC15  // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Prusa i3 MK2 Multi Material Multiplexer Support
+//
+//#define E_MUX0_PIN                        -1
+//#define E_MUX1_PIN                        -1
+
+//
+// LED / Lighting
+//
+//#define CASE_LIGHT_PIN_CI                 -1
+//#define CASE_LIGHT_PIN_DO                 -1
+//#define NEOPIXEL_PIN                      -1
+
+//
+// Misc. Functions
+//
+#define SDSS                                PC11
+#define LED_PIN                             PC7   // Alive
+#define PS_ON_PIN                           -1
+#define KILL_PIN                            -1
+#define POWER_LOSS_PIN                      -1    // Power-loss / nAC_FAULT
+
+#define SCK_PIN                             PC12
+#define MISO_PIN                            PC8
+#define MOSI_PIN                            PD2
+#define SS_PIN                              PC11
+
+//
+// SD support
+//
+#define SDIO_SUPPORT
+
+//
+// LCD / Controller
+//
+
+// The LCD is initialized in FSMC mode
+#define SD_DETECT_PIN                       -1
+#define BEEPER_PIN                          PD12
+
+#define BTN_EN1                             PE3
+#define BTN_EN2                             PE4
+#define BTN_ENC                             PE2
+
+#define LCD_RESET_PIN                       PD6
+#define LCD_BACKLIGHT_PIN                   PD3
+#define FSMC_CS_PIN                         PD4
+#define FSMC_RS_PIN                         PD11
+#define TOUCH_CS                            PB6
+
+//
+// ST7920 Delays
+//
+#if HAS_GRAPHICAL_LCD
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
new file mode 100644
index 000000000000..36298d05f5e6
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
@@ -0,0 +1,101 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef STM32F4
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS_ROBIN2 supports up to 2 hotends / E-steppers."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_NAME "MKS_ROBIN2"
+#endif
+
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+#endif
+
+#define SRAM_EEPROM_EMULATION
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PG8
+#define X_MAX_PIN                           PG7
+#define Y_MIN_PIN                           PG6
+#define Y_MAX_PIN                           PG5
+#define Z_MIN_PIN                           PG4
+#define Z_MAX_PIN                           PG3
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PB0   // XS2-5
+#define SERVO1_PIN                          PF7   // XS1-5
+#define SERVO2_PIN                          PF8   // XS1-6
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PE6
+#define X_DIR_PIN                           PE5
+#define X_ENABLE_PIN                        PC13
+
+#define Y_STEP_PIN                          PE3
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PE4
+
+#define Z_STEP_PIN                          PE0
+#define Z_DIR_PIN                           PB9
+#define Z_ENABLE_PIN                        PE1
+
+#define E0_STEP_PIN                         PG10
+#define E0_DIR_PIN                          PG9
+#define E0_ENABLE_PIN                       PB8
+
+#define E1_STEP_PIN                         PD3
+#define E1_DIR_PIN                          PA15
+#define E1_ENABLE_PIN                       PD6
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // T1 <-> E0
+#define TEMP_1_PIN                          PC2   // T2 <-> E1
+#define TEMP_BED_PIN                        PC0   // T0 <-> Bed
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PF3   // Heater0
+#define HEATER_1_PIN                        PF2   // Heater1
+#define HEATER_BED_PIN                      PF4   // Hotbed
+#define FAN_PIN                             PA7   // Fan0
+
+//
+// Misc. Functions
+//
+#define SDSS                                -1    // PB12
+
+#define SD_DETECT_PIN                       PF9
+#define BEEPER_PIN                          PG2
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
similarity index 100%
rename from Marlin/src/pins/stm32/pins_RUMBA32_AUS3D.h
rename to Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
diff --git a/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
similarity index 76%
rename from Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
rename to Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
index 8e2bb3b8afbd..9fcd5a1474c8 100644
--- a/Marlin/src/pins/stm32/pins_RUMBA32_MKS.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
@@ -46,17 +46,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PA7
+    #define TMC_SW_MOSI                     PA7
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PA6
+    #define TMC_SW_MISO                     PA6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PA5
+    #define TMC_SW_SCK                      PA5
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -78,23 +78,23 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PA3
-  #define X_SERIAL_RX_PIN  PC14
+  #define X_SERIAL_TX_PIN                   PA3
+  #define X_SERIAL_RX_PIN                   PC14
 
-  #define Y_SERIAL_TX_PIN  PA4
-  #define Y_SERIAL_RX_PIN  PE4
+  #define Y_SERIAL_TX_PIN                   PA4
+  #define Y_SERIAL_RX_PIN                   PE4
 
-  #define Z_SERIAL_TX_PIN  PD13
-  #define Z_SERIAL_RX_PIN  PE0
+  #define Z_SERIAL_TX_PIN                   PD13
+  #define Z_SERIAL_RX_PIN                   PE0
 
-  #define E0_SERIAL_TX_PIN PD14
-  #define E0_SERIAL_RX_PIN PC13
+  #define E0_SERIAL_TX_PIN                  PD14
+  #define E0_SERIAL_RX_PIN                  PC13
 
-  #define E1_SERIAL_TX_PIN PD15
-  #define E1_SERIAL_RX_PIN PD5
+  #define E1_SERIAL_TX_PIN                  PD15
+  #define E1_SERIAL_RX_PIN                  PD5
 
-  #define E2_SERIAL_TX_PIN PD12
-  #define E2_SERIAL_RX_PIN PD1
+  #define E2_SERIAL_TX_PIN                  PD12
+  #define E2_SERIAL_RX_PIN                  PD1
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
new file mode 100644
index 000000000000..19853a78fea2
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -0,0 +1,149 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Common pin assignments for all RUMBA32 boards
+ */
+
+#ifndef STM32F4
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+  #error "RUMBA32 boards support up to 3 hotends / E-steppers."
+#endif
+
+#define RUMBA32_V1_0
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+//#define I2C_EEPROM
+#ifdef E2END
+  #undef E2END
+#endif
+#define E2END 0xFFF                               // 4KB
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PB12
+#define X_MAX_PIN                           PB13
+#define Y_MIN_PIN                           PB15
+#define Y_MAX_PIN                           PD8
+#define Z_MIN_PIN                           PD9
+#define Z_MAX_PIN                           PD10
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PA0
+#define X_DIR_PIN                           PC15
+#define X_ENABLE_PIN                        PC11
+#define X_CS_PIN                            PC14
+
+#define Y_STEP_PIN                          PE5
+#define Y_DIR_PIN                           PE6
+#define Y_ENABLE_PIN                        PE3
+#define Y_CS_PIN                            PE4
+
+#define Z_STEP_PIN                          PE1
+#define Z_DIR_PIN                           PE2
+#define Z_ENABLE_PIN                        PB7
+#define Z_CS_PIN                            PE0
+
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB6
+#define E0_ENABLE_PIN                       PC12
+#define E0_CS_PIN                           PC13
+
+#define E1_STEP_PIN                         PD6
+#define E1_DIR_PIN                          PD7
+#define E1_ENABLE_PIN                       PD4
+#define E1_CS_PIN                           PD5
+
+#define E2_STEP_PIN                         PD2
+#define E2_DIR_PIN                          PD3
+#define E2_ENABLE_PIN                       PD0
+#define E2_CS_PIN                           PD1
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC4
+#define TEMP_1_PIN                          PC3
+#define TEMP_2_PIN                          PC2
+#define TEMP_3_PIN                          PC1
+#define TEMP_BED_PIN                        PC0
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC6
+#define HEATER_1_PIN                        PC7
+#define HEATER_2_PIN                        PC8
+#define HEATER_BED_PIN                      PA1
+
+#define FAN_PIN                             PC9
+#define FAN1_PIN                            PA8
+
+//
+// I2C
+//
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
+
+//
+// Misc. Functions
+//
+#define LED_PIN                             PB14
+#define BTN_PIN                             PC10
+#define PS_ON_PIN                           PE11
+#define KILL_PIN                            PC5
+
+#define SDSS                                PA2
+#define SD_DETECT_PIN                       PB0
+#define BEEPER_PIN                          PE8
+
+//
+// LCD / Controller
+//
+#if HAS_SPI_LCD
+
+  #define BTN_EN1                           PB2
+  #define BTN_EN2                           PB1
+  #define BTN_ENC                           PE7
+
+  #define LCD_PINS_RS                       PE10
+  #define LCD_PINS_ENABLE                   PE9
+  #define LCD_PINS_D4                       PE12
+
+  #if ENABLED(MKS_MINI_12864)
+    #define DOGLCD_CS                       PE13
+    #define DOGLCD_A0                       PE14
+  #endif
+
+  #if ENABLED(ULTIPANEL)
+    #define LCD_PINS_D5                     PE13
+    #define LCD_PINS_D6                     PE14
+    #define LCD_PINS_D7                     PE15
+  #endif
+
+#endif
diff --git a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
similarity index 53%
rename from Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
rename to Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 2b6e6f6c335b..1a008cd4ae32 100644
--- a/Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -51,13 +51,13 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          39   // PD8   X_STOP
-#define Y_MIN_PIN          40   // PD9   Y_STOP
-#define Z_MIN_PIN          41   // PD10  Z_STOP
+#define X_MIN_PIN                             39  // PD8   X_STOP
+#define Y_MIN_PIN                             40  // PD9   Y_STOP
+#define Z_MIN_PIN                             41  // PD10  Z_STOP
 
-#define X_MAX_PIN          44   // PD0   W_STOP
-#define Y_MAX_PIN          43   // PA8   V_STOP
-#define Z_MAX_PIN          42   // PD11  U_STOP
+#define X_MAX_PIN                             44  // PD0   W_STOP
+#define Y_MAX_PIN                             43  // PA8   V_STOP
+#define Z_MAX_PIN                             42  // PD11  U_STOP
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -69,64 +69,64 @@
 //
 // Filament runout
 //
-//#define FIL_RUNOUT_PIN     53   // PA3    BED_THE
+//#define FIL_RUNOUT_PIN                      53  // PA3    BED_THE
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         61  // PE14    X_PWM
-#define X_DIR_PIN          62  // PE15    X_DIR
-#define X_ENABLE_PIN       60  // PE13    X_RES
-#define X_CS_PIN           16  // PA4     SPI_CS
+#define X_STEP_PIN                            61  // PE14    X_PWM
+#define X_DIR_PIN                             62  // PE15    X_DIR
+#define X_ENABLE_PIN                          60  // PE13    X_RES
+#define X_CS_PIN                              16  // PA4     SPI_CS
 
-#define Y_STEP_PIN         64  // PB10    Y_PWM
-#define Y_DIR_PIN          65  // PE9     Y_DIR
-#define Y_ENABLE_PIN       63  // PE10    Y_RES
-#define Y_CS_PIN           16  // PA4     SPI_CS
+#define Y_STEP_PIN                            64  // PB10    Y_PWM
+#define Y_DIR_PIN                             65  // PE9     Y_DIR
+#define Y_ENABLE_PIN                          63  // PE10    Y_RES
+#define Y_CS_PIN                              16  // PA4     SPI_CS
 
-#define Z_STEP_PIN         67  // PC6     Z_PWM
-#define Z_DIR_PIN          68  // PC0     Z_DIR
-#define Z_ENABLE_PIN       66  // PC15    Z_RES
-#define Z_CS_PIN           16  // PA4     SPI_CS
+#define Z_STEP_PIN                            67  // PC6     Z_PWM
+#define Z_DIR_PIN                             68  // PC0     Z_DIR
+#define Z_ENABLE_PIN                          66  // PC15    Z_RES
+#define Z_CS_PIN                              16  // PA4     SPI_CS
 
-#define E0_STEP_PIN        71  // PD12    E1_PW
-#define E0_DIR_PIN         70  // PC13    E1_DIR
-#define E0_ENABLE_PIN      69  // PC14    E1_RE
-#define E0_CS_PIN          16  // PA4     SPI_CS
+#define E0_STEP_PIN                           71  // PD12    E1_PW
+#define E0_DIR_PIN                            70  // PC13    E1_DIR
+#define E0_ENABLE_PIN                         69  // PC14    E1_RE
+#define E0_CS_PIN                             16  // PA4     SPI_CS
 
-#define E1_STEP_PIN        73  // PE5     E2_PWM
-#define E1_DIR_PIN         74  // PE6     E2_DIR
-#define E1_ENABLE_PIN      72  // PE4     E2_RESE
-#define E1_CS_PIN          16  // PA4     SPI_CS
+#define E1_STEP_PIN                           73  // PE5     E2_PWM
+#define E1_DIR_PIN                            74  // PE6     E2_DIR
+#define E1_ENABLE_PIN                         72  // PE4     E2_RESE
+#define E1_CS_PIN                             16  // PA4     SPI_CS
 
-#define E2_STEP_PIN        77  // PB8     E3_PWM
-#define E2_DIR_PIN         76  // PE2     E3_DIR
-#define E2_ENABLE_PIN      75  // PE3     E3_RESE
-#define E2_CS_PIN          16  // PA4     SPI_CS
+#define E2_STEP_PIN                           77  // PB8     E3_PWM
+#define E2_DIR_PIN                            76  // PE2     E3_DIR
+#define E2_ENABLE_PIN                         75  // PE3     E3_RESE
+#define E2_CS_PIN                             16  // PA4     SPI_CS
 
 // needed to pass a sanity check
-#define X2_CS_PIN          16  // PA4     SPI_CS
-#define Y2_CS_PIN          16  // PA4     SPI_CS
-#define Z2_CS_PIN          16  // PA4     SPI_CS
-#define Z3_CS_PIN          16  // PA4     SPI_CS
-#define E3_CS_PIN          16  // PA4     SPI_CS
-#define E4_CS_PIN          16  // PA4     SPI_CS
-#define E5_CS_PIN          16  // PA4     SPI_CS
+#define X2_CS_PIN                             16  // PA4     SPI_CS
+#define Y2_CS_PIN                             16  // PA4     SPI_CS
+#define Z2_CS_PIN                             16  // PA4     SPI_CS
+#define Z3_CS_PIN                             16  // PA4     SPI_CS
+#define E3_CS_PIN                             16  // PA4     SPI_CS
+#define E4_CS_PIN                             16  // PA4     SPI_CS
+#define E5_CS_PIN                             16  // PA4     SPI_CS
 
 #if HAS_L64XX
-  #define L6470_CHAIN_SCK_PIN  17   // PA5
-  #define L6470_CHAIN_MISO_PIN 18   // PA6
-  #define L6470_CHAIN_MOSI_PIN 19   // PA7
-  #define L6470_CHAIN_SS_PIN   16   // PA4
-
-  //#define SCK_PIN        L6470_CHAIN_SCK_PIN
-  //#define MISO_PIN       L6470_CHAIN_MISO_PIN
-  //#define MOSI_PIN       L6470_CHAIN_MOSI_PIN
+  #define L6470_CHAIN_SCK_PIN                 17  // PA5
+  #define L6470_CHAIN_MISO_PIN                18  // PA6
+  #define L6470_CHAIN_MOSI_PIN                19  // PA7
+  #define L6470_CHAIN_SS_PIN                  16  // PA4
+
+  //#define SCK_PIN          L6470_CHAIN_SCK_PIN
+  //#define MISO_PIN        L6470_CHAIN_MISO_PIN
+  //#define MOSI_PIN        L6470_CHAIN_MOSI_PIN
 #else
-  //#define SCK_PIN        13   // PB13    SPI_S
-  //#define MISO_PIN       12   // PB14    SPI_M
-  //#define MOSI_PIN       11   // PB15    SPI_M
+  //#define SCK_PIN                           13  // PB13    SPI_S
+  //#define MISO_PIN                          12  // PB14    SPI_M
+  //#define MOSI_PIN                          11  // PB15    SPI_M
 #endif
 
 /**
@@ -147,64 +147,64 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          3   // Analog input 3,  digital pin 54   PA0     E1_THERMISTOR
-#define TEMP_1_PIN          4   // Analog input 4,  digital pin 55   PA1     E2_THERMISTOR
-#define TEMP_2_PIN          5   // Analog input 5,  digital pin 56   PA2     E3_THERMISTOR
-#define TEMP_BED_PIN        0   // Analog input 0,  digital pin 51   PC2     BED_THERMISTOR_1
-#define TEMP_BED_1_PIN      1   // Analog input 1,  digital pin 52   PC3     BED_THERMISTOR_2
-#define TEMP_BED_2_PIN      2   // Analog input 2,  digital pin 53   PA3     BED_THERMISTOR_3
+#define TEMP_0_PIN                             3  // Analog input 3,  digital pin 54   PA0     E1_THERMISTOR
+#define TEMP_1_PIN                             4  // Analog input 4,  digital pin 55   PA1     E2_THERMISTOR
+#define TEMP_2_PIN                             5  // Analog input 5,  digital pin 56   PA2     E3_THERMISTOR
+#define TEMP_BED_PIN                           0  // Analog input 0,  digital pin 51   PC2     BED_THERMISTOR_1
+#define TEMP_BED_1_PIN                         1  // Analog input 1,  digital pin 52   PC3     BED_THERMISTOR_2
+#define TEMP_BED_2_PIN                         2  // Analog input 2,  digital pin 53   PA3     BED_THERMISTOR_3
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       48   // PC7   E1_HEAT_PWM
-#define HEATER_1_PIN       49   // PB0   E2_HEAT_PWM
-#define HEATER_2_PIN       50   // PB1   E3_HEAT_PWM
-#define HEATER_BED_PIN     46   // PD14 (BED_HEAT_1 FET
-#define HEATER_BED_1_PIN   45   // PD13 (BED_HEAT_2 FET
-#define HEATER_BED_2_PIN   47   // PD15 (BED_HEAT_3 FET
-
-#define FAN_PIN            57   // PC4   E1_FAN   PWM pin, Part cooling fan FET
-#define FAN1_PIN           58   // PC5   E2_FAN   PWM pin, Extruder fan FET
-#define ORIG_E0_AUTO_FAN_PIN  FAN1_PIN
-#define FAN2_PIN           59   // PE8   E3_FAN   PWM pin, Controller fan FET
+#define HEATER_0_PIN                          48  // PC7   E1_HEAT_PWM
+#define HEATER_1_PIN                          49  // PB0   E2_HEAT_PWM
+#define HEATER_2_PIN                          50  // PB1   E3_HEAT_PWM
+#define HEATER_BED_PIN                        46  // PD14 (BED_HEAT_1 FET
+#define HEATER_BED_1_PIN                      45  // PD13 (BED_HEAT_2 FET
+#define HEATER_BED_2_PIN                      47  // PD15 (BED_HEAT_3 FET
+
+#define FAN_PIN                               57  // PC4   E1_FAN   PWM pin, Part cooling fan FET
+#define FAN1_PIN                              58  // PC5   E2_FAN   PWM pin, Extruder fan FET
+#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN
+#define FAN2_PIN                              59  // PE8   E3_FAN   PWM pin, Controller fan FET
 
 //
 // Misc functions
 //
-#define SDSS               16   // PA4    SPI_CS
-#define LED_PIN            -1   // 9 // PE1 green LED   Heart beat
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
-#define POWER_LOSS_PIN     -1   // PWR_LOSS / nAC_FAULT
+#define SDSS                                  16  // PA4    SPI_CS
+#define LED_PIN                               -1  // 9 // PE1 green LED   Heart beat
+#define PS_ON_PIN                             -1
+#define KILL_PIN                              -1
+#define POWER_LOSS_PIN                        -1  // PWR_LOSS / nAC_FAULT
 
 //
 // LCD / Controller
 //
-//#define SD_DETECT_PIN      66   // PA15    SD_CA
-//#define BEEPER_PIN         24   // PC9     SDIO_D1
-//#define LCD_PINS_RS        65   // PE9     Y_DIR
-//#define LCD_PINS_ENABLE    59   // PE8     E3_FAN
-//#define LCD_PINS_D4        10   // PB12    SPI_C
-//#define LCD_PINS_D5        13   // PB13    SPI_S
-//#define LCD_PINS_D6        12   // PB14    SPI_M
-//#define LCD_PINS_D7        11   // PB15    SPI_M
-//#define BTN_EN1            57   // PC4     E1_FAN
-//#define BTN_EN2            58   // PC5     E2_FAN
-//#define BTN_ENC            52   // PC3     BED_THE
+//#define SD_DETECT_PIN                       66  // PA15    SD_CA
+//#define BEEPER_PIN                          24  // PC9     SDIO_D1
+//#define LCD_PINS_RS                         65  // PE9     Y_DIR
+//#define LCD_PINS_ENABLE                     59  // PE8     E3_FAN
+//#define LCD_PINS_D4                         10  // PB12    SPI_C
+//#define LCD_PINS_D5                         13  // PB13    SPI_S
+//#define LCD_PINS_D6                         12  // PB14    SPI_M
+//#define LCD_PINS_D7                         11  // PB15    SPI_M
+//#define BTN_EN1                             57  // PC4     E1_FAN
+//#define BTN_EN2                             58  // PC5     E2_FAN
+//#define BTN_ENC                             52  // PC3     BED_THE
 
 //
 // Extension pins
 //
-//#define EXT0_PIN           49   // PB0     E2_HEAT
-//#define EXT1_PIN           50   // PB1     E3_HEAT
-//#define EXT2_PIN                // PB2    not used (tied to ground
-//#define EXT3_PIN           39   // PD8     X_STOP
-//#define EXT4_PIN           40   // PD9     Y_STOP
-//#define EXT5_PIN           41   // PD10    Z_STOP
-//#define EXT6_PIN           42   // PD11
-//#define EXT7_PIN           71   // PD12    E1_PW
-//#define EXT8_PIN           64   // PB10    Y_PWM
+//#define EXT0_PIN                            49  // PB0     E2_HEAT
+//#define EXT1_PIN                            50  // PB1     E3_HEAT
+//#define EXT2_PIN                                // PB2    not used (tied to ground
+//#define EXT3_PIN                            39  // PD8     X_STOP
+//#define EXT4_PIN                            40  // PD9     Y_STOP
+//#define EXT5_PIN                            41  // PD10    Z_STOP
+//#define EXT6_PIN                            42  // PD11
+//#define EXT7_PIN                            71  // PD12    E1_PW
+//#define EXT8_PIN                            64  // PB10    Y_PWM
 
 // WIFI
 //  2   // PD3   CTS
@@ -215,7 +215,6 @@
 //  7   // PE11  WIFI_RESET
 //  8   // PE12  WIFI_BOOT
 
-
 // I2C USER
 // 14   // PB7   SDA
 // 15   // PB6   SCL
@@ -228,27 +227,27 @@
 //
 // Onboard SD support
 //
-#define SDIO_D0_PIN       23   // PC8   SDIO_D0
-#define SDIO_D1_PIN       24   // PC9   SDIO_D1
-//#define SD_CARD_DETECT_PIN 25   // PA15  SD_CARD_DETECT
-#define SDIO_D2_PIN       26   // PC10  SDIO_D2
-#define SDIO_D3_PIN       27   // PC11  SDIO_D3
-#define SDIO_CK_PIN       28   // PC12  SDIO_CK
-#define SDIO_CMD_PIN      29   // PD2   SDIO_CMD
+#define SDIO_D0_PIN                           23  // PC8   SDIO_D0
+#define SDIO_D1_PIN                           24  // PC9   SDIO_D1
+//#define SD_CARD_DETECT_PIN                  25  // PA15  SD_CARD_DETECT
+#define SDIO_D2_PIN                           26  // PC10  SDIO_D2
+#define SDIO_D3_PIN                           27  // PC11  SDIO_D3
+#define SDIO_CK_PIN                           28  // PC12  SDIO_CK
+#define SDIO_CMD_PIN                          29  // PD2   SDIO_CMD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SDCARD_CONNECTION == ONBOARD
-  #define SDIO_SUPPORT     // Use SDIO for onboard SD
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
 
   #ifndef SDIO_SUPPORT
-    #define SOFTWARE_SPI   // Use soft SPI for onboard SD
-    #define SDSS           SDIO_D3_PIN
-    #define SCK_PIN        SDIO_CK_PIN
-    #define MISO_PIN       SDIO_D0_PIN
-    #define MOSI_PIN       SDIO_CMD_PIN
+    #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
+    #define SDSS                     SDIO_D3_PIN
+    #define SCK_PIN                  SDIO_CK_PIN
+    #define MISO_PIN                 SDIO_D0_PIN
+    #define MOSI_PIN                SDIO_CMD_PIN
   #endif
 #endif
 
@@ -265,16 +264,13 @@
 // USERKET
 // 38   // PE7   USER_BUTTON
 
-
 //  0   // PA9   TX
 //  1   // PA10  RX
 
-
 // IR/PROBE
 // 32   // PD1   IR_OUT
 // 33   // PC1   IR_ON
 
-
 /**
  * Logical pin vs. port/pin cross reference
  *
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
new file mode 100644
index 000000000000..7eb95a4f5044
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -0,0 +1,194 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if !defined(STM32F4) && !defined(STM32F4xx)
+  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+#elif HOTENDS > 2 || E_STEPPERS > 2
+  #error "STM32F4 supports up to 2 hotends / E-steppers."
+#endif
+
+#define DEFAULT_MACHINE_NAME "STM32F446VET6"
+#define BOARD_NAME           "STM32F4 VAkE"
+
+//#define I2C_EEPROM
+
+#define E2END 0xFFF                               // EEPROM end address (4kB)
+
+//
+// Servos
+//
+//#define SERVO0_PIN                        PE13
+//#define SERVO1_PIN                        PE14
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PE10
+#define Y_STOP_PIN                          PE9
+#define Z_STOP_PIN                          PE8
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PA4
+#endif
+
+//
+// Filament runout
+//
+#define FIL_RUNOUT_PIN                      PA3
+
+//
+// Steppers
+//
+
+#define STEPPER_ENABLE_PIN                  PB2
+
+#define X_STEP_PIN                          PC6   // X_STEP
+#define X_DIR_PIN                           PC7   // X_DIR
+#define X_ENABLE_PIN                        PB2   //
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PC8   // X_CS
+#endif
+
+#define Y_STEP_PIN                          PD9   // Y_STEP
+#define Y_DIR_PIN                           PD10  // Y_DIR
+#define Y_ENABLE_PIN                        PB2   //
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PD11  // Y_CS
+#endif
+
+#define Z_STEP_PIN                          PE15  // Z_STEP
+#define Z_DIR_PIN                           PB10  // Z_DIR
+#define Z_ENABLE_PIN                        PB2
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PD8
+#endif
+
+#define E0_STEP_PIN                         PB1
+#define E0_DIR_PIN                          PB13
+#define E0_ENABLE_PIN                       PB2
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PE11
+#endif
+
+#define E1_STEP_PIN                         PC4
+#define E1_DIR_PIN                          PC5
+#define E1_ENABLE_PIN                       PB2
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PB0
+#endif
+
+#define SCK_PIN                             PE12  // PA5   // SPI1 for SD card
+#define MISO_PIN                            PE13  // PA6
+#define MOSI_PIN                            PE14  // PA7
+
+// added for SD card : optional or not ???
+//#define SD_CHIP_SELECT_PIN                SDSS  // The default chip select pin for the SD card is SS.
+// The following three pins must not be redefined for hardware SPI.
+//#define SPI_MOSI_PIN                  MOSI_PIN  // SPI Master Out Slave In pin
+//#define SPI_MISO_PIN                  MISO_PIN  // SPI Master In Slave Out pin
+//#define SPI_SCK_PIN                    SCK_PIN  // SPI Clock pin
+
+//
+// Temperature Sensors (Analog inputs)
+//
+
+#define TEMP_0_PIN                          PC0   // Analog Input
+#define TEMP_1_PIN                          PC1   // Analog Input
+#define TEMP_2_PIN                          PC2   // Analog Input
+#define TEMP_3_PIN                          PC3   // Analog Input
+#define TEMP_BED_PIN                        PC3   // Analog Input
+
+//
+// Heaters / Fans
+//
+
+#define HEATER_0_PIN                        PD15
+#define HEATER_1_PIN                        PD14
+#define HEATER_BED_PIN                      PD12
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PD13
+#endif
+#define FAN1_PIN                            PB5   // PA0
+#define FAN2_PIN                            PB4   // PA1
+
+#define ORIG_E0_AUTO_FAN_PIN                PD13  // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Misc. Functions
+//
+
+//#define CASE_LIGHT_PIN_CI                 PF13
+//#define CASE_LIGHT_PIN_DO                 PF14
+//#define NEOPIXEL_PIN                      PF13
+
+//
+// Prusa i3 MK2 Multi Material Multiplexer Support
+//
+//#define E_MUX0_PIN                        PG3
+//#define E_MUX1_PIN                        PG4
+
+#define LED_PIN                             PB14  // Alive
+#define PS_ON_PIN                           PE0
+#define KILL_PIN                            PD5
+#define POWER_LOSS_PIN                      PA4   // ?? Power loss / nAC_FAULT
+
+#if ENABLED(SDSUPPORT)
+  #define SD_DETECT_PIN                     PB7
+  #define SS_PIN                           PB_15  // USD_CS -> CS for onboard SD
+#endif
+
+//
+// LCD / Controller
+//
+#if HAS_SPI_LCD
+  #if ENABLED(SDSUPPORT)
+    #define SDSS                            PB6   // CS for SD card in LCD
+  #endif
+  #define BEEPER_PIN                        PC9
+  #define LCD_PINS_RS                       PC12
+  #define LCD_PINS_ENABLE                   PD7
+  #define LCD_PINS_D4                       PD1
+  #define LCD_PINS_D5                       PD2
+  #define LCD_PINS_D6                       PD3
+  #define LCD_PINS_D7                       PD4
+  #define BTN_EN1                           PD6
+  #define BTN_EN2                           PD0
+  #define BTN_ENC                           PB12
+#endif
+
+//
+// ST7920 Delays
+//
+#ifndef ST7920_DELAY_1
+  #define ST7920_DELAY_1            DELAY_NS(96)
+#endif
+#ifndef ST7920_DELAY_2
+  #define ST7920_DELAY_2            DELAY_NS(48)
+#endif
+#ifndef ST7920_DELAY_3
+  #define ST7920_DELAY_3           DELAY_NS(715)
+#endif
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
new file mode 100644
index 000000000000..736445cdabe5
--- /dev/null
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -0,0 +1,133 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef STM32F7xx
+  #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
+#endif
+
+#define BOARD_INFO_NAME      "RemRam v1"
+#define DEFAULT_MACHINE_NAME "RemRam"
+
+#define SRAM_EEPROM_EMULATION                     // Emulate the EEPROM using Backup SRAM
+
+#if HOTENDS > 1 || E_STEPPERS > 1
+  #error "RemRam supports only one hotend / E-stepper."
+#endif
+
+//
+// Limit Switches
+//
+#if DISABLED(SENSORLESS_HOMING)
+  #define X_MIN_PIN                           58
+  #define X_MAX_PIN                           59
+  #define Y_MIN_PIN                           60
+  #define Y_MAX_PIN                           61
+  #define Z_MIN_PIN                           62
+  #define Z_MAX_PIN                           63
+#else
+  #define X_STOP_PIN                          36
+  #define Y_STOP_PIN                          39
+  #define Z_MIN_PIN                           62
+  #define Z_MAX_PIN                           42
+#endif
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     26  // EXT_D1
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                            22
+#define X_DIR_PIN                             35
+#define X_ENABLE_PIN                          34
+#define X_CS_PIN                              14
+
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             38
+#define Y_ENABLE_PIN                          37
+#define Y_CS_PIN                              15
+
+#define Z_STEP_PIN                            24
+#define Z_DIR_PIN                             41
+#define Z_ENABLE_PIN                          40
+#define Z_CS_PIN                              16
+
+#define E0_STEP_PIN                           25
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         43
+#define E0_CS_PIN                             10
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                            64  // THERM_1
+#define TEMP_1_PIN                            65  // THERM_2
+#define TEMP_BED_PIN                          66  // THERM_3
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                          33
+#define HEATER_BED_PIN                        31
+
+#ifndef FAN_PIN
+  #define FAN_PIN                             30  // "FAN1"
+#endif
+#define FAN1_PIN                              32  // "FAN2"
+
+#define ORIG_E0_AUTO_FAN_PIN                  32  // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Servos
+//
+#define SERVO0_PIN                            26  // PWM_EXT1
+#define SERVO1_PIN                            27  // PWM_EXT2
+
+#define SDSS                                  57  // Onboard SD card reader
+//#define SDSS                                 9  // LCD SD card reader
+#define LED_PIN                               21  // STATUS_LED
+
+//
+// LCD / Controller
+//
+#define SD_DETECT_PIN                         56  // SD_CARD_DET
+#define BEEPER_PIN                            46  // LCD_BEEPER
+#define LCD_PINS_RS                           49  // LCD_RS
+#define LCD_PINS_ENABLE                       48  // LCD_EN
+#define LCD_PINS_D4                           50  // LCD_D4
+#define LCD_PINS_D5                           51  // LCD_D5
+#define LCD_PINS_D6                           52  // LCD_D6
+#define LCD_PINS_D7                           53  // LCD_D7
+#define BTN_EN1                               54  // BTN_EN1
+#define BTN_EN2                               55  // BTN_EN2
+#define BTN_ENC                               47  // BTN_ENC
+
+//
+// Timers
+//
+
+#define STEP_TIMER                             2
diff --git a/Marlin/src/pins/stm32f7/pins_THE_BORG.h b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
new file mode 100644
index 000000000000..9968d9d1f1f8
--- /dev/null
+++ b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
@@ -0,0 +1,181 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifndef STM32F7
+  #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
+#elif HOTENDS > 3 || E_STEPPERS > 3
+  #error "The-Borg supports up to 3 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME      "The-Borge"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#ifndef E2END
+  #define E2END 0xFFF                             // EEPROM end address
+#endif
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PE9
+#define X_MAX_PIN                           PE10
+#define Y_MIN_PIN                           PE7
+#define Y_MAX_PIN                           PE8
+#define Z_MIN_PIN                           PF15
+#define Z_MAX_PIN                           PG0
+#define E_MIN_PIN                           PE2
+#define E_MAX_PIN                           PE3
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PA4
+#endif
+
+//
+// Steppers
+//
+#define STEPPER_ENABLE_PIN                  PE0
+
+#define X_STEP_PIN                          PC6   // 96, 39 in Arduino
+#define X_DIR_PIN                           PC7
+#define X_ENABLE_PIN                        PC8
+
+#define Y_STEP_PIN                          PD9
+#define Y_DIR_PIN                           PD10
+#define Y_ENABLE_PIN                        PD11
+
+#define Z_STEP_PIN                          PE15
+#define Z_DIR_PIN                           PG1
+#define Z_ENABLE_PIN                        PD8
+
+#define E0_STEP_PIN                         PB1
+#define E0_DIR_PIN                          PB2
+#define E0_ENABLE_PIN                       PE11
+
+#define E1_STEP_PIN                         PC4
+#define E1_DIR_PIN                          PC5
+#define E1_ENABLE_PIN                       PB0
+
+#define E2_STEP_PIN                         PC13
+#define E2_DIR_PIN                          PC14
+#define E2_ENABLE_PIN                       PC15
+
+#define Z2_STEP_PIN                         PC13
+#define Z2_DIR_PIN                          PC14
+#define Z2_ENABLE_PIN                       PC15
+
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
+
+#define SPI1_SCK_PIN                        PA5
+#define SPI1_MISO_PIN                       PA6
+#define SPI1_MOSI_PIN                       PA7
+
+#define SPI6_SCK_PIN                        PG13
+#define SPI6_MISO_PIN                       PG12
+#define SPI6_MOSI_PIN                       PG14
+
+//
+// Temperature Sensors
+//
+
+#define TEMP_0_PIN                          PC3   // Analog Input
+#define TEMP_1_PIN                          PC2   // Analog Input
+#define TEMP_2_PIN                          PC1   // Analog Input
+#define TEMP_3_PIN                          PC0   // Analog Input
+
+#define TEMP_BED_PIN                        PF10  // Analog Input
+
+#define TEMP_5_PIN                          PE12  // Analog Input, Probe temp
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PD15
+#define HEATER_1_PIN                        PD14
+#define HEATER_BED_PIN                      PF6
+
+#ifndef FAN_PIN
+  #define FAN_PIN                           PD13
+#endif
+#define FAN1_PIN                            PA0
+#define FAN2_PIN                            PA1
+
+#define ORIG_E0_AUTO_FAN_PIN                PA1   // Use this by NOT overriding E0_AUTO_FAN_PIN
+
+//
+// Misc. Functions
+//
+
+//#define CASE_LIGHT_PIN_CI                 PF13
+//#define CASE_LIGHT_PIN_DO                 PF14
+//#define NEOPIXEL_PIN                      PF13
+
+//
+// Průša i3 MK2 Multi Material Multiplexer Support
+//
+
+#define E_MUX0_PIN                          PG3
+#define E_MUX1_PIN                          PG4
+
+//
+// Servos
+//
+
+#define SERVO0_PIN                          PE13
+#define SERVO1_PIN                          PE14
+
+#define SDSS                                PA8
+#define SS_PIN                              PA8
+#define LED_PIN                             PA2   // Alive
+#define PS_ON_PIN                           PA3
+#define KILL_PIN                            -1    //PD5   // EXP2-10
+#define PWR_LOSS                            PG5   // Power loss / nAC_FAULT
+
+//
+// MAX7219_DEBUG
+//
+#define MAX7219_CLK_PIN                     PG10  // EXP1-1
+#define MAX7219_DIN_PIN                     PD7   // EXP1-3
+#define MAX7219_LOAD_PIN                    PD1   // EXP1-5
+
+//
+// LCD / Controller
+//
+//#define SD_DETECT_PIN                     -1    //PB6)     // EXP2-4
+#define BEEPER_PIN                          PG10  // EXP1-1
+#define LCD_PINS_RS                         PG9   // EXP1-4
+#define LCD_PINS_ENABLE                     PD7   // EXP1-3
+#define LCD_PINS_D4                         PD1   // EXP1-5
+#define LCD_PINS_D5                         PF0   // EXP1-6
+#define LCD_PINS_D6                         PD3   // EXP1-7
+#define LCD_PINS_D7                         PD4   // EXP1-8
+#define BTN_EN1                             PD6   // EXP2-5
+#define BTN_EN2                             PD0   // EXP2-3
+#define BTN_ENC                             PG11  // EXP1-2
diff --git a/Marlin/src/pins/teensy2/pins_5DPRINT.h b/Marlin/src/pins/teensy2/pins_5DPRINT.h
index 206e22bb9cb7..4ee74660ead9 100644
--- a/Marlin/src/pins/teensy2/pins_5DPRINT.h
+++ b/Marlin/src/pins/teensy2/pins_5DPRINT.h
@@ -78,71 +78,71 @@
 //
 // Servos
 //
-#define SERVO0_PIN        41
-#define SERVO1_PIN        42
-#define SERVO2_PIN        43
-#define SERVO3_PIN        44
+#define SERVO0_PIN                            41
+#define SERVO1_PIN                            42
+#define SERVO2_PIN                            43
+#define SERVO3_PIN                            44
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         37   // E5
-#define Y_STOP_PIN         36   // E4
-#define Z_STOP_PIN         19   // E7
+#define X_STOP_PIN                            37  // E5
+#define Y_STOP_PIN                            36  // E4
+#define Z_STOP_PIN                            19  // E7
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       17   // C7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          17  // C7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       13   // C3
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          13  // C3
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       12   // C2
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          12  // C2
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      11   // C1
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         11  // C1
 
 //
 // Digital Microstepping
 //
-#define X_MS1_PIN          25   // B5
-#define X_MS2_PIN          26   // B6
-#define Y_MS1_PIN           9   // E1
-#define Y_MS2_PIN           8   // E0
-#define Z_MS1_PIN           7   // D7
-#define Z_MS2_PIN           6   // D6
-#define E0_MS1_PIN          5   // D5
-#define E0_MS2_PIN          4   // D4
+#define X_MS1_PIN                             25  // B5
+#define X_MS2_PIN                             26  // B6
+#define Y_MS1_PIN                              9  // E1
+#define Y_MS2_PIN                              8  // E0
+#define Z_MS1_PIN                              7  // D7
+#define Z_MS2_PIN                              6  // D6
+#define E0_MS1_PIN                             5  // D5
+#define E0_MS2_PIN                             4  // D4
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // F1  Analog Input
-#define TEMP_BED_PIN        0   // F0  Analog Input
+#define TEMP_0_PIN                             1  // F1  Analog Input
+#define TEMP_BED_PIN                           0  // F0  Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5
-#define HEATER_BED_PIN     14   // C4
+#define HEATER_0_PIN                          15  // C5
+#define HEATER_BED_PIN                        14  // C4
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6  PWM3A
+  #define FAN_PIN                             16  // C6  PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
+#define SDSS                                  20  // B0
 
 //DIGIPOTS slave addresses
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
 #endif
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
index 22ceb975403f..f7597dbbae74 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
@@ -77,50 +77,50 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         35   // A7
-#define Y_STOP_PIN         34   // A6
-#define Z_STOP_PIN         33   // A5
+#define X_STOP_PIN                            35  // A7
+#define Y_STOP_PIN                            34  // A6
+#define Z_STOP_PIN                            33  // A5
 
 //
 // Steppers
 //
-#define X_STEP_PIN          3   // D3
-#define X_DIR_PIN           5   // D5
-#define X_ENABLE_PIN        4   // D4
-#define X_ATT_PIN           2   // D2
-
-#define Y_STEP_PIN          7   // D7
-#define Y_DIR_PIN           9   // E1
-#define Y_ENABLE_PIN        8   // E0
-#define Y_ATT_PIN           6   // D6
-
-#define Z_STEP_PIN         11   // C1
-#define Z_DIR_PIN          13   // C3
-#define Z_ENABLE_PIN       12   // C2
-#define Z_ATT_PIN          10   // C0
-
-#define E0_STEP_PIN        15   // C5
-#define E0_DIR_PIN         17   // C7
-#define E0_ENABLE_PIN      16   // C6
-#define E0_ATT_PIN         14   // C4
+#define X_STEP_PIN                             3  // D3
+#define X_DIR_PIN                              5  // D5
+#define X_ENABLE_PIN                           4  // D4
+#define X_ATT_PIN                              2  // D2
+
+#define Y_STEP_PIN                             7  // D7
+#define Y_DIR_PIN                              9  // E1
+#define Y_ENABLE_PIN                           8  // E0
+#define Y_ATT_PIN                              6  // D6
+
+#define Z_STEP_PIN                            11  // C1
+#define Z_DIR_PIN                             13  // C3
+#define Z_ENABLE_PIN                          12  // C2
+#define Z_ATT_PIN                             10  // C0
+
+#define E0_STEP_PIN                           15  // C5
+#define E0_DIR_PIN                            17  // C7
+#define E0_ENABLE_PIN                         16  // C6
+#define E0_ATT_PIN                            14  // C4
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // F7  Analog Input
-#define TEMP_BED_PIN        6   // F6  Analog Input
+#define TEMP_0_PIN                             7  // F7  Analog Input
+#define TEMP_BED_PIN                           6  // F6  Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       32   // A4 Extruder
-#define HEATER_BED_PIN     18   // E6 Bed
+#define HEATER_0_PIN                          32  // A4 Extruder
+#define HEATER_BED_PIN                        18  // E6 Bed
 
 #ifndef FAN_PIN
-  #define FAN_PIN          31   // A3 Fan
+  #define FAN_PIN                             31  // A3 Fan
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            19   // E7
+#define LED_PIN                               19  // E7
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
index 88b045b833f6..575428f097b2 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h
@@ -84,55 +84,55 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         45   // F7
-#define Y_STOP_PIN         12   // C2
-#define Z_STOP_PIN         36   // E4
+#define X_STOP_PIN                            45  // F7
+#define Y_STOP_PIN                            12  // C2
+#define Z_STOP_PIN                            36  // E4
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  11   // C1
+  #define Z_MIN_PROBE_PIN                     11  // C1
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN          9   // E1
-#define X_DIR_PIN           8   // E0
-#define X_ENABLE_PIN       23   // B3
+#define X_STEP_PIN                             9  // E1
+#define X_DIR_PIN                              8  // E0
+#define X_ENABLE_PIN                          23  // B3
 
-#define Y_STEP_PIN          7   // D7
-#define Y_DIR_PIN           6   // D6
-#define Y_ENABLE_PIN       20   // B0
+#define Y_STEP_PIN                             7  // D7
+#define Y_DIR_PIN                              6  // D6
+#define Y_ENABLE_PIN                          20  // B0
 
-#define Z_STEP_PIN          5   // D5
-#define Z_DIR_PIN           4   // D4
-#define Z_ENABLE_PIN       37   // E5
+#define Z_STEP_PIN                             5  // D5
+#define Z_DIR_PIN                              4  // D4
+#define Z_ENABLE_PIN                          37  // E5
 
-#define E0_STEP_PIN        47   // E3
-#define E0_DIR_PIN         46   // E2
-#define E0_ENABLE_PIN      25   // B5
+#define E0_STEP_PIN                           47  // E3
+#define E0_DIR_PIN                            46  // E2
+#define E0_ENABLE_PIN                         25  // B5
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          2   // F2  Analog Input
-#define TEMP_1_PIN          1   // F1  Analog Input
-#define TEMP_BED_PIN        0   // F0  Analog Input
+#define TEMP_0_PIN                             2  // F2  Analog Input
+#define TEMP_1_PIN                             1  // F1  Analog Input
+#define TEMP_BED_PIN                           0  // F0  Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       27   // B7
-#define HEATER_BED_PIN     26   // B6  Bed
+#define HEATER_0_PIN                          27  // B7
+#define HEATER_BED_PIN                        26  // B6  Bed
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6  Fan, PWM3A
+  #define FAN_PIN                             16  // C6  Fan, PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
-#define SD_DETECT_PIN      24   // B4
-#define LED_PIN            13   // C3
+#define SDSS                                  20  // B0
+#define SD_DETECT_PIN                         24  // B4
+#define LED_PIN                               13  // C3
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index 4f10e08084ab..68c548f83313 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -74,95 +74,95 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         47   // E3
-#define Y_STOP_PIN         20   // B0 SS
-#define Z_STOP_PIN         36   // E4
+#define X_STOP_PIN                            47  // E3
+#define Y_STOP_PIN                            20  // B0 SS
+#define Z_STOP_PIN                            36  // E4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_1_PIN       44   // F6
-#define HEATER_2_PIN       45   // F7
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_1_PIN                          44  // F6
+#define HEATER_2_PIN                          45  // F7
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               26   // B6 SDCS
-#define FILWIDTH_PIN        2   // Analog Input
+#define SDSS                                  26  // B6 SDCS
+#define FILWIDTH_PIN                           2  // Analog Input
 
 //
 // LCD / Controller
 //
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define LCD_PINS_RS       9   // E1       JP11-11
-  #define LCD_PINS_ENABLE   8   // E0       JP11-10
-  #define LCD_PINS_D4       7   // D7       JP11-8
-  #define LCD_PINS_D5       6   // D6       JP11-7
-  #define LCD_PINS_D6       5   // D5       JP11-6
-  #define LCD_PINS_D7       4   // D4       JP11-5
+  #define LCD_PINS_RS                          9  // E1       JP11-11
+  #define LCD_PINS_ENABLE                      8  // E0       JP11-10
+  #define LCD_PINS_D4                          7  // D7       JP11-8
+  #define LCD_PINS_D5                          6  // D6       JP11-7
+  #define LCD_PINS_D6                          5  // D5       JP11-6
+  #define LCD_PINS_D7                          4  // D4       JP11-5
 
   #if ANY(VIKI2, miniVIKI)
-    #define BEEPER_PIN      8   // E0       JP11-10
+    #define BEEPER_PIN                         8  // E0       JP11-10
 
-    #define DOGLCD_A0      40   // F2       JP2-2
-    #define DOGLCD_CS      41   // F3       JP2-4
+    #define DOGLCD_A0                         40  // F2       JP2-2
+    #define DOGLCD_CS                         41  // F3       JP2-4
     #define LCD_SCREEN_ROT_180
 
-    #define BTN_EN1         2   // D2 TX1   JP2-5
-    #define BTN_EN2         3   // D3 RX1   JP2-7
-    #define BTN_ENC        45   // F7 TDI   JP2-12
+    #define BTN_EN1                            2  // D2 TX1   JP2-5
+    #define BTN_EN2                            3  // D3 RX1   JP2-7
+    #define BTN_ENC                           45  // F7 TDI   JP2-12
 
     #undef SDSS
-    #define SDSS           43   // F5 TMS   JP2-8
+    #define SDSS                              43  // F5 TMS   JP2-8
 
-    #define STAT_LED_RED_PIN  12   // C2    JP11-14
-    #define STAT_LED_BLUE_PIN 10   // C0    JP11-12
+    #define STAT_LED_RED_PIN                  12  // C2    JP11-14
+    #define STAT_LED_BLUE_PIN                 10  // C0    JP11-12
 
   #elif ENABLED(LCD_I2C_PANELOLU2)
 
-    #define BTN_EN1         3   // D3 RX1   JP2-7
-    #define BTN_EN2         2   // D2 TX1   JP2-5
-    #define BTN_ENC        41   // F3       JP2-4
+    #define BTN_EN1                            3  // D3 RX1   JP2-7
+    #define BTN_EN2                            2  // D2 TX1   JP2-5
+    #define BTN_ENC                           41  // F3       JP2-4
     #undef SDSS
-    #define SDSS           38   // F0       B-THERM connector - use SD card on Panelolu2
+    #define SDSS                              38  // F0       B-THERM connector - use SD card on Panelolu2
 
   #else
 
-    #define BTN_EN1        10   // C0       JP11-12
-    #define BTN_EN2        11   // C1       JP11-13
-    #define BTN_ENC        12   // C2       JP11-14
+    #define BTN_EN1                           10  // C0       JP11-12
+    #define BTN_EN2                           11  // C1       JP11-13
+    #define BTN_ENC                           12  // C2       JP11-14
 
   #endif
 
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index c1198a4d4bad..f5f05ddeaf16 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -99,46 +99,46 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         47   // E3
-#define Y_STOP_PIN         24   // B4 PWM2A
-#define Z_STOP_PIN         36   // E4
+#define X_STOP_PIN                            47  // E3
+#define Y_STOP_PIN                            24  // B4 PWM2A
+#define Z_STOP_PIN                            36  // E4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 #if DISABLED(NO_EXTRUDRBOARD)
 #if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
-  #define E1_STEP_PIN      25   // B5
-  #define E1_DIR_PIN       37   // E5
-  #define E1_ENABLE_PIN    42   // F4
+  #define E1_STEP_PIN                         25  // B5
+  #define E1_DIR_PIN                          37  // E5
+  #define E1_ENABLE_PIN                       42  // F4
 
-  #define E2_STEP_PIN       2   // D2
-  #define E2_DIR_PIN        3   // D3
-  #define E2_ENABLE_PIN    43   // F5
+  #define E2_STEP_PIN                          2  // D2
+  #define E2_DIR_PIN                           3  // D3
+  #define E2_ENABLE_PIN                       43  // F5
 #else
-  #define E1_STEP_PIN       2   // D2
-  #define E1_DIR_PIN        3   // D3
-  #define E1_ENABLE_PIN    43   // F5
+  #define E1_STEP_PIN                          2  // D2
+  #define E1_DIR_PIN                           3  // D3
+  #define E1_ENABLE_PIN                       43  // F5
 
-  #define E2_STEP_PIN      25   // B5
-  #define E2_DIR_PIN       37   // E5
-  #define E2_ENABLE_PIN    42   // F4
+  #define E2_STEP_PIN                         25  // B5
+  #define E2_DIR_PIN                          37  // E5
+  #define E2_ENABLE_PIN                       42  // F4
 #endif
 #endif // NO_EXTRUDRBOARD
 
@@ -154,46 +154,46 @@
 #define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
 
 #define DAC_STEPPER_SENSE    0.11
-#define DAC_STEPPER_ADDRESS  0
-#define DAC_STEPPER_MAX   3520
-#define DAC_STEPPER_VREF     1   // internal Vref, gain 1x = 2.048V
-#define DAC_STEPPER_GAIN     0
-#define DAC_OR_ADDRESS    0x00
+#define DAC_STEPPER_ADDRESS                    0
+#define DAC_STEPPER_MAX                      3520
+#define DAC_STEPPER_VREF                       1  // internal Vref, gain 1x = 2.048V
+#define DAC_STEPPER_GAIN                       0
+#define DAC_OR_ADDRESS 0x00
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          1   // Analog Input (Extruder)
-#define TEMP_BED_PIN        0   // Analog Input (Bed)
+#define TEMP_0_PIN                             1  // Analog Input (Extruder)
+#define TEMP_BED_PIN                           0  // Analog Input (Bed)
 
 #if DISABLED(NO_EXTRUDRBOARD)
 #if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
-  #define TEMP_1_PIN        2   // Analog Input (Extrudrboard A THERM)
-  #define TEMP_2_PIN        3   // Analog Input (Extrudrboard B THERM)
+  #define TEMP_1_PIN                           2  // Analog Input (Extrudrboard A THERM)
+  #define TEMP_2_PIN                           3  // Analog Input (Extrudrboard B THERM)
 #else
-  #define TEMP_1_PIN        3   // Analog Input (Extrudrboard B THERM)
-  #define TEMP_2_PIN        2   // Analog Input (Extrudrboard A THERM)
+  #define TEMP_1_PIN                           3  // Analog Input (Extrudrboard B THERM)
+  #define TEMP_2_PIN                           2  // Analog Input (Extrudrboard A THERM)
 #endif
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 
 #if DISABLED(NO_EXTRUDRBOARD)
 #if DISABLED(NO_EXTRUDRBOARD_OUTPUT_SWAP)
-  #define HEATER_1_PIN     44   // F6 - Extrudrboard A HOTEND
-  #define HEATER_2_PIN     45   // F7 - Extrudrboard B HOTEND
+  #define HEATER_1_PIN                        44  // F6 - Extrudrboard A HOTEND
+  #define HEATER_2_PIN                        45  // F7 - Extrudrboard B HOTEND
 #else
-  #define HEATER_1_PIN     45   // F7 - Extrudrboard B HOTEND
-  #define HEATER_2_PIN     44   // F6 - Extrudrboard A HOTEND
+  #define HEATER_1_PIN                        45  // F7 - Extrudrboard B HOTEND
+  #define HEATER_2_PIN                        44  // F6 - Extrudrboard A HOTEND
 #endif
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
@@ -202,49 +202,49 @@
 //#define USE_INTERNAL_SD
 
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS       9   // E1       JP11-11
-  #define LCD_PINS_ENABLE   8   // E0       JP11-10
-  #define LCD_PINS_D4       7   // D7       JP11-8
-  #define LCD_PINS_D5       6   // D6       JP11-7
-  #define LCD_PINS_D6       5   // D5       JP11-6
-  #define LCD_PINS_D7       4   // D4       JP11-5
+  #define LCD_PINS_RS                          9  // E1       JP11-11
+  #define LCD_PINS_ENABLE                      8  // E0       JP11-10
+  #define LCD_PINS_D4                          7  // D7       JP11-8
+  #define LCD_PINS_D5                          6  // D6       JP11-7
+  #define LCD_PINS_D6                          5  // D5       JP11-6
+  #define LCD_PINS_D7                          4  // D4       JP11-5
 
   #if ANY(VIKI2, miniVIKI)
 
-    #define BEEPER_PIN      8   // E0       JP11-10
-    #define DOGLCD_A0      40   // F2       JP2-2
-    #define DOGLCD_CS      41   // F3       JP2-4
+    #define BEEPER_PIN                         8  // E0       JP11-10
+    #define DOGLCD_A0                         40  // F2       JP2-2
+    #define DOGLCD_CS                         41  // F3       JP2-4
     #define LCD_SCREEN_ROT_180
 
-    #define BTN_EN1         2   // D2 TX1   JP2-5
-    #define BTN_EN2         3   // D3 RX1   JP2-7
-    #define BTN_ENC        45   // F7 TDI   JP2-12
+    #define BTN_EN1                            2  // D2 TX1   JP2-5
+    #define BTN_EN2                            3  // D3 RX1   JP2-7
+    #define BTN_ENC                           45  // F7 TDI   JP2-12
 
-    #define SDSS            3   // F5 TMS   JP2-8
+    #define SDSS                               3  // F5 TMS   JP2-8
 
-    #define STAT_LED_RED_PIN  12   // C2       JP11-14
-    #define STAT_LED_BLUE_PIN 10   // C0       JP11-12
+    #define STAT_LED_RED_PIN                  12  // C2       JP11-14
+    #define STAT_LED_BLUE_PIN                 10  // C0       JP11-12
 
   #elif ENABLED(MINIPANEL)
 
     #if DISABLED(USE_INTERNAL_SD)
       //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.   MKSLCD12864 PIN#
-      #define SDSS          11   //      36               C1                EXP2-13             EXP2-07
-      #define SD_DETECT_PIN  9   //      34               E1                EXP2-11             EXP2-04
+      #define SDSS                            11  //      36               C1                EXP2-13             EXP2-07
+      #define SD_DETECT_PIN                    9  //      34               E1                EXP2-11             EXP2-04
     #endif
 
     //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.   MKSLCD12864 PIN#
-    #define DOGLCD_A0       4   //       29               D4                EXP2-05             EXP1-04
-    #define DOGLCD_CS       5   //       30               D5                EXP2-06             EXP1-05
-    #define BTN_ENC         6   //       31               D6                EXP2-07             EXP1-09
-    #define BEEPER_PIN      7   //       32               D7                EXP2-08             EXP1-10
-    #define KILL_PIN        8   //       33               E0                EXP2-10             EXP2-03
-    #define BTN_EN1        10   //       35               C0                EXP2-12             EXP2-06
-    #define BTN_EN2        12   //       37               C2                EXP2-14             EXP2-08
-    //#define LCD_BACKLIGHT_PIN 43   //    56               F5                EXP1-12     Not Implemented
-    //#define SCK          21   //         11               B1                ICSP-04             EXP2-09
-    //#define MOSI         22   //         12               B2                ICSP-03             EXP2-05
-    //#define MISO         23   //         13               B3                ICSP-06             EXP2-05
+    #define DOGLCD_A0                          4  //       29               D4                EXP2-05             EXP1-04
+    #define DOGLCD_CS                          5  //       30               D5                EXP2-06             EXP1-05
+    #define BTN_ENC                            6  //       31               D6                EXP2-07             EXP1-09
+    #define BEEPER_PIN                         7  //       32               D7                EXP2-08             EXP1-10
+    #define KILL_PIN                           8  //       33               E0                EXP2-10             EXP2-03
+    #define BTN_EN1                           10  //       35               C0                EXP2-12             EXP2-06
+    #define BTN_EN2                           12  //       37               C2                EXP2-14             EXP2-08
+    //#define LCD_BACKLIGHT_PIN               43  //    56               F5                EXP1-12     Not Implemented
+    //#define SCK                             21  //         11               B1                ICSP-04             EXP2-09
+    //#define MOSI                            22  //         12               B2                ICSP-03             EXP2-05
+    //#define MISO                            23  //         13               B3                ICSP-06             EXP2-05
 
     // increase delays
     #define BOARD_ST7920_DELAY_1 DELAY_NS(313)
@@ -253,9 +253,9 @@
 
   #else
 
-    #define BTN_EN1        10   // C0       JP11-12
-    #define BTN_EN2        11   // C1       JP11-13
-    #define BTN_ENC        12   // C2       JP11-14
+    #define BTN_EN1                           10  // C0       JP11-12
+    #define BTN_EN2                           11  // C1       JP11-13
+    #define BTN_ENC                           12  // C2       JP11-14
 
   #endif
 
@@ -266,7 +266,7 @@
 //
 //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.
 #ifndef SDSS
-  #define SDSS             20   //       10               B0
+  #define SDSS                                20  //       10               B0
 #endif
 
 /**
@@ -277,5 +277,5 @@
  * which will let you use Channel B on the Extrudrboard as E1.
  */
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      2   // Analog Input
+  #define FILWIDTH_PIN                         2  // Analog Input
 #endif
diff --git a/Marlin/src/pins/teensy2/pins_SAV_MKI.h b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
index 0ced699938c5..01003b056d8e 100644
--- a/Marlin/src/pins/teensy2/pins_SAV_MKI.h
+++ b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
@@ -73,56 +73,56 @@
 //
 // Servos
 //
-#define SERVO0_PIN         39   // F1  In teensy's pin definition for pinMode (in servo.cpp)
+#define SERVO0_PIN                            39  // F1  In teensy's pin definition for pinMode (in servo.cpp)
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         25   // B5
-#define Y_STOP_PIN         26   // B6
-//#define Z_STOP_PIN         27   // B7
-#define Z_STOP_PIN         36   // E4 For inductive sensor.
-//#define E_STOP_PIN         36   // E4
+#define X_STOP_PIN                            25  // B5
+#define Y_STOP_PIN                            26  // B6
+//#define Z_STOP_PIN                          27  // B7
+#define Z_STOP_PIN                            36  // E4 For inductive sensor.
+//#define E_STOP_PIN                          36  // E4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // F7  Analog Input (Extruder)
-#define TEMP_BED_PIN        6   // F6  Analog Input (Bed)
+#define TEMP_0_PIN                             7  // F7  Analog Input (Extruder)
+#define TEMP_BED_PIN                           6  // F6  Analog Input (Bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C - Bed
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C - Bed
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
+#define SDSS                                  20  // B0
 
 // Extension header pin mapping
 // ----------------------------
@@ -133,53 +133,53 @@
 //  PWM-D24         A4 (An), IO
 //  5V              GND
 //  12V             GND
-#define EXT_AUX_SCL_D0      0   // D0  PWM0B
-#define EXT_AUX_SDA_D1      1   // D1
-#define EXT_AUX_RX1_D2      2   // D2
-#define EXT_AUX_TX1_D3      3   // D3
-#define EXT_AUX_PWM_D24    24   // B4  PWM2A
-#define EXT_AUX_A0          0   // F0  Analog Input
-#define EXT_AUX_A0_IO      38   // F0  Digital IO
-#define EXT_AUX_A1          1   // F1  Analog Input
-#define EXT_AUX_A1_IO      39   // F1  Digital IO
-#define EXT_AUX_A2          2   // F2  Analog Input
-#define EXT_AUX_A2_IO      40   // F2  Digital IO
-#define EXT_AUX_A3          3   // F3  Analog Input
-#define EXT_AUX_A3_IO      41   // F3  Digital IO
-#define EXT_AUX_A4          4   // F4  Analog Input
-#define EXT_AUX_A4_IO      42   // F4  Digital IO
+#define EXT_AUX_SCL_D0                         0  // D0  PWM0B
+#define EXT_AUX_SDA_D1                         1  // D1
+#define EXT_AUX_RX1_D2                         2  // D2
+#define EXT_AUX_TX1_D3                         3  // D3
+#define EXT_AUX_PWM_D24                       24  // B4  PWM2A
+#define EXT_AUX_A0                             0  // F0  Analog Input
+#define EXT_AUX_A0_IO                         38  // F0  Digital IO
+#define EXT_AUX_A1                             1  // F1  Analog Input
+#define EXT_AUX_A1_IO                         39  // F1  Digital IO
+#define EXT_AUX_A2                             2  // F2  Analog Input
+#define EXT_AUX_A2_IO                         40  // F2  Digital IO
+#define EXT_AUX_A3                             3  // F3  Analog Input
+#define EXT_AUX_A3_IO                         41  // F3  Digital IO
+#define EXT_AUX_A4                             4  // F4  Analog Input
+#define EXT_AUX_A4_IO                         42  // F4  Digital IO
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         -1
-#define LCD_PINS_RS        -1
-#define LCD_PINS_ENABLE    -1
+#define BEEPER_PIN                            -1
+#define LCD_PINS_RS                           -1
+#define LCD_PINS_ENABLE                       -1
 
 #if ENABLED(SAV_3DLCD)
   // For LCD SHIFT register LCD
-  #define SR_DATA_PIN      EXT_AUX_SDA_D1
-  #define SR_CLK_PIN       EXT_AUX_SCL_D0
+  #define SR_DATA_PIN             EXT_AUX_SDA_D1
+  #define SR_CLK_PIN              EXT_AUX_SCL_D0
 #endif
 
 #if EITHER(SAV_3DLCD, SAV_3DGLCD)
 
-  #define BTN_EN1          EXT_AUX_A1_IO
-  #define BTN_EN2          EXT_AUX_A0_IO
-  #define BTN_ENC          EXT_AUX_PWM_D24
+  #define BTN_EN1                  EXT_AUX_A1_IO
+  #define BTN_EN2                  EXT_AUX_A0_IO
+  #define BTN_ENC                EXT_AUX_PWM_D24
 
-  #define KILL_PIN         EXT_AUX_A2_IO
-  #define HOME_PIN         EXT_AUX_A4_IO
+  #define KILL_PIN                 EXT_AUX_A2_IO
+  #define HOME_PIN                 EXT_AUX_A4_IO
 
-#else // Use the expansion header for spindle control
+#else                                             // Use the expansion header for spindle control
 
   //
   // M3/M4/M5 - Spindle/Laser Control
   //
-  #define SPINDLE_LASER_PWM_PIN    24   // B4  PWM2A
-  #define SPINDLE_LASER_ENA_PIN    39   // F1  Pin should have a pullup!
-  #define SPINDLE_DIR_PIN          40   // F2
+  #define SPINDLE_LASER_PWM_PIN               24  // B4  PWM2A
+  #define SPINDLE_LASER_ENA_PIN               39  // F1  Pin should have a pullup!
+  #define SPINDLE_DIR_PIN                     40  // F2
 
-  #define CASE_LIGHT_PIN            0   // D0  PWM0B
+  #define CASE_LIGHT_PIN                       0  // D0  PWM0B
 
 #endif
diff --git a/Marlin/src/pins/teensy2/pins_TEENSY2.h b/Marlin/src/pins/teensy2/pins_TEENSY2.h
index 985cd46df427..eb116ee3e892 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSY2.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSY2.h
@@ -116,70 +116,70 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          2   // D2
-#define Y_STOP_PIN          3   // D3
-#define Z_STOP_PIN          4   // D4
+#define X_STOP_PIN                             2  // D2
+#define Y_STOP_PIN                             3  // D3
+#define Z_STOP_PIN                             4  // D4
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0 Marlin
-#define X_DIR_PIN          29   // A1 Marlin
-#define X_ENABLE_PIN       26   // B6
+#define X_STEP_PIN                            28  // A0 Marlin
+#define X_DIR_PIN                             29  // A1 Marlin
+#define X_ENABLE_PIN                          26  // B6
 
-#define Y_STEP_PIN         30   // A2 Marlin
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       26   // B6 Shared w/x
+#define Y_STEP_PIN                            30  // A2 Marlin
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          26  // B6 Shared w/x
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       26   // B6 Shared w/x
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          26  // B6 Shared w/x
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      26   // B6 Shared w/x
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         26  // B6 Shared w/x
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // F7 Analog Input (Extruder)
-#define TEMP_BED_PIN        6   // F6 Analog Input (Bed)
+#define TEMP_0_PIN                             7  // F7 Analog Input (Extruder)
+#define TEMP_BED_PIN                           6  // F6 Analog Input (Bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B  Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B  Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A  Fan
+  #define FAN_PIN                             16  // C6 PWM3A  Fan
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0
-#define LED_PIN             6   // D6
-#define PS_ON_PIN          27   // B7
-#define CASE_LIGHT_PIN      1   // D1 PWM2B  MUST BE HARDWARE PWM
+#define SDSS                                  20  // B0
+#define LED_PIN                                6  // D6
+#define PS_ON_PIN                             27  // B7
+#define CASE_LIGHT_PIN                         1  // D1 PWM2B  MUST BE HARDWARE PWM
 
 //
 // LCD / Controller
 //
 #if ENABLED(ULTIPANEL)
-  #define LCD_PINS_RS       8   // E0
-  #define LCD_PINS_ENABLE   9   // E1
-  #define LCD_PINS_D4      10   // C0
-  #define LCD_PINS_D5      11   // C1
-  #define LCD_PINS_D6      12   // C2
-  #define LCD_PINS_D7      13   // C3
-  #define BTN_EN1          38   // F0
-  #define BTN_EN2          39   // F1
-  #define BTN_ENC          40   // F2
+  #define LCD_PINS_RS                          8  // E0
+  #define LCD_PINS_ENABLE                      9  // E1
+  #define LCD_PINS_D4                         10  // C0
+  #define LCD_PINS_D5                         11  // C1
+  #define LCD_PINS_D6                         12  // C2
+  #define LCD_PINS_D7                         13  // C3
+  #define BTN_EN1                             38  // F0
+  #define BTN_EN2                             39  // F1
+  #define BTN_ENC                             40  // F2
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENA_PIN     5   // D5  Pin should have a pullup!
-#define SPINDLE_LASER_PWM_PIN     0   // D0 PWM0B   MUST BE HARDWARE PWM
-#define SPINDLE_DIR_PIN           7   // D7
+#define SPINDLE_LASER_ENA_PIN                  5  // D5  Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN                  0  // D0 PWM0B   MUST BE HARDWARE PWM
+#define SPINDLE_DIR_PIN                        7  // D7
diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
index 72eb21c1aaac..05f433cb8928 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
@@ -82,82 +82,81 @@
 //
 // Limit Switch definitions that match the SCHEMATIC
 //
-//#define X_STOP_PIN       25   // B5
-//#define Y_STOP_PIN       26   // B6
-//#define Z_STOP_PIN       27   // B7
-//#define E_STOP_PIN       36   // E4
-
+//#define X_STOP_PIN                          25  // B5
+//#define Y_STOP_PIN                          26  // B6
+//#define Z_STOP_PIN                          27  // B7
+//#define E_STOP_PIN                          36  // E4
 
 //
 // Limit Switch definitions that match the SILKSCREEN
 //
-#define X_STOP_PIN         26   // B6
-#define Y_STOP_PIN         27   // B7
-#define Z_STOP_PIN         36   // E4
-//#define E_STOP_PIN       25   // B5
+#define X_STOP_PIN                            26  // B6
+#define Y_STOP_PIN                            27  // B7
+#define Z_STOP_PIN                            36  // E4
+//#define E_STOP_PIN                          25  // B5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28   // A0
-#define X_DIR_PIN          29   // A1
-#define X_ENABLE_PIN       19   // E7
+#define X_STEP_PIN                            28  // A0
+#define X_DIR_PIN                             29  // A1
+#define X_ENABLE_PIN                          19  // E7
 
-#define Y_STEP_PIN         30   // A2
-#define Y_DIR_PIN          31   // A3
-#define Y_ENABLE_PIN       18   // E6
+#define Y_STEP_PIN                            30  // A2
+#define Y_DIR_PIN                             31  // A3
+#define Y_ENABLE_PIN                          18  // E6
 
-#define Z_STEP_PIN         32   // A4
-#define Z_DIR_PIN          33   // A5
-#define Z_ENABLE_PIN       17   // C7
+#define Z_STEP_PIN                            32  // A4
+#define Z_DIR_PIN                             33  // A5
+#define Z_ENABLE_PIN                          17  // C7
 
-#define E0_STEP_PIN        34   // A6
-#define E0_DIR_PIN         35   // A7
-#define E0_ENABLE_PIN      13   // C3
+#define E0_STEP_PIN                           34  // A6
+#define E0_DIR_PIN                            35  // A7
+#define E0_ENABLE_PIN                         13  // C3
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input (Extruder)
-#define TEMP_BED_PIN        6   // Analog Input (Bed)
+#define TEMP_0_PIN                             7  // Analog Input (Extruder)
+#define TEMP_BED_PIN                           6  // Analog Input (Bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       15   // C5 PWM3B - Extruder
-#define HEATER_BED_PIN     14   // C4 PWM3C
+#define HEATER_0_PIN                          15  // C5 PWM3B - Extruder
+#define HEATER_BED_PIN                        14  // C4 PWM3C
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // C6 PWM3A
+  #define FAN_PIN                             16  // C6 PWM3A
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               20   // B0 JP31-6
-#define CASE_LIGHT_PIN      0   // D0 IO-14  PWM0B
+#define SDSS                                  20  // B0 JP31-6
+#define CASE_LIGHT_PIN                         0  // D0 IO-14  PWM0B
 
 //
 // LCD / Controller
 //
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define BEEPER_PIN       -1
+  #define BEEPER_PIN                          -1
 
   #if ENABLED(LCD_I2C_PANELOLU2)
-    #define BTN_EN1         3   // D3 IO-8
-    #define BTN_EN2         2   // D2 IO-10
-    #define BTN_ENC        41   // F3 IO-7
-    #define SDSS           38   // F0 IO-13 use SD card on Panelolu2
+    #define BTN_EN1                            3  // D3 IO-8
+    #define BTN_EN2                            2  // D2 IO-10
+    #define BTN_ENC                           41  // F3 IO-7
+    #define SDSS                              38  // F0 IO-13 use SD card on Panelolu2
   #endif
 
-  #define SD_DETECT_PIN    -1
+  #define SD_DETECT_PIN                       -1
 
 #endif // HAS_SPI_LCD && NEWPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN    24   // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENA_PIN    39   // F1 IO-11 - Pin should have a pullup!
-#define SPINDLE_DIR_PIN          40   // F2 IO-9
+#define SPINDLE_LASER_PWM_PIN                 24  // B4 IO-3 PWM2A - MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENA_PIN                 39  // F1 IO-11 - Pin should have a pullup!
+#define SPINDLE_DIR_PIN                       40  // F2 IO-9
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
index 6c43c4aaa8a2..0f895c9e6bdf 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY31_32.h
@@ -35,87 +35,87 @@
   #define BOARD_INFO_NAME "Teensy3.2"
 #endif
 
-#define AT90USB 1286   // Disable MarlinSerial etc.
+#define AT90USB                              1286 // Disable MarlinSerial etc.
 #define USBCON //1286  // Disable MarlinSerial etc.
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN          4
-#define Z_STOP_PIN          5
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                             4
+#define Z_STOP_PIN                             5
 
 //
 // Steppers
 //
-#define X_STEP_PIN          5
-#define X_DIR_PIN           6
-#define X_ENABLE_PIN        2
+#define X_STEP_PIN                             5
+#define X_DIR_PIN                              6
+#define X_ENABLE_PIN                           2
 
-#define Y_STEP_PIN          7
-#define Y_DIR_PIN           8
-#define Y_ENABLE_PIN        2
+#define Y_STEP_PIN                             7
+#define Y_DIR_PIN                              8
+#define Y_ENABLE_PIN                           2
 
-#define Z_STEP_PIN          9
-#define Z_DIR_PIN          10
-#define Z_ENABLE_PIN        2
+#define Z_STEP_PIN                             9
+#define Z_DIR_PIN                             10
+#define Z_ENABLE_PIN                           2
 
-#define E0_STEP_PIN        11
-#define E0_DIR_PIN         12
-#define E0_ENABLE_PIN       2
+#define E0_STEP_PIN                           11
+#define E0_DIR_PIN                            12
+#define E0_ENABLE_PIN                          2
 
-//#define E1_STEP_PIN        33
-//#define E1_DIR_PIN         34
-//#define E1_ENABLE_PIN      35
+//#define E1_STEP_PIN                         33
+//#define E1_DIR_PIN                          34
+//#define E1_ENABLE_PIN                       35
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       20
+#define HEATER_0_PIN                          20
 // #define HEATER_1_PIN      36
-#define HEATER_BED_PIN     21
+#define HEATER_BED_PIN                        21
 #ifndef FAN_PIN
-  #define FAN_PIN          22
+  #define FAN_PIN                             22
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         14   // Analog Input - Extruder 2 => A2
-//#define TEMP_1_PIN          0   // Analog Input
-#define TEMP_BED_PIN       15   // Analog Input - Bed
+#define TEMP_0_PIN                            14  // Analog Input - Extruder 2 => A2
+//#define TEMP_1_PIN                           0  // Analog Input
+#define TEMP_BED_PIN                          15  // Analog Input - Bed
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      6   // Analog Input
+  #define FILWIDTH_PIN                         6  // Analog Input
 #endif
 
 //
 // Misc. Functions
 //
 
-//#define SDSS               16   // 8
-#define LED_PIN            13
+//#define SDSS                                16  // 8
+#define LED_PIN                               13
 
-//#define SOL1_PIN           28
+//#define SOL1_PIN                            28
 
 //
 // LCD / Controller
 //
 
-//#define SCK_PIN            13
-//#define MISO_PIN           12
-//#define MOSI_PIN           11
+//#define SCK_PIN                             13
+//#define MISO_PIN                            12
+//#define MOSI_PIN                            11
 
 /*
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS      40
-  #define LCD_PINS_ENABLE  41
-  #define LCD_PINS_D4      42
-  #define LCD_PINS_D5      43
-  #define LCD_PINS_D6      44
-  #define LCD_PINS_D7      45
-  #define BTN_EN1          46
-  #define BTN_EN2          47
-  #define BTN_ENC          48
+  #define LCD_PINS_RS                         40
+  #define LCD_PINS_ENABLE                     41
+  #define LCD_PINS_D4                         42
+  #define LCD_PINS_D5                         43
+  #define LCD_PINS_D6                         44
+  #define LCD_PINS_D7                         45
+  #define BTN_EN1                             46
+  #define BTN_EN2                             47
+  #define BTN_ENC                             48
 #endif
 */
diff --git a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
index 28fd51b8a058..8528533d7b8b 100644
--- a/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
+++ b/Marlin/src/pins/teensy3/pins_TEENSY35_36.h
@@ -37,7 +37,7 @@
   #define BOARD_INFO_NAME "Teensy3.6"
 #endif
 
-#define AT90USB 1286   // Disable MarlinSerial etc.
+#define AT90USB                              1286 // Disable MarlinSerial etc.
 #define USBCON //1286  // Disable MarlinSerial etc.
 /*
 
@@ -83,80 +83,80 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
 //
 // Limit Switches
 //
-#define X_STOP_PIN         24
-#define Y_STOP_PIN         26
-#define Z_STOP_PIN         28
+#define X_STOP_PIN                            24
+#define Y_STOP_PIN                            26
+#define Z_STOP_PIN                            28
 
 //
 // Steppers
 //
-#define X_STEP_PIN         22
-#define X_DIR_PIN          21
-#define X_ENABLE_PIN       39
+#define X_STEP_PIN                            22
+#define X_DIR_PIN                             21
+#define X_ENABLE_PIN                          39
 
-#define Y_STEP_PIN         19
-#define Y_DIR_PIN          18
-#define Y_ENABLE_PIN       20
+#define Y_STEP_PIN                            19
+#define Y_DIR_PIN                             18
+#define Y_ENABLE_PIN                          20
 
-#define Z_STEP_PIN         38
-#define Z_DIR_PIN          37
-#define Z_ENABLE_PIN       17
+#define Z_STEP_PIN                            38
+#define Z_DIR_PIN                             37
+#define Z_ENABLE_PIN                          17
 
-#define E0_STEP_PIN        31
-#define E0_DIR_PIN         30
-#define E0_ENABLE_PIN      32
+#define E0_STEP_PIN                           31
+#define E0_DIR_PIN                            30
+#define E0_ENABLE_PIN                         32
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      35
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         35
 
-#define HEATER_0_PIN       30
-#define HEATER_1_PIN       36
-#define HEATER_BED_PIN     31
+#define HEATER_0_PIN                          30
+#define HEATER_1_PIN                          36
+#define HEATER_BED_PIN                        31
 #ifndef FAN_PIN
-  #define FAN_PIN           2
+  #define FAN_PIN                              2
 #endif
 
-#define TEMP_0_PIN          2   // Extruder / Analog pin numbering: 2 => A2
-#define TEMP_1_PIN          0
-#define TEMP_BED_PIN        1   // Bed / Analog pin numbering
+#define TEMP_0_PIN                             2  // Extruder / Analog pin numbering: 2 => A2
+#define TEMP_1_PIN                             0
+#define TEMP_BED_PIN                           1  // Bed / Analog pin numbering
 
-#define SDSS               39   // 8
-#define LED_PIN            13
-#define PS_ON_PIN           1
-#define ALARM_PIN          -1
+#define SDSS                                  39  // 8
+#define LED_PIN                               13
+#define PS_ON_PIN                              1
+#define ALARM_PIN                             -1
 
-#define FILWIDTH_PIN        6
-#define SOL1_PIN           28
+#define FILWIDTH_PIN                           6
+#define SOL1_PIN                              28
 
 #if 0
 // Pretty sure this is obsolete!
 // Please use Marlin 1.1.x pins files as reference for new pins files.
 #ifndef SDSUPPORT
   // these are defined in the SD library if building with SD support
-  #define SCK_PIN          13
-  #define MISO_PIN         12
-  #define MOSI_PIN         11
+  #define SCK_PIN                             13
+  #define MISO_PIN                            12
+  #define MOSI_PIN                            11
 #endif
 #endif
 
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS      40
-  #define LCD_PINS_ENABLE  41
-  #define LCD_PINS_D4      42
-  #define LCD_PINS_D5      43
-  #define LCD_PINS_D6      44
-  #define LCD_PINS_D7      45
+  #define LCD_PINS_RS                         40
+  #define LCD_PINS_ENABLE                     41
+  #define LCD_PINS_D4                         42
+  #define LCD_PINS_D5                         43
+  #define LCD_PINS_D6                         44
+  #define LCD_PINS_D7                         45
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          46
-  #define BTN_EN2          47
-  #define BTN_ENC          48
+  #define BTN_EN1                             46
+  #define BTN_EN2                             47
+  #define BTN_ENC                             48
 #endif
 
 #if ENABLED(REPRAPWORLD_KEYPAD)
-  #define SHIFT_OUT        40
-  #define SHIFT_CLK        44
-  #define SHIFT_LD         42
+  #define SHIFT_OUT                           40
+  #define SHIFT_CLK                           44
+  #define SHIFT_LD                            42
 #endif
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index f82fab1b50a8..ba233d36f625 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -74,7 +74,7 @@
   #else
     static uint8_t CRC7(const uint8_t* data, uint8_t n) {
       uint8_t crc = 0;
-      for (uint8_t i = 0; i < n; i++) {
+      LOOP_L_N(i, n) {
         uint8_t d = data[i];
         d ^= crc << 1;
         if (d & 0x80) d ^= 9;
@@ -106,7 +106,7 @@ uint8_t Sd2Card::cardCommand(const uint8_t cmd, const uint32_t arg) {
     d[5] = CRC7(d, 5);
 
     // Send message
-    for (uint8_t k = 0; k < 6; k++) spiSend(d[k]);
+    LOOP_L_N(k, 6) spiSend(d[k]);
 
   #else
     // Send command
@@ -246,7 +246,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
   spiInit(spiRate_);
 
   // Must supply min of 74 clock cycles with CS high.
-  for (uint8_t i = 0; i < 10; i++) spiSend(0xFF);
+  LOOP_L_N(i, 10) spiSend(0xFF);
 
   watchdog_refresh(); // In case init takes too long
 
@@ -272,7 +272,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
     }
 
     // Get the last byte of r7 response
-    for (uint8_t i = 0; i < 4; i++) status_ = spiRec();
+    LOOP_L_N(i, 4) status_ = spiRec();
     if (status_ == 0xAA) {
       type(SD_CARD_TYPE_SD2);
       break;
@@ -303,7 +303,7 @@ bool Sd2Card::init(const uint8_t sckRateID, const pin_t chipSelectPin) {
     }
     if ((spiRec() & 0xC0) == 0xC0) type(SD_CARD_TYPE_SDHC);
     // Discard rest of ocr - contains allowed voltage range
-    for (uint8_t i = 0; i < 3; i++) spiRec();
+    LOOP_L_N(i, 3) spiRec();
   }
   chipDeselect();
 
diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index cdb1072cbef7..27c191a6a6ae 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -204,7 +204,7 @@ bool SdBaseFile::dirEntry(dir_t* dir) {
  */
 void SdBaseFile::dirName(const dir_t& dir, char* name) {
   uint8_t j = 0;
-  for (uint8_t i = 0; i < 11; i++) {
+  LOOP_L_N(i, 11) {
     if (dir.name[i] == ' ')continue;
     if (i == 8) name[j++] = '.';
     name[j++] = dir.name[i];
@@ -345,10 +345,10 @@ int8_t SdBaseFile::lsPrintNext(uint8_t flags, uint8_t indent) {
         && DIR_IS_FILE_OR_SUBDIR(&dir)) break;
   }
   // indent for dir level
-  for (uint8_t i = 0; i < indent; i++) SERIAL_CHAR(' ');
+  LOOP_L_N(i, indent) SERIAL_CHAR(' ');
 
   // print name
-  for (uint8_t i = 0; i < 11; i++) {
+  LOOP_L_N(i, 11) {
     if (dir.name[i] == ' ')continue;
     if (i == 8) {
       SERIAL_CHAR('.');
@@ -478,7 +478,7 @@ bool SdBaseFile::mkdir(SdBaseFile* parent, const uint8_t dname[11]) {
   // make entry for '.'
   memcpy(&d, p, sizeof(d));
   d.name[0] = '.';
-  for (uint8_t i = 1; i < 11; i++) d.name[i] = ' ';
+  LOOP_S_L_N(i, 1, 11) d.name[i] = ' ';
 
   // cache block for '.'  and '..'
   block = vol_->clusterStartBlock(firstCluster_);
@@ -1088,7 +1088,7 @@ int8_t SdBaseFile::readDir(dir_t* dir, char* longFilename) {
         if (WITHIN(seq, 1, MAX_VFAT_ENTRIES)) {
           // TODO: Store the filename checksum to verify if a long-filename-unaware system modified the file table.
           n = (seq - 1) * (FILENAME_LENGTH);
-          for (uint8_t i = 0; i < FILENAME_LENGTH; i++)
+          LOOP_L_N(i, FILENAME_LENGTH)
             longFilename[n + i] = (i < 5) ? VFAT->name1[i] : (i < 11) ? VFAT->name2[i - 5] : VFAT->name3[i - 11];
           // If this VFAT entry is the last one, add a NUL terminator at the end of the string
           if (VFAT->sequenceNumber & 0x40) longFilename[n + FILENAME_LENGTH] = '\0';
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index b2b0d90e9671..80e94b88b580 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -35,11 +35,11 @@
 #include "../module/configuration_store.h"
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../feature/emergency_parser.h"
+  #include "../feature/e_parser.h"
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -49,7 +49,6 @@
 // public:
 
 card_flags_t CardReader::flag;
-uint8_t CardReader::sdprinting_done_state;
 char CardReader::filename[FILENAME_LENGTH], CardReader::longFilename[LONG_FILENAME_LENGTH];
 int8_t CardReader::autostart_index;
 
@@ -143,7 +142,7 @@ CardReader::CardReader() {
 //
 char *createFilename(char * const buffer, const dir_t &p) {
   char *pos = buffer;
-  for (uint8_t i = 0; i < 11; i++) {
+  LOOP_L_N(i, 11) {
     if (p.name[i] == ' ') continue;
     if (i == 8) *pos++ = '.';
     *pos++ = p.name[i];
@@ -370,7 +369,7 @@ void CardReader::mount() {
   else {
     flag.mounted = true;
     SERIAL_ECHO_MSG(STR_SD_CARD_OK);
-    #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+    #if ENABLED(SDCARD_EEPROM_EMULATION)
       settings.first_load();
     #endif
   }
@@ -435,7 +434,7 @@ void CardReader::getAbsFilename(char *dst) {
     if (cnt < MAXPATHNAMELENGTH) { *dst = '/'; dst++; cnt++; }
   };
 
-  for (uint8_t i = 0; i < workDirDepth; i++)                // Loop down to current work dir
+  LOOP_L_N(i, workDirDepth)                // Loop down to current work dir
     appendAtom(workDirParents[i]);
 
   if (cnt < MAXPATHNAMELENGTH - (FILENAME_LENGTH) - 1) {    // Leave room for filename and nul
@@ -451,10 +450,12 @@ void openFailed(const char * const fname) {
 
 void announceOpen(const uint8_t doing, const char * const path) {
   if (doing) {
+    PORT_REDIRECT(SERIAL_BOTH);
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Now ");
     serialprintPGM(doing == 1 ? PSTR("doing") : PSTR("fresh"));
     SERIAL_ECHOLNPAIR(" file: ", path);
+    PORT_RESTORE();
   }
 }
 
@@ -511,8 +512,11 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
   if (file.open(curDir, fname, O_READ)) {
     filesize = file.fileSize();
     sdpos = 0;
+
+    PORT_REDIRECT(SERIAL_BOTH);
     SERIAL_ECHOLNPAIR(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
     SERIAL_ECHOLNPGM(STR_SD_FILE_SELECTED);
+    PORT_RESTORE();
 
     selectFileByName(fname);
     ui.set_status(longFilename[0] ? longFilename : fname);
@@ -617,7 +621,7 @@ void CardReader::checkautostart() {
   if (autostart_index < 0 || flag.sdprinting) return;
 
   if (!isMounted()) mount();
-  #if ENABLED(EEPROM_SETTINGS) && NONE(FLASH_EEPROM_EMULATION, SPI_EEPROM, I2C_EEPROM)
+  #if ENABLED(SDCARD_EEPROM_EMULATION)
     else settings.first_load();
   #endif
 
@@ -1041,7 +1045,7 @@ void CardReader::cdroot() {
       #if ENABLED(SDSORT_DYNAMIC_RAM)
         delete sort_order;
         #if ENABLED(SDSORT_CACHE_NAMES)
-          for (uint8_t i = 0; i < sort_count; ++i) {
+          LOOP_L_N(i, sort_count) {
             free(sortshort[i]); // strdup
             free(sortnames[i]); // strdup
           }
@@ -1084,7 +1088,7 @@ void CardReader::fileHasFinished() {
       presort();
     #endif
 
-    sdprinting_done_state = 1;
+    marlin_state = MF_SD_COMPLETE;
   }
 }
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index be700401eed4..955a8b69b39e 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -49,7 +49,6 @@ typedef struct {
 
 class CardReader {
 public:
-  static uint8_t sdprinting_done_state;
   static card_flags_t flag;                         // Flags (above)
   static char filename[FILENAME_LENGTH],            // DOS 8.3 filename of the selected item
               longFilename[LONG_FILENAME_LENGTH];   // Long name of the selected item
@@ -276,11 +275,7 @@ class CardReader {
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
   #define IS_SD_INSERTED() Sd2Card::isInserted()
 #elif PIN_EXISTS(SD_DETECT)
-  #if ENABLED(SD_DETECT_INVERTED)
-    #define IS_SD_INSERTED()  READ(SD_DETECT_PIN)
-  #else
-    #define IS_SD_INSERTED() !READ(SD_DETECT_PIN)
-  #endif
+  #define IS_SD_INSERTED() (READ(SD_DETECT_PIN) == SD_DETECT_STATE)
 #else
   // No card detect line? Assume the card is inserted.
   #define IS_SD_INSERTED() true
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index 1aeaa4d700d2..67a75f5b47fe 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -30,7 +30,7 @@
 
 env.Replace(
 	UPLOADER=UPLOAD_TOOL,
-	UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr $UPLOAD_PORT -R -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"")
+	UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT")
 )
 
 # Python callback
diff --git a/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c b/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
index 3f639f092c60..7f5ca783560c 100644
--- a/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c
@@ -323,7 +323,7 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
     {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
   #else
-  #error "USB in HS mode isn't supported by the board"
+    #error "USB in HS mode isn't supported by the board"
     {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
     {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1
     {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2
@@ -334,7 +334,8 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP
     {PC_2,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_DIR
     {PC_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_NXT
-  #endif /* USE_USB_HS_IN_FS */
+  #endif // USE_USB_HS_IN_FS
+  */
   {NC,    NP,    0}
 };
 #endif
diff --git a/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
index fd1f29645957..a772f64fb7ee 100644
--- a/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c
@@ -355,7 +355,7 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
     {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
   #else
-  #error "USB in HS mode isn't supported by the board"
+    #error "USB in HS mode isn't supported by the board"
     {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
     {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1
     {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2
@@ -366,7 +366,8 @@ const PinMap PinMap_USB_OTG_HS[] = { /*
     {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP
     {PC_2,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_DIR
     {PC_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_NXT
-  #endif /* USE_USB_HS_IN_FS */
+  #endif // USE_USB_HS_IN_FS
+  */
   {NC,    NP,    0}
 };
 #endif
diff --git a/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h b/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
index be04ef6b86c3..de34697fb36c 100644
--- a/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
+++ b/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
@@ -115,7 +115,7 @@ extern "C" {
 #define NUM_ANALOG_FIRST        80
 
 // PWM resolution
-#define PWM_RESOLUTION          8
+#define PWM_RESOLUTION          12
 #define PWM_FREQUENCY           20000 // >= 20 Khz => inaudible noise for fans
 #define PWM_MAX_DUTY_CYCLE      255
 
diff --git a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
index ffdb81a636ed..571f3207e9a6 100644
--- a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
@@ -195,7 +195,7 @@ extern "C" {
   #define PIN_SERIAL2_RX        PD6
   #define PIN_SERIAL2_TX        PD5
 #else
-  #error'Invalid setting for SERIAL_UART_INSTANCE'
+  #error "Invalid setting for SERIAL_UART_INSTANCE."
 #endif
 
 // Timer Definitions
diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index 0b2d9ef78f55..62186a5f8206 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -34,9 +34,9 @@ case $TESTENV in
     lin*) TESTENV='linux_native' ;;
  lpc?(8)) TESTENV='LPC1768' ;;
     lpc9) TESTENV='LPC1769' ;;
-    m128) TESTENV='megaatmega1280' ;;
-    m256) TESTENV='megaatmega2560' ;;
-    mega) TESTENV='megaatmega2560' ;;
+    m128) TESTENV='mega1280' ;;
+    m256) TESTENV='mega2560' ;;
+    mega) TESTENV='mega2560' ;;
      stm) TESTENV='STM32F103RE' ;;
       f1) TESTENV='STM32F103RE' ;;
       f4) TESTENV='STM32F4' ;;
@@ -215,6 +215,9 @@ echo "$OUT" | {
   done
 }
 
+# Make clear it's a TEST
+opt_set CUSTOM_MACHINE_NAME "\"$TESTENV-tests ($CHOICE)\""
+
 # Get a -y parameter the lazy way
 [[ "$2" == "-y" || "$3" == "-y" ]] && BUILD_YES='Y'
 
diff --git a/buildroot/share/scripts/MarlinMesh.scad b/buildroot/share/scripts/MarlinMesh.scad
index 7616ded699a0..6d78bb96492d 100644
--- a/buildroot/share/scripts/MarlinMesh.scad
+++ b/buildroot/share/scripts/MarlinMesh.scad
@@ -10,17 +10,13 @@
  *                                      *
  \**************************************/
 
-//$t = 0.15; // comment out during animation
+$t = 0.15; // comment out during animation!
+X = 0; Y = 1;
+L = 0; R = 1; F = 2; B = 3;
 
 //
-// Mesh info and points
+// Sample Mesh - Replace with your own
 //
-
-mesh_width    = 200;   // X Size in mm of the probed area
-mesh_height   = 200;   // Y Size...
-zprobe_offset = 0;     // Added to the points
-NAN           = 0;     // Z to use for un-measured points
-
 measured_z = [
   [ -1.20, -1.13, -1.09, -1.03, -1.19 ],
   [ -1.16, -1.25, -1.27, -1.25, -1.08 ],
@@ -29,6 +25,28 @@ measured_z = [
   [ -1.13, -0.99, -1.03, -1.06, -1.32 ]
 ];
 
+//
+// An offset to add to all points in the mesh
+//
+zadjust     = 0;
+
+//
+// Mesh characteristics
+//
+bed_size = [ 200, 200 ];
+
+mesh_inset  = [ 10, 10, 10, 10 ]; // L, F, R, B
+
+mesh_bounds = [
+  [ mesh_inset[L], mesh_inset[F] ],
+  [ bed_size[X] - mesh_inset[R], bed_size[Y] - mesh_inset[B] ]
+];
+
+mesh_size = mesh_bounds[1] - mesh_bounds[0];
+
+                      // NOTE: Marlin meshes already subtract the probe offset
+NAN         = 0;      // Z to use for un-measured points
+
 //
 // Geometry
 //
@@ -45,6 +63,7 @@ alternation   = 2;     // direction change modulus (try it)
 
 show_plane    = true;
 show_labels   = true;
+show_coords   = true;
 arrow_length  = 5;
 
 label_font_lg = "Arial";
@@ -62,8 +81,8 @@ mean_value = (big_z + lil_z) / 2.0;
 mesh_points_y = len(measured_z);
 mesh_points_x = len(measured_z[0]);
 
-xspace = mesh_width / (mesh_points_x - 1);
-yspace = mesh_height / (mesh_points_y - 1);
+xspace = mesh_size[X] / (mesh_points_x - 1);
+yspace = mesh_size[Y] / (mesh_points_y - 1);
 
 // At $t=0 and $t=1 scale will be 100%
 z_scale_factor = min_z_scale + (($t > 0.5) ? 1.0 - $t : $t) * (max_z_scale - min_z_scale) * 2;
@@ -72,6 +91,8 @@ z_scale_factor = min_z_scale + (($t > 0.5) ? 1.0 - $t : $t) * (max_z_scale - min
 // Min and max recursive functions for 1D and 2D arrays
 // Return the smallest or largest value in the array
 //
+function some_1D(b,i) = (i<len(b)-1) ? (b[i] && some_1D(b,i+1)) : b[i] != 0;
+function some_2D(a,j) = (j<len(a)-1) ? some_2D(a,j+1) : some_1D(a[j], 0);
 function min_1D(b,i) = (i<len(b)-1) ? min(b[i], min_1D(b,i+1)) : b[i];
 function min_2D(a,j) = (j<len(a)-1) ? min_2D(a,j+1) : min_1D(a[j], 0);
 function max_1D(b,i) = (i<len(b)-1) ? max(b[i], max_1D(b,i+1)) : b[i];
@@ -98,36 +119,59 @@ function pos(x,y,z) = [x * xspace, y * yspace, z_scale_factor * (z - mean_value)
 //
 module point_markers(show_home=true) {
   // Mark the home position 0,0
-  color([0,0,0,0.25]) translate([1,1]) cylinder(r=1, h=z_scale_factor, center=true);
+  if (show_home)
+    translate([1,1]) color([0,0,0,0.25])
+      cylinder(r=1, h=z_scale_factor, center=true);
 
   for (x=[0:mesh_points_x-1], y=[0:mesh_points_y-1]) {
-    z = measured_z[y][x];
+    z = measured_z[y][x] - zadjust;
     down = z < mean_value;
-    translate(pos(x, y, z)) {
+    xyz = pos(x, y, z);
+    translate([ xyz[0], xyz[1] ]) {
+
+      // Show the XY as well as the Z!
+      if (show_coords) {
+        color("black")
+        translate([0,0,0.5]) {
+          $fn=8;
+          rotate([0,0]) {
+            posx = floor(mesh_bounds[0][X] + x * xspace);
+            posy = floor(mesh_bounds[0][Y] + y * yspace);
+            text(str(posx, ",", posy), 2, label_font_sm, halign="center", valign="center");
+          }
+        }
+      }
 
-      // Label each point with the Z
-      if (show_labels) {
+      translate([ 0, 0, xyz[2] ]) {
+        // Label each point with the Z
         v = z - mean_value;
+        if (show_labels) {
 
-        color(abs(v) < 0.1 ? [0,0.5,0] : [0.25,0,0])
-        translate([0,0,down?-10:10]) {
+          color(abs(v) < 0.1 ? [0,0.5,0] : [0.25,0,0])
+          translate([0,0,down?-10:10]) {
 
-          $fn=8;
-          rotate([90,0])
-            text(str(z), 6, label_font_lg, halign="center", valign="center");
+            $fn=8;
+            rotate([90,0])
+              text(str(z), 6, label_font_lg, halign="center", valign="center");
 
-          translate([0,0,down?-6:6]) rotate([90,0])
-            text(str(down ? "" : "+", v), 3, label_font_sm, halign="center", valign="center");
+            if (v)
+              translate([0,0,down?-6:6]) rotate([90,0])
+                text(str(down || !v ? "" : "+", v), 3, label_font_sm, halign="center", valign="center");
+          }
         }
-      }
 
-      // Show an arrow pointing up or down
-      rotate([0, down ? 180 : 0]) translate([0,0,-1])
-        cylinder(
-          r1=0.5,
-          r2=0.1,
-          h=arrow_length, $fn=12, center=1
-        );
+        // Show an arrow pointing up or down
+        if (v) {
+          rotate([0, down ? 180 : 0]) translate([0,0,-1])
+            cylinder(
+              r1=0.5,
+              r2=0.1,
+              h=arrow_length, $fn=12, center=1
+            );
+        }
+        else
+          color([1,0,1,0.4]) sphere(r=1.0, $fn=20, center=1);
+      }
     }
   }
 }
@@ -161,7 +205,7 @@ module tesselated_square(s, alt=false) {
  * The simplest mesh display
  */
 module simple_mesh(show_plane=show_plane) {
-  if (show_plane) color(plane_color) cube([mesh_width, mesh_height, thickness]);
+  if (show_plane) color(plane_color) cube([mesh_size[X], mesh_size[Y], thickness]);
   color(mesh_color)
     for (x=[0:mesh_points_x-2], y=[0:mesh_points_y-2])
       tesselated_square(grid_square(x, y));
@@ -171,30 +215,34 @@ module simple_mesh(show_plane=show_plane) {
  * Subdivide the mesh into smaller squares.
  */
 module bilinear_mesh(show_plane=show_plane,tesselation=tesselation) {
-  if (show_plane) color(plane_color) translate([-5,-5]) cube([mesh_width+10, mesh_height+10, thickness]);
-  tesselation = tesselation % 4;
-  color(mesh_color)
-  for (x=[0:mesh_points_x-2], y=[0:mesh_points_y-2]) {
-    square = grid_square(x, y);
-    if (tesselation < 1) {
-      tesselated_square(square,(x%alternation)-(y%alternation));
-    }
-    else {
-      subdiv_4 = subdivided_square(square);
-      if (tesselation < 2) {
-        for (i=[0:3]) tesselated_square(subdiv_4[i],i%alternation);
+  if (show_plane) color(plane_color) translate([-5,-5]) cube([mesh_size[X]+10, mesh_size[Y]+10, thickness]);
+
+  if (some_2D(measured_z, 0)) {
+
+    tesselation = tesselation % 4;
+    color(mesh_color)
+    for (x=[0:mesh_points_x-2], y=[0:mesh_points_y-2]) {
+      square = grid_square(x, y);
+      if (tesselation < 1) {
+        tesselated_square(square,(x%alternation)-(y%alternation));
       }
       else {
-        for (i=[0:3]) {
-          subdiv_16 = subdivided_square(subdiv_4[i]);
-          if (tesselation < 3) {
-            for (j=[0:3]) tesselated_square(subdiv_16[j],j%alternation);
-          }
-          else {
-            for (j=[0:3]) {
-              subdiv_64 = subdivided_square(subdiv_16[j]);
-              if (tesselation < 4) {
-                for (k=[0:3]) tesselated_square(subdiv_64[k]);
+        subdiv_4 = subdivided_square(square);
+        if (tesselation < 2) {
+          for (i=[0:3]) tesselated_square(subdiv_4[i],i%alternation);
+        }
+        else {
+          for (i=[0:3]) {
+            subdiv_16 = subdivided_square(subdiv_4[i]);
+            if (tesselation < 3) {
+              for (j=[0:3]) tesselated_square(subdiv_16[j],j%alternation);
+            }
+            else {
+              for (j=[0:3]) {
+                subdiv_64 = subdivided_square(subdiv_16[j]);
+                if (tesselation < 4) {
+                  for (k=[0:3]) tesselated_square(subdiv_64[k]);
+                }
               }
             }
           }
@@ -249,7 +297,7 @@ function subdivided_square(a) = [
 
 //================================================ Run the plan
 
-translate([-mesh_width / 2, -mesh_height / 2]) {
+translate([-mesh_size[X] / 2, -mesh_size[Y] / 2]) {
   $fn = 12;
   point_markers();
   bilinear_mesh();
diff --git a/buildroot/share/scripts/pinsformat.js b/buildroot/share/scripts/pinsformat.js
new file mode 100755
index 000000000000..3e2a57b556dc
--- /dev/null
+++ b/buildroot/share/scripts/pinsformat.js
@@ -0,0 +1,141 @@
+#!/usr/bin/env node
+
+//
+// Formatter script for pins_MYPINS.h files
+//
+// Usage: mffmt [infile] [outfile]
+//
+// With no parameters convert STDIN to STDOUT
+//
+
+const fs = require("fs");
+
+// String lpad / rpad
+String.prototype.lpad = function(len, chr) {
+  if (!len) return this;
+  if (chr === undefined) chr = ' ';
+  var s = this+'', need = len - s.length;
+  if (need > 0) s = new Array(need+1).join(chr) + s;
+  return s;
+};
+
+String.prototype.rpad = function(len, chr) {
+  if (!len) return this;
+  if (chr === undefined) chr = ' ';
+  var s = this+'', need = len - s.length;
+  if (need > 0) s += new Array(need+1).join(chr);
+  return s;
+};
+
+const mpatt = [ '-?\\d+', 'P[A-I]\\d+', 'P\\d_\\d+' ],
+      definePatt = new RegExp(`^\\s*(//)?#define\\s+[A-Z_][A-Z0-9_]+\\s+(${mpatt[0]}|${mpatt[1]}|${mpatt[2]})\\s*(//.*)?$`, 'gm'),
+      ppad = [ 3, 4, 5 ],
+      col_comment = 50,
+      col_value_rj = col_comment - 3;
+
+var mexpr = [];
+for (let m of mpatt) mexpr.push(new RegExp('^' + m + '$'));
+
+const argv = process.argv.slice(2), argc = argv.length;
+
+var src_file = 0, src_name = 'STDIN', dst_file;
+if (argc > 0) {
+  src_file = src_name = argv[0];
+  dst_file = argv[argc > 1 ? 1 : 0];
+}
+
+// Read from file or STDIN until it terminates
+const filtered = process_text(fs.readFileSync(src_file).toString());
+if (dst_file)
+  fs.writeFileSync(dst_file, filtered);
+else
+  console.log(filtered);
+
+// Find the pin pattern so non-pin defines can be skipped
+function get_pin_pattern(txt) {
+  var r, m = 0, match_count = [ 0, 0, 0 ];
+  definePatt.lastIndex = 0;
+  while ((r = definePatt.exec(txt)) !== null) {
+    let ind = -1;
+    if (mexpr.some((p) => {
+      ind++;
+      const didmatch = r[2].match(p);
+      return r[2].match(p);
+    }) ) {
+      const m = ++match_count[ind];
+      if (m >= 10) {
+        return { match: mpatt[ind], pad:ppad[ind] };
+      }
+    }
+  }
+  return null;
+}
+
+function process_text(txt) {
+  if (!txt.length) return '(no text)';
+  const patt = get_pin_pattern(txt);
+  if (!patt) return txt;
+  const pindefPatt = new RegExp(`^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+(${patt.match})\\s*(//.*)?$`),
+         noPinPatt = new RegExp(`^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+(-1)\\s*(//.*)?$`),
+          skipPatt = new RegExp('^(\\s*(//)?#define)\\s+(AT90USB|USBCON|BOARD_.+|.+_MACHINE_NAME|.+_SERIAL)\\s+(.+)\\s*(//.*)?$'),
+         aliasPatt = new RegExp('^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+([A-Z_][A-Z0-9_()]+)\\s*(//.*)?$'),
+        switchPatt = new RegExp('^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s*(//.*)?$'),
+         undefPatt = new RegExp('^(\\s*(//)?#undef)\\s+([A-Z_][A-Z0-9_]+)\\s*(//.*)?$'),
+           defPatt = new RegExp('^(\\s*(//)?#define)\\s+([A-Z_][A-Z0-9_]+)\\s+(\\w+)\\s*(//.*)?$'),
+          condPatt = new RegExp('^(\\s*(//)?#(if|ifn?def|else|elif)(\\s+\\S+)*)\\s+(//.*)$'),
+          commPatt = new RegExp('^\\s{20,}(//.*)?$');
+  const col_value_lj = col_comment - patt.pad - 2;
+  var r, out = '', check_comment_next = false;
+  txt.split('\n').forEach((line) => {
+    if (check_comment_next)
+      check_comment_next = ((r = commPatt.exec(line)) !== null);
+
+    if (check_comment_next)
+      // Comments in column 45
+      line = ''.rpad(col_comment) + r[1];
+
+    else if ((r = pindefPatt.exec(line)) !== null) {
+      //
+      // #define MY_PIN [pin]
+      //
+      const pinnum = r[4].charAt(0) == 'P' ? r[4] : r[4].lpad(patt.pad);
+      line = r[1] + ' ' + r[3];
+      line = line.rpad(col_value_lj) + pinnum;
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = noPinPatt.exec(line)) !== null) {
+      //
+      // #define MY_PIN -1
+      //
+      line = r[1] + ' ' + r[3];
+      line = line.rpad(col_value_lj) + '-1';
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = skipPatt.exec(line)) !== null) {
+    }
+    else if ((r = aliasPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3];
+      line += r[4].lpad(col_value_rj + 1 - line.length);
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = switchPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3];
+      if (r[4]) line = line.rpad(col_comment) + r[4];
+      check_comment_next = true;
+    }
+    else if ((r = defPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3] + ' ' + r[4];
+      if (r[5]) line = line.rpad(col_comment) + r[5];
+    }
+    else if ((r = undefPatt.exec(line)) !== null) {
+      line = r[1] + ' ' + r[3];
+      if (r[4]) line = line.rpad(col_comment) + r[4];
+    }
+    else if ((r = condPatt.exec(line)) !== null) {
+      line = r[1].rpad(col_comment) + r[5];
+      check_comment_next = true;
+    }
+    out += line + '\n';
+  });
+  return out.replace(/\n\n+/g, '\n\n').replace(/\n\n$/g, '\n');
+}
diff --git a/buildroot/share/tests/BIGTREE_GTR_V1_0-tests b/buildroot/share/tests/BIGTREE_GTR_V1_0-tests
new file mode 100644
index 000000000000..0738a2818b48
--- /dev/null
+++ b/buildroot/share/tests/BIGTREE_GTR_V1_0-tests
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#
+# Build tests for BigTreeTech GTR 1.0
+#
+
+# exit on first failure
+set -e
+
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
+opt_set SERIAL_PORT -1
+opt_set EXTRUDERS 8
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_2 1
+opt_set TEMP_SENSOR_3 1
+opt_set TEMP_SENSOR_4 1
+opt_set TEMP_SENSOR_5 1
+opt_set TEMP_SENSOR_6 1
+opt_set TEMP_SENSOR_7 1
+# Not necessary to enable auto-fan for all extruders to hit problematic code paths
+opt_set E0_AUTO_FAN_PIN PC10
+opt_set E1_AUTO_FAN_PIN PC11
+opt_set E2_AUTO_FAN_PIN PC12
+exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan"
+
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
+opt_set SERIAL_PORT -1
+opt_set EXTRUDERS 6
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_2 1
+opt_set TEMP_SENSOR_3 1
+opt_set TEMP_SENSOR_4 1
+opt_set TEMP_SENSOR_5 1
+opt_set NUM_Z_STEPPER_DRIVERS 3
+exec_test $1 $2 "BigTreeTech GTR 6 Extruders Triple Z"
+
+# clean up
+restore_configs
diff --git a/buildroot/share/tests/BIGTREE_SKR_PRO-tests b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
index 094e01d9c73a..238b54d4f87f 100644
--- a/buildroot/share/tests/BIGTREE_SKR_PRO-tests
+++ b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
@@ -14,5 +14,16 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
 opt_set SERIAL_PORT 1
 exec_test $1 $2 "BigTreeTech SKR Pro Default Configuration"
 
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
+opt_set SERIAL_PORT -1
+opt_set EXTRUDERS 3
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_2 1
+opt_set E0_AUTO_FAN_PIN PC10
+opt_set E1_AUTO_FAN_PIN PC11
+opt_set E2_AUTO_FAN_PIN PC12
+exec_test $1 $2 "BigTreeTech SKR Pro 3 Extruders with Auto-Fan"
+
 # clean up
 restore_configs
diff --git a/buildroot/share/tests/LPC1769-tests b/buildroot/share/tests/LPC1769-tests
index 0cdb2f313b55..1dda5ec417db 100755
--- a/buildroot/share/tests/LPC1769-tests
+++ b/buildroot/share/tests/LPC1769-tests
@@ -50,7 +50,7 @@ opt_set Z_DRIVER_TYPE TMC2130
 opt_enable AUTO_BED_LEVELING_BILINEAR EEPROM_SETTINGS EEPROM_CHITCHAT \
            TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z HYBRID_THRESHOLD \
            SENSORLESS_PROBING Z_SAFE_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY TMC_DEBUG
-opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN PSU_CONTROL
+opt_disable PSU_CONTROL
 exec_test $1 $2 "Cohesion3D Remix DELTA + ABL Bilinear + EEPROM + SENSORLESS_PROBING"
 
 # clean up
diff --git a/buildroot/share/tests/STM32F103RC_bigtree-tests b/buildroot/share/tests/STM32F103RC_btt-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RC_bigtree-tests
rename to buildroot/share/tests/STM32F103RC_btt-tests
diff --git a/buildroot/share/tests/STM32F103RC_bigtree_USB-tests b/buildroot/share/tests/STM32F103RC_btt_USB-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RC_bigtree_USB-tests
rename to buildroot/share/tests/STM32F103RC_btt_USB-tests
diff --git a/buildroot/share/tests/STM32F103RE_bigtree-tests b/buildroot/share/tests/STM32F103RE_btt-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RE_bigtree-tests
rename to buildroot/share/tests/STM32F103RE_btt-tests
diff --git a/buildroot/share/tests/STM32F103RE_bigtree_USB-tests b/buildroot/share/tests/STM32F103RE_btt_USB-tests
similarity index 100%
rename from buildroot/share/tests/STM32F103RE_bigtree_USB-tests
rename to buildroot/share/tests/STM32F103RE_btt_USB-tests
diff --git a/buildroot/share/tests/mega1280-tests b/buildroot/share/tests/mega1280-tests
new file mode 100644
index 000000000000..c2d55a92e555
--- /dev/null
+++ b/buildroot/share/tests/mega1280-tests
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+#
+# Build tests for AVR ATmega1280
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+#restore_configs
+#exec_test $1 $2 "Default Configuration"
+
+#
+# Test MESH_BED_LEVELING feature, with LCD
+#
+restore_configs
+opt_set LCD_LANGUAGE an
+opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
+           MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
+           G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
+exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
+
+#
+# Test DUAL_X_CARRIAGE
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_TT_OSCAR
+opt_set LCD_LANGUAGE pt
+opt_set EXTRUDERS 2
+opt_set TEMP_SENSOR_1 1
+opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE REPRAPWORLD_KEYPAD
+opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
+exec_test $1 $2 "TT Oscar | DUAL_X_CARRIAGE"
+
+#
+# Delta Config (generic) + Probeless
+#
+use_example_configs delta/generic
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
+exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
+
+#
+# Delta Config (generic) + ABL bilinear + BLTOUCH
+use_example_configs delta/generic
+opt_set LCD_LANGUAGE cz
+opt_set X_DRIVER_TYPE L6470
+opt_set Y_DRIVER_TYPE L6470
+opt_set Z_DRIVER_TYPE L6470
+opt_add L6470_CHAIN_SCK_PIN  53
+opt_add L6470_CHAIN_MISO_PIN 49
+opt_add L6470_CHAIN_MOSI_PIN 40
+opt_add L6470_CHAIN_SS_PIN   42
+opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
+exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
+
+# clean up
+restore_configs
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/mega2560-tests
similarity index 75%
rename from buildroot/share/tests/megaatmega2560-tests
rename to buildroot/share/tests/mega2560-tests
index a49536529f9e..884ea8be4ab2 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/mega2560-tests
@@ -12,43 +12,6 @@ set -e
 #restore_configs
 #exec_test $1 $2 "Default Configuration"
 
-#
-# Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
-# Test a "Fix Mounted" Probe with Safe Homing, some arc options,
-# linear bed leveling, M48, leveling debug, and firmware retraction.
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_0 -2
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_BED 2
-opt_set TEMP_SENSOR_PROBE 1
-opt_add TEMP_PROBE_PIN 12
-opt_set TEMP_SENSOR_CHAMBER 3
-opt_add HEATER_CHAMBER_PIN 45
-opt_set GRID_MAX_POINTS_X 16
-opt_set FANMUX0_PIN 53
-opt_disable USE_WATCHDOG
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
-           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
-           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
-           EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
-           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
-           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
-           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
-           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \
-           NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
-           ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
-           AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
-           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
-           BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
-           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
-           PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
-          SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE \
-           HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
-exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
-
 #
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
 #
@@ -66,7 +29,7 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING BOOT_MARLIN_LOGO_SMALL \
            SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT SCROLL_LONG_FILENAMES CANCEL_OBJECTS \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \
-           MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE QUICK_HOME \
+           MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE EXTRA_LIN_ADVANCE_K QUICK_HOME \
            LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
            BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
 exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..."
@@ -115,21 +78,23 @@ exec_test $1 $2 "RAMPS | ZONESTAR_LCD | MMU2 | Servo Probe | ABL 3-Pt | Debug Le
 # Test MINIRAMBO with PWM_MOTOR_CURRENT and many features
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_MINIRAMBO
+opt_set MOTHERBOARD BOARD_MEGACONTROLLER
 opt_set LCD_LANGUAGE de
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT \
-           ULTIMAKERCONTROLLER SDSUPPORT PCA9632 LCD_INFO_MENU \
+           MINIPANEL SDSUPPORT PCA9632 LCD_INFO_MENU \
            AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
-           M100_FREE_MEMORY_WATCHER \
-           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS \
+           LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS M100_FREE_MEMORY_WATCHER \
            NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
            ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES \
-           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL \
+           USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE
+opt_set CONTROLLERFAN_SPEED_IDLE 128
 opt_add M100_FREE_MEMORY_DUMPER
 opt_add M100_FREE_MEMORY_CORRUPTOR
 opt_set PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
 opt_set I2C_SLAVE_ADDRESS 63
-exec_test $1 $2 "MINIRAMBO | Ultimaker LCD | M100 | PWM_MOTOR_CURRENT | PRINTCOUNTER | Advanced Pause ..."
+exec_test $1 $2 "MEGACONTROLLER | Ultimaker LCD | M100 | PWM_MOTOR_CURRENT | PRINTCOUNTER | Advanced Pause ..."
 
 #
 # Mixing Extruder with 5 steppers, Cyrillic
@@ -142,17 +107,6 @@ opt_set MIXING_STEPPERS 5
 opt_set LCD_LANGUAGE ru
 exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Cyrillic"
 
-#
-# Test DUAL_X_CARRIAGE
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_RUMBA
-opt_set LCD_LANGUAGE pt
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
-opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE
-exec_test $1 $2 "Rumba | DUAL_X_CARRIAGE"
-
 #
 # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
 #
@@ -296,21 +250,6 @@ exec_test $1 $2 "Full-featured CR-10S config"
 #use_example_configs Hephestos_2
 #exec_test $1 $2 "Stuff"
 
-#
-# Delta Config (generic) + ABL bilinear + BLTOUCH
-use_example_configs delta/generic
-opt_set LCD_LANGUAGE cz
-opt_set X_DRIVER_TYPE L6470
-opt_set Y_DRIVER_TYPE L6470
-opt_set Z_DRIVER_TYPE L6470
-opt_add L6470_CHAIN_SCK_PIN  53
-opt_add L6470_CHAIN_MISO_PIN 49
-opt_add L6470_CHAIN_MOSI_PIN 40
-opt_add L6470_CHAIN_SS_PIN   42
-opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
-exec_test $1 $2 "DELTA | L6470 | RRD LCD | ABL Bilinear | BLTOUCH"
-
 #
 # Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
 #
@@ -320,13 +259,6 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EE
            OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY
 exec_test $1 $2 "RAMPS | DELTA | OLED_PANEL_TINYBOY2 | UBL | Allen Key | EEPROM"
 
-#
-# Delta Config (generic) + Probeless
-#
-use_example_configs delta/generic
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_AUTO_CALIBRATION DELTA_CALIBRATION_MENU
-exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBRATION_MENU"
-
 #
 # Delta Config (FLSUN AC because it's complex)
 #
diff --git a/buildroot/share/tests/megaatmega1280-tests b/buildroot/share/tests/megaatmega1280-tests
deleted file mode 100644
index 4e5ad253552f..000000000000
--- a/buildroot/share/tests/megaatmega1280-tests
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for AVR ATmega1280
-#
-
-# exit on first failure
-set -e
-
-#
-# Build with the default configurations
-#
-#restore_configs
-#exec_test $1 $2 "Default Configuration"
-
-#
-# Test MESH_BED_LEVELING feature, with LCD
-#
-restore_configs
-opt_set LCD_LANGUAGE an
-opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
-           MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
-           G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS
-exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
-
-
-# clean up
-restore_configs
diff --git a/buildroot/share/tests/rambo-tests b/buildroot/share/tests/rambo-tests
index 3f741fcba6b3..8092059627ea 100644
--- a/buildroot/share/tests/rambo-tests
+++ b/buildroot/share/tests/rambo-tests
@@ -33,5 +33,40 @@ opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
 opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
 exec_test $1 $2 "Rambo CNC Configuration"
 
+#
+# Lots of options - Formerly the first Mega2560 test
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_RAMBO
+opt_set EXTRUDERS 2
+opt_set TEMP_SENSOR_0 -2
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_BED 2
+opt_set TEMP_SENSOR_PROBE 1
+opt_add TEMP_PROBE_PIN 12
+opt_set TEMP_SENSOR_CHAMBER 3
+opt_add HEATER_CHAMBER_PIN 45
+opt_set GRID_MAX_POINTS_X 16
+opt_set FANMUX0_PIN 53
+opt_disable USE_WATCHDOG
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
+           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
+           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
+           EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
+           BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
+           NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
+           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \
+           NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
+           ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
+           AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
+           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
+           BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
+           FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
+           PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+           HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
+exec_test $1 $2 "RAMBO | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
+
 # clean up
 restore_configs
diff --git a/buildroot/share/tests/sanguino_atmega1284p-tests b/buildroot/share/tests/sanguino1284p-tests
similarity index 100%
rename from buildroot/share/tests/sanguino_atmega1284p-tests
rename to buildroot/share/tests/sanguino1284p-tests
diff --git a/buildroot/share/tests/sanguino_atmega644p-tests b/buildroot/share/tests/sanguino644p-tests
similarity index 100%
rename from buildroot/share/tests/sanguino_atmega644p-tests
rename to buildroot/share/tests/sanguino644p-tests
diff --git a/buildroot/share/vscode/auto_build.py b/buildroot/share/vscode/auto_build.py
index f9258846a57b..1d4ea12c7bec 100644
--- a/buildroot/share/vscode/auto_build.py
+++ b/buildroot/share/vscode/auto_build.py
@@ -600,13 +600,13 @@ def invalid_board():
           target_env = 'DUE_USB'
         else:
           target_env = 'DUE'
-    elif env_A == 'STM32F103RC_bigtree' or env_A == 'STM32F103RE_bigtree':
-      if env_A == 'STM32F103RE_bigtree':
+    elif env_A == 'STM32F103RC_btt' or env_A == 'STM32F103RE_btt':
+      if env_A == 'STM32F103RE_btt':
         get_answer(board_name, 'MCU Type?', 'STM32F103RC', 'STM32F103RE')
         if 1 == get_answer_val:
-          env_A = 'STM32F103RC_bigtree'
+          env_A = 'STM32F103RC_btt'
       target_env = env_A
-      if env_A == 'STM32F103RC_bigtree':
+      if env_A == 'STM32F103RC_btt':
         get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
         if 1 == get_answer_val:
           target_env += '_512K'
diff --git a/config/README.md b/config/README.md
index 3db488e8e9b3..f4dfd9aedfe9 100644
--- a/config/README.md
+++ b/config/README.md
@@ -1,3 +1,3 @@
 # Where have all the configurations gone?
 
-## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.4.zip
+## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.zip
diff --git a/platformio.ini b/platformio.ini
index 405efd8624ee..4e801713a029 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,7 +18,7 @@
 [platformio]
 src_dir      = Marlin
 boards_dir   = buildroot/share/PlatformIO/boards
-default_envs = megaatmega2560
+default_envs = mega2560
 
 [common]
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
@@ -57,24 +57,24 @@ monitor_speed = 250000
 #
 # ATmega2560
 #
-[env:megaatmega2560]
+[env:mega2560]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # ATmega1280
 #
-[env:megaatmega1280]
+[env:mega1280]
 platform          = atmelavr
 board             = megaatmega1280
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # RAMBo
@@ -85,7 +85,7 @@ board             = reprap_rambo
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.3
@@ -96,7 +96,7 @@ board             = fysetc_f6_13
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.4
@@ -107,27 +107,27 @@ board             = fysetc_f6_14
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega644p)
 #
-[env:sanguino_atmega644p]
+[env:sanguino644p]
 platform      = atmelavr
 board         = sanguino_atmega644p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega1284p)
 #
-[env:sanguino_atmega1284p]
+[env:sanguino1284p]
 platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Melzi and clones (ATmega1284p)
@@ -137,7 +137,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 lib_ignore    = TMCStepper
 upload_speed  = 57600
 
@@ -149,7 +149,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 lib_ignore    = TMCStepper
 upload_speed  = 115200
 
@@ -166,7 +166,7 @@ board         = at90usb1286
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # AT90USB1286 boards using DFU bootloader
@@ -179,7 +179,7 @@ platform      = teensy
 board         = at90usb1286
 lib_deps      = ${common.lib_deps}
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
@@ -190,18 +190,18 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 [env:DUE]
 platform      = atmelsam
 board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_USB]
 platform      = atmelsam
 board         = dueUSB
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_debug]
 # Used when WATCHDOG_RESET_MANUAL is enabled
 platform      = atmelsam
 board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 build_flags   = ${common.build_flags}
   -funwind-tables
   -mpoke-function-name
@@ -212,14 +212,14 @@ build_flags   = ${common.build_flags}
 [env:LPC1768]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
 board             = nxp_lpc1768
-build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarlin/src/HAL/HAL_LPC1768/u8g ${common.build_flags}
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
 # debug options for backtrace
 #  -funwind-tables
 #  -mpoke-function-name
 lib_ldf_mode      = off
 lib_compat_mode   = strict
-extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
+src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -230,14 +230,14 @@ lib_deps          = Servo
 [env:LPC1769]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
 board             = nxp_lpc1769
-build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarlin/src/HAL/HAL_LPC1768/u8g ${common.build_flags}
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
 # debug options for backtrace
 #  -funwind-tables
 #  -mpoke-function-name
 lib_ldf_mode      = off
 lib_compat_mode   = strict
-extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
+src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -252,10 +252,10 @@ lib_deps          = Servo
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -269,11 +269,11 @@ platform          = ststm32
 board             = genericSTM32F103RC
 #board_build.core = maple
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -284,67 +284,71 @@ upload_protocol   = serial
 #
 # BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
 #
-#   STM32F103RC_bigtree ............. RCT6 with 256K
-#   STM32F103RC_bigtree_USB ......... RCT6 with 256K (USB mass storage)
-#   STM32F103RC_bigtree_512K ........ RCT6 with 512K
-#   STM32F103RC_bigtree_512K_USB .... RCT6 with 512K (USB mass storage)
+#   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)
 #
 
-[env:STM32F103RC_bigtree]
+[env:STM32F103RC_btt]
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
-[env:STM32F103RC_bigtree_USB]
+[env:STM32F103RC_btt_USB]
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
-[env:STM32F103RC_bigtree_512K]
+[env:STM32F103RC_btt_512K]
 platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
-[env:STM32F103RC_bigtree_512K_USB]
+[env:STM32F103RC_btt_512K_USB]
 platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  USBComposite for STM32F1@==0.91
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
@@ -355,28 +359,28 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 #
-#   STM32F103RE_bigtree ............. RET6
-#   STM32F103RE_bigtree_USB ......... RET6 (USB mass storage)
+#   STM32F103RE_btt ............. RET6
+#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
 #
-[env:STM32F103RE_bigtree]
+[env:STM32F103RE_btt]
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -384,15 +388,15 @@ debug_tool        = stlink
 upload_protocol   = stlink
 monitor_speed     = 115200
 
-[env:STM32F103RE_bigtree_USB]
+[env:STM32F103RE_btt_USB]
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -408,7 +412,7 @@ platform      = ststm32
 board         = disco_f407vg
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
 
 #
 # STM32F7 with STM32GENERIC
@@ -418,7 +422,7 @@ platform      = ststm32
 board         = remram_v1
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F4>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F4>
 
 #
 # ARMED (STM32)
@@ -429,9 +433,9 @@ board         = armed_v1
 build_flags   = ${common.build_flags}
   -DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
   -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 lib_ignore    = Adafruit NeoPixel, SoftwareSerial
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Geeetech GTM32 (STM32F103VET6)
@@ -439,12 +443,12 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 [env:STM32F103VE_GTM32]
 platform        = ststm32
 board           = genericSTM32F103VE
-build_flags     = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags     = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
   -DBOARD_generic_stm32f103v -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1
   -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 build_unflags = -std=gnu++11
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter      = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore      = Adafruit NeoPixel, SPI
 upload_protocol = serial
 
@@ -454,12 +458,12 @@ upload_protocol = serial
 [env:STM32F103VE_longer]
 platform      = ststm32
 board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -USERIAL_USB
   -DSTM32F1xx -DU20 -DTS_V12
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
 
 #
@@ -468,11 +472,11 @@ lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
 [env:mks_robin_mini]
 platform      = ststm32
 board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_mini.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -482,12 +486,12 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103VE
 platform_packages = tool-stm32duino
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
-lib_deps = ${common.lib_deps}
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_deps      = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore    = Adafruit NeoPixel, SPI
 
@@ -497,11 +501,13 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:mks_robin]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
-  ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+  ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_deps      = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -511,10 +517,10 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103ZE
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps      = ${common.lib_deps}
 lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
 
@@ -524,11 +530,11 @@ lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
 [env:mks_robin_lite]
 platform      = ststm32
 board         = genericSTM32F103RC
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -538,10 +544,10 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103RC
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps      = ${common.lib_deps}
 lib_ignore    = Adafruit NeoPixel, SPI
 
@@ -551,11 +557,11 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:jgaurora_a5s_a1]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -564,9 +570,9 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:STM32F103CB_malyan]
 platform    = ststm32
 board       = malyanM200
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
+build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
   -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
-src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-HAL, SPI
 
 #
@@ -575,11 +581,11 @@ lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
 [env:chitu_f103]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 extra_scripts = buildroot/share/PlatformIO/scripts/chitu_crypt.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel
 
 #
@@ -594,12 +600,12 @@ build_flags       = ${common.build_flags}
  -DTARGET_STM32F4 -DARDUINO_STEVAL -DSTM32F401xE
  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STEVAL_F401VE\"
  -DDISABLE_GENERIC_SERIALUSB
- -IMarlin/src/HAL/HAL_STM32
+ -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # FLYF407ZG
@@ -611,11 +617,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DSTM32F4 -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
   -DTARGET_STM32F4 -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 
 #
@@ -624,14 +630,16 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 [env:FYSETC_S6]
 platform          = ststm32
 board             = fysetc_s6
-platform_packages = tool-stm32duino
+platform_packages =
+   tool-stm32duino
+   framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DTARGET_STM32F4 -std=gnu++14
   -DVECT_TAB_OFFSET=0x10000
   -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"'
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 lib_ignore        = Arduino-L6470
 debug_tool        = stlink
 #upload_protocol   = stlink
@@ -649,11 +657,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
  -DTARGET_STM32F4 -DARDUINO_BLACK_F407VE
  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"BLACK_F407VE\"
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
@@ -665,11 +673,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
   -DTARGET_STM32F4 -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 #upload_protocol   = stlink
 #upload_command    = "$PROJECT_PACKAGES_DIR/tool-stm32duino/stlink/ST-LINK_CLI.exe" -c SWD -P "$BUILD_DIR/firmware.bin" 0x8008000 -Rst -Run
 debug_tool        = stlink
@@ -681,14 +689,13 @@ debug_init_break  =
 [env:BIGTREE_GTR_V1_0]
 platform          = ststm32@>=5.7.0
 framework         = arduino
-platform_packages = framework-arduinoststm32@>=3.10700.191028
+platform_packages = framework-arduinoststm32@>=3.107,<4
 board             = BigTree_SKR_Pro
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407IG\"
   -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
-
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 lib_deps          =
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
   LiquidCrystal
@@ -697,7 +704,7 @@ lib_deps          =
   LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
   Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed     = 250000
 
 #
@@ -717,7 +724,7 @@ build_flags       = ${common.build_flags}
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
@@ -728,7 +735,7 @@ board         = teensy31
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY31_32>
+src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
 
 #
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
@@ -739,7 +746,7 @@ board         = teensy35
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
+src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
 
 #
 # Espressif ESP32
@@ -755,7 +762,7 @@ lib_deps      = ${common.lib_deps}
   arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git
   ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git
 lib_ignore    = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED, ESPAsyncTCP
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_ESP32>
+src_filter    = ${common.default_src_filter} +<src/HAL/ESP32>
 upload_speed  = 115200
 #upload_port   = marlinesp.local
 #board_build.flash_mode = qio
@@ -768,24 +775,25 @@ upload_speed  = 115200
 platform        = native
 framework       =
 build_flags     = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
-src_build_flags = -Wall -IMarlin/src/HAL/HAL_LINUX/include
+src_build_flags = -Wall -IMarlin/src/HAL/LINUX/include
 build_unflags   = -Wall
 lib_ldf_mode    = off
 lib_deps        =
-extra_scripts   =
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_LINUX>
+src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 
 #
 # Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
 #
 [env:SAMD51_grandcentral_m4]
-platform      = atmelsam
-board         = adafruit_grandcentral_m4
-build_flags   = ${common.build_flags} -std=gnu++17
-extra_scripts = ${common.extra_scripts}
-build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_SAMD51>
-debug_tool    = jlink
+platform       = atmelsam
+board          = adafruit_grandcentral_m4
+build_flags    = ${common.build_flags} -std=gnu++17 -Wno-register
+build_unflags  = -std=gnu++11
+src_filter     = ${common.default_src_filter} +<src/HAL/SAMD51>
+lib_deps       = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+  Adafruit_SPIFlash=https://github.com/adafruit/Adafruit_SPIFlash/archive/master.zip
+debug_tool     = jlink
 
 #
 # RUMBA32
@@ -809,7 +817,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed = 500000
 upload_protocol = dfu
 
@@ -830,7 +838,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32> +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
 upload_protocol = dfu
 
 #