diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 409f3812971274332b0f8fa58652189669871101..829c391c4dfe3a2e1eceb49c4bb69f30a8ccee10 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 99a5ea2f76df575bab355166becfe774c4c94c18..e4da400528ed6640203aea3dbd454dcb3a90b030 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 a93f0f05c4aab0862b73383d88264d6ad9fe5847..8a06f9a1693b1e5dd3895bff829d47357f2328ea 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 0096027158e93655575ac13ba27213d2008cb672..3dd50489df13813ac96e9b9e60bdca72dd4e373e 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 b1f7ecee387d4a267b25293f06ee0d6a8570477b..0bfbaabdcd6af8a80a8a15f38fe049b2a8666057 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,13 +261,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
 
@@ -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 ef064694abad69f4a9aa64668400ee06c913ac97..1417fb7d9915660ae7164d820ed913421dd90638 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -40,84 +40,84 @@
 //
 // 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
@@ -125,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 a4800dcc73d56c054f00ac865a9730cde99cc0bd..d710138b956ea1060d5cecfdc686aa49e679cb42 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -47,42 +47,42 @@
 //
 // 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
 
 //
@@ -90,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
 
@@ -104,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
@@ -134,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"
@@ -162,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 549b44019a42169f01081a2d01d1b10592634e3d..041235d493524914cf5957ea415c3d5c05f629be 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -45,56 +45,53 @@
 //
 // 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_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 X_STEP_PIN                         P2_0
+#define X_DIR_PIN                          P0_5
+#define X_ENABLE_PIN                       P0_4
 
-#define Z_STEP_PIN         P2_2
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_1
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#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
@@ -108,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"
@@ -129,7 +126,6 @@
 
 #endif // HAS_SPI_LCD
 
-
 /**
  * SD Card Reader
  *
@@ -138,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 feadafa5922de7665126fb2997054d75ef08af07..4dae2dc5d63049ab5105371c06babe602f164306 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -33,31 +33,31 @@
 // 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
@@ -73,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
 
@@ -97,14 +97,14 @@
 // 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
@@ -137,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.
 
@@ -192,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
@@ -207,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.
@@ -224,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 adf726f0245504278f9ae797f8f98c8315c64fa9..1d1ad60f2474317844ceab1bea510afbe87b0e98 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -32,107 +32,107 @@
 /**
  * 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
 
 //
@@ -140,13 +140,13 @@
 //
 #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
 
@@ -172,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
@@ -202,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
 
@@ -247,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)
 
@@ -331,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
@@ -359,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 00c66521e645947ab9e402133cf5a45bfbbc9d50..7e722ea45f8636387c218edbc7fb334b19792962 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -37,58 +37,58 @@
 // 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
   #ifndef Z_STOP_PIN
-    #define Z_STOP_PIN     P1_27   // Z-STOP
+    #define Z_STOP_PIN                     P1_27  // Z-STOP
   #endif
 #endif
 
@@ -96,82 +96,82 @@
 // 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
 
@@ -197,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
@@ -223,7 +223,7 @@
 // SD Connection
 //
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P0_16
+  #define SS_PIN                           P0_16
 #endif
 
 /**
@@ -239,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
@@ -327,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 2844fb3cdab8b400a4db6670cbfcc8cf30bf8b4d..63e160d8a0766c76dee288ca231994764a165288 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -40,13 +40,13 @@
 // 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
 
 //
@@ -54,64 +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   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 5ebf6ecba16e50d582c67126dc7839a48a1cdb0f..32de7bb74082372f5baa72d054f6e44b7819c430 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -44,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
@@ -112,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
 
 //
@@ -149,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 28b94f019af43617495c8dbcbf33595281f60f90..0cd10ebc05003819663b70d569bbedf2dc98edbc 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -46,73 +46,73 @@
   //#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
+#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
 
 //
@@ -124,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)
 
@@ -189,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
 
 /**
@@ -226,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)
@@ -251,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)
@@ -291,24 +291,24 @@
 
 #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
@@ -322,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 5dc1db8f3fb3c0351c82e02816d77b97289bf4f2..afbe6d556498f050ef930e11574973f9f091e92d 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -41,100 +41,100 @@
 //
 // 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
 
 //
@@ -142,13 +142,13 @@
 //
 #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
 
@@ -175,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
@@ -201,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
 
 /**
  *                _____                                            _____
@@ -242,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
@@ -330,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."
@@ -352,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 2303c1885c0da9ddb96673f30a6896d1bdc8468c..b8b04a348c80c99a7f69ecd8afb5c8451cd688be 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -51,58 +51,58 @@
 //
 // 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
 
 //
@@ -110,13 +110,13 @@
 //
 #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
 
@@ -136,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
@@ -171,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
@@ -201,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
 
@@ -279,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
@@ -322,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
 
@@ -434,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 3c55ac9be3fe0ab871e8064408ed4929b4b14528..6f84f87bba887ac6b858f2b3df2b32341a6fe72a 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -41,80 +41,79 @@
 //
 // 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 1b91e4f50bb1350d8531b0f84ea6fc1ce0698e47..95cbd2163e26eb662c981093ab527a91f51ee6d9 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -41,93 +41,92 @@
 //
 // 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 7559d6ad509a25d58a14e9101b34cfcb75e20f9a..ba1351e6f40d1cc2f6a0cea714bfe8111a8bfeaf 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)
@@ -199,22 +199,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_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_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
index 3556ff83f00490500f4dd3535e741ad372d21753..87d3cb459c30b2f07c03905e13eed98a4f29ab6e 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -40,53 +40,53 @@
 //
 // 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
 
@@ -94,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
 
 //
@@ -144,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"
@@ -166,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 2502c765801dfbd6eebf1106f928fb7876192080..fa55a8adae042ae5d8bf257bc81ac6ebcea49df4 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -40,70 +40,70 @@
 //
 // 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
+  #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
 
@@ -111,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
@@ -155,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
 
 //
@@ -173,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
 
@@ -228,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
@@ -251,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 7a6d283fb45ea7c4fd22fd4506e558f0029e77b5..fd98b5ef130964754b864021cfa07211254e618e 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -47,8 +47,8 @@
 
 //#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_TMC_UART
   /**
@@ -58,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 3db8a994036db9c52b0b9d28ae757a63e28b0785..43db07ea5e081255f1a1369c9b6688fd6a2a0f07 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -41,79 +41,79 @@
 //
 // 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 9f28c2d94e742f780a4e5f2d511552ce4be64e8d..d4030ed7900c27fcefe7ce702973315bbf7d8ea9 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -41,58 +41,58 @@
 //
 // 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
@@ -102,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
@@ -170,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 de064559af70163135a98ddf0d941605f12bb6fb..7b0c0010a3b0a08af6bb5c0890984d4b1212fbbe 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 5fd5bfdef13fe9a5c4bac01c166eff2559782e37..d56d08c9e0f4dc0e50bf205b53657df7f143698b 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 047dc8ef5afa45774a63c868e0e3d5cb8dca8da4..833499fe0f855782de8170989478d68f5d417896 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 246a5964f063ee18b71318ca51e7cb4327c5d786..680a5c9a9943dee2065713cc0668e4dbc101b37b 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 bf7d65f7e7b05384dff688e16f0256add6621f70..b4aa8ab815f4f03ff17b97c94b3695e79a8fc896 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 45b500363e928c8988d055ac8f272f6936b8f0bb..8bb8f081f57eff661ab5af0ed6a4bc4254c02efb 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 30b4ab40af04d318abb7380ea31ecfd74408d75f..3d35a72b19395c8f8b7a54fec6988481a14726ca 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 6590f06d6cb33c75895a1ff995cfe8493f4161a1..e111f2ce44859df2199ab7b5456b6e00581adcec 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 566e88705dd785b2ca5df063a224b455b2816f9f..08f9018a29d164971e19474876e512039fff1e5a 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -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 037ea1324444675521f2ce6c525d3c8c84fbdecc..06ac9fd9df143317308c22a493885e01e847b9ef 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 7ba9112d4e72fa3dc51d4d850e53cfd708de8ecb..0f06aaf25642e859ba9ff9422108bed6df98182b 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 b66756668805e2dea2dbfb63691bae10edd8fcf8..66adfb2fa7d79005e16032c50e7490c885061fb8 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_LEAPFROG.h b/Marlin/src/pins/mega/pins_LEAPFROG.h
index f04b89d4bcb0f9d6b323182e8c7ab445a78b357d..188cbcad3da8dbc30abdded012b9410a4330096e 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 ab6299a9b05c5238cc23799ef2d7a9f313b829c8..36cb0e2c142da72898c01b2deb3e4eae9e343179 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 8fecc71bac882975053d66c77440d509968c2004..2d0db15825118db6f037060fb9cfa2b9f15c0452 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 d3015340de09c78725807024d908ceec667ebe3d..4d7a98005077c068b2c666b9a67a8de09a1e415f 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 160d9d4b786ad82b5fb7a8d75cd3f18cc4ae594a..d976e0981682258e36fcbebf0e02dfeeaaddf580 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 fe0f4826be32504ffd6617024d3cb6ed7cd87133..78dd88809ff0d4e1d709dbcc5c72e48f0b32b26c 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 6d3102172bb89ebaba1204574dc5752313545cfd..3282216819f954a9eadb2eb1570aba2a32d2033e 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 5b06e3b8359076a63c84738d21582990ad10c85f..35d1b59ecbfbadf013024c7aa4926e551ffa8ff3 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 80f72d04e902a62e0433e7440ba98256382d28e6..4e02127c1206d6173e05668802d5735f5d9e80db 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 4c618bda4e33d35ede3eae944eada48c77db7a9b..f00d817d6e89f2671697a680e27202a18135f8ed 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 88fa1ada29c0fb1db1164934958cebc332b99063..34861277a8895e3df9ab01151160fc97b70228f8 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 bde1f8708892670ddf648218f567d8b8ea118729..4c79507eab0ba79dfd525c74dd0c6bc8afb833a0 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 c011d9daa76532a242cf0671d84e5a395a9f9dc0..6c53b7ea4e6237adc9b776dbcead46de7852ca9a 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/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 4cfa3261655d8542dbe80b52fecf88dbcb451b5f..430fa170e12aee4cade3d054faeffad099b99060 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 2bc577313eccb566725e75dcf202569a72a0eaca..6e8463d0bdcd2870a83894478f5284b43e10c479 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 50aec546a633c536c9f0b78631bb609076d7d7f3..18bc3ddd167736674ba62cce226bc237ff19a1e9 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -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 2e52e9427c28fba470c4d2aa23d452cd29bb8c03..0a443cc19ac872f471bceedb1421ecf2cb3a9fca 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -50,64 +50,64 @@
 //
 // 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
 
 //
 // 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 +116,122 @@
 //
 // 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
 
 //
 // 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 2bb6e9b97925d5d18b4618ca16d24a6daf655f88..49237c706247fd464c49800e37bb6df8cfabe36b 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 3f537a6663f1c1be222d272d4322a5b1f2da8294..69d2ac2088ff4b592c9297bce25e93f7ae1101e7 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 99b75d5e002488b3171c3d78c9148709c92a8156..a38e4e1b43aaccc3fd59ea9acb4ab50efce737ee 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 627eaabfd69e419e8293684b06d1496ddec4399c..c8e2a6683d981f125b6c79331c48e0870177faf0 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 9945c94d76271696aa858dbec3f97d377abcc25b..1aa9b67f7c1b31d572e6ec348361e3e40983a0fd 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 bf75c1a2a2ab1cd35e1529f39dd000cf582c9b98..44b6ff1e617ed739ee64c00ac752c70965949774 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_DUPLICATOR_I3_PLUS.h b/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
index 6a98973347556fe2f22cd270b734e567d4eab437..9ff9d3be62ed1868d11117a4790ce4158941f54f 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 f5a49db5330201f18460a2ec1fbf7d2ff0164790..bfd341db6d3d46b1fff1d12ffb4d86207d8c7436 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 3dcd7e57bc082c46713f08efcaa1f59a48b8cf0a..75d647fed5c2d7a7d1db356ef547400b1b2d8d6e 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 3bbff7f8f2123843118a9dc305aee08b6bb87b96..3ed9fb96925296d2102eebf80d971b9a453fd999 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 1c911cd125df6f0e5ded0d0e5482db67369b707d..8fa368651443a6037277e087d8a55e5d45e41fc4 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -37,84 +37,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 +137,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 +175,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 bdcb28dac21141aa8cea420bf44eee928c9c3ab2..3846a7649e70da4fcbcfadc46627da6259a9e086 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 6b7f2d582b40f6d2790c04366e1eb6d84f9451e9..19238bc5f8671197d155ea34478717773452abb6 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -33,83 +33,83 @@
   #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
 
 //
@@ -125,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
 
 /**
@@ -211,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 dff4749fb728ae1f204a2d0d08d30426cc534986..f0eb0bf4c6437b415d439420d8271a47db95d22b 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_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 f0928b0ed11f40376c7a336749938d26ecdb580b..4c5ba7eca19878a5b6c62c190b64c779f9a18f64 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 8c426af17c5bdc1dcb588dff3bc30799e3b02905..09f35b1fe0f84ac216b516b158f4875221d864ee 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 b1564ea2c3261242c66e14111f7e1296b9434f93..057b51a5845c3a38732bf409b0a727ca3ec224d2 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 985aa056b81a1f6d99179af43f7813340d558075..b769d655d6953be4513d5c90df628d99e717bb08 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 e859310bf0639a46e687a80f1a272690ed93b836..2d06171906578aa5fd20adf47579c19bf2f9885e 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_common.h
@@ -34,19 +34,19 @@
   // 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 82a21118100a1db1bd435227d01be59e4343e42e..c4c90ba6fa0379e39d575acdb57e2fd6041fc28c 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 d56bbd1e45c1c8ee94d53522ed57b65ff3894e43..3236627c3b526a9deddd7965635fc648b04b8091 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 272ff5636b60386bf8e75b7bbd36ac742496fbc2..050932773ea3dba5cb7142e7ae8e746c5057237d 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,67 +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
 
 #ifndef Z_STEP_PIN
-  #define Z_STEP_PIN       46
+  #define Z_STEP_PIN                          46
 #endif
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#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
+  #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
 
 //
@@ -197,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
 
@@ -272,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
@@ -290,13 +290,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
 
@@ -307,11 +307,11 @@
    * 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
@@ -324,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
 
@@ -416,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
 
 //////////////////////////
@@ -436,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
@@ -499,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
@@ -514,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
@@ -615,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
 
     #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
@@ -666,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)
 
@@ -684,22 +684,22 @@
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
       #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
+        #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
@@ -708,16 +708,16 @@
 #endif // HAS_SPI_LCD
 
 #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
   #ifndef BTN_EN1
-    #define BTN_EN1        64
+    #define BTN_EN1                           64
   #endif
   #ifndef BTN_EN2
-    #define BTN_EN2        59
+    #define BTN_EN2                           59
   #endif
   #ifndef BTN_ENC
-    #define BTN_ENC        63
+    #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 ea2ace7e86fd06fbf9f8f847b87079495baa2384..f6847feb4bf544b1dcde5c4a0e3b21d97d150c83 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 39aecb0bc77a495bd7b74e37fd92e5fc743d6818..b0ba7822ef622442251be63facecde5903749578 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 aa45370e6a075f1ed8c64e73aa67fa5f187cfa6e..0323366944d4d49b1ba37699a756c190735aa89d 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 24aa7b9c90325b314331286256d41b841d4e8a4e..f93b6dcc86fe0a203e8add82b001bd5f351322d0 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 da6b6e4187fb8845af89512a12aee7d9f7861f8e..8e8428175484d07d69ea58e53aeb40f61fe90286 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 eb46ec9eaafcab64ae54f6428d3f85d768001b10..d56ab1bb7f27170b04e1fc20223891610da78c85 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 570a9c26f94b4563ad43d0ccbfd1786d03590770..7b0303476b08a3edd7e653cf205964cacefd8478 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 e613b9cb6c03f5d93a50a78df6a5b3f03df11498..4bf10d73994e3ceba1163abd2a4701b775dd838e 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 d3b7413fa2827c6197647f916f4e19f91c6f8cea..221b30b0cb8f48dc50e5af8c3d601e3c4c9d6e23 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 1c5ea39279d506635b5e0fed344241c6b93265f4..dcf5ff5a0a7672791ea4880120865a273db5b0de 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 TRIGORILLA_HEATER_BED_PIN              8
+#define TRIGORILLA_HEATER_0_PIN               10
+#define TRIGORILLA_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 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
 
 // 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    TRIGORILLA_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
 
-#if HOTENDS > 1   // EEF and EEB
+#if HOTENDS > 1                                   // EEF and EEB
   #define RAMPS_D9_PIN   TRIGORILLA_HEATER_1_PIN
   #if !TEMP_SENSOR_BED
     // EEF
-    #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN
+    #define RAMPS_D8_PIN     TRIGORILLA_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_PINTRIGORILLA_HEATER_BED_PIN
+    #define FAN_PIN          TRIGORILLA_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       TRIGORILLA_FAN0_PIN
+  #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN
 #else
   // EFF
-  #define RAMPS_D9_PIN   TRIGORILLA_FAN1_PIN
-  #define RAMPS_D8_PIN   TRIGORILLA_FAN0_PIN
+  #define RAMPS_D9_PIN       TRIGORILLA_FAN1_PIN
+  #define RAMPS_D8_PIN       TRIGORILLA_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           TRIGORILLA_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             TRIGORILLA_FAN2_PIN
+#define ORIG_E0_AUTO_FAN_PINTRIGORILLA_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 9fc53379d5c4fbc8841b137b3c12d7877eeddc1e..f5c79d0b574bfdbce2bc034218d1538fb346d8fb 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -34,70 +34,70 @@
 //
 // 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
+#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
   /**
@@ -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 2af64bb2a0654f505289dd1ba1b7f472f9eb6f42..776dfcc3da34746568848699e7b8613323d81c21 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 8a48b07de76b8b4ff8316ddc99dce7f5026941ff..8cc588a2f9915cd7e4cdda8db63aa937481ba93a 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 e128dc98d2761f8855f68bfa5a80075ebde6205b..dc12442224659792e23df34f45ae8d24938c16f7 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 a6cb05928aa4cfc36ca8fe95a603a34163d26bc2..12c0a36db1d4a3855286dfcc453d69c2bfdcc108 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 450ad1f82548dc6a5006b8d43ee49caa5a4e39ef..5aee07c96f75506850131a96b2f6f0e5b540e57d 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 9808646d32db87f725a955fc256a7580a6081bd5..f55ec51567a3199c61ef0fe55e7c6ca977ab9760 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 3a38e5ce16682ba80c8ac7587e663d12ec32c13b..61c2e1b494e6b66aa1ca34e2c7409299e18feb58 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 619d7f62c747e27aac172b98dd0b0d06ce4014bf..8b035e887604cb80969ec5d464b632f694c54766 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 ddc9f407ecd6c731f538fa382d392d11b3d15429..606e0246978f2adaeff675eb3e13f5038abc1480 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 acd515d8c156d8f27d74ccf10fccf0f451a63cc6..d2114ea4333fe4b47a7afaa6e36bab20fd44c401 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 69fb2a3dfc52aa36f6142d1d432cdd830f4a1a79..f23d008bec50d0effe01f16fcd438d3ac5f71afe 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 4f352ff1523e07b906d67f652162e954e86d7b17..8f1fb750122f37648079d6d4013c70666c1570f0 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 240204ced958baeb82c48548d5c9f6bc20b41a69..34706d5e90ac8e8d077fcdd0b3b16a114328918c 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 c05c6169d6d39c2f89c68899b7bee4fe68dd2d5d..b3a9e456a29e34f19a544c9900d872db0c1cb300 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 41daba4e8e0318988157566d8792c6b3b77acb5e..3bc52e9387df5fcdc9aada842c56d5c85357c286 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 d25ef9e059fffecd1bce0920dde3cbbf409a586a..916dbf64309e673d5f42ece3b8b71085227453de 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 ee44dd7950008575931c51da9640aa2d6c7d4b84..297aaa9cb82cba9fb8210cf355d96ab5f13a4863 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,65 +142,65 @@
 #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
@@ -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 455d40a9996926afc84ac6c8c987e988c3858b4a..0fd4a6b3ead4667c57f14fb71466d83393aab206 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 6963a164bbfef1f7ce02543f1c9fb2bd379f8325..7b844b5be0b5d6d951c62f37bf8b27588647b548 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 d0c24e68a358410511ad4802618cea4a41d9e344..3ba6fd17cf74790fdfe983d09d2ebbdebe71a050 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 db0826e7c9d72a279d4dfbc9a4fb4b1b604142e7..ae01d5da4c1c826719bfb125c31b4cce69fe98da 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 20da59e395926fcb20018a2b9d36f1d29d6120e8..b7d5172e0d9437ca7c63fb1736e57a2babebc2fe 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -36,110 +36,110 @@
 //
 // 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 E2END 0x7FFF                              // 32Kb (24lc256)
+#define I2C_EEPROM                                // EEPROM on I2C-0
 
 //
 // 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 +147,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,13 +161,13 @@
 //
 #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
 
@@ -195,91 +195,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 +345,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 +363,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 +378,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 +465,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 +502,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 +600,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 ebd05037123122022b8bdd4ea3f81e16a1e03e39..73145a3cdbb711549c629a883b7b72b03bd72244 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 833f99fb7f8fbc260e57ae36b6406948f6657289..b9a917d65de13eacce0cdfef93e6184768f70ee3 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 c7c037fd4d463d66e9addc8b30077dc8fa096cc1..6cd6fdaf27b3cde3deb309a8a8ece1f292446bdf 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 d1b8391bcdf7b525ccff15822814988fe6e870eb..0d2449ae6e998ba71de02ecec1b93bb9113f7fc4 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 4ab53faa98c4971add9f00996ee21098cca7d100..bb0e44a3002a2f2f5cf4684260d34ea26168a0e9 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 5121b7d2e98c99f82e87813cf14fdfb04a51722a..9dc9f2808b7799bc6b1bd2037e2e31d9718619f0 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 0f8a92f08dead8271cf843821b26cae923ef0297..67a9762fa085ac4f70cf4acd1d3c83fc1bc0d414 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 958ea78da4b588f193c84edd80e94a8d641aa977..10a52705e77eda980533024c09ba2a69f3a1d10b 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 bf0e34a9ec8db63ef528aee1813e3e3458f76987..8e682453b4f6499ced8792fe74f22942ffe422be 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 50433f6244db3f3391cf965040ee04fcfe77e770..88b80dfb895e01a6cf764b44b7cc0987469f652b 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 c2ba1ed7073b393c3129bc15c15f9eaf8d7723f6..774910bd7d46c7ba5935d906d4e64bbcd43c733a 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 b8340a3debd84a8fa92d8930c024ae43b1fd7b05..73237743b82067b6b1a068a9a779fcecbea9ba23 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 977ba16daf2281ac81c0229e9a2bad2cefb20c45..50d3a53779cb041453b52c1eac4b2d72064ed864 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 528ec4455f484809225b8f0511c8b84e7bb229fe..b945869cbccb2681a75230904972362c932fe962 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/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
index fa555f4151e327e5a40bca2cdcc558693b3951dd..fef8eeb6173705b6d929cb05383679f42e5a5779 100644
--- a/Marlin/src/pins/stm32f1/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,13 +99,13 @@
 //
 #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
 
@@ -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
index 77a412ad613b1064fee71e0a531a019a9925cd04..15bc01263abb77153a9413fbbc9339af95eabf22 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
@@ -40,66 +40,66 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA1
+#define SERVO0_PIN                          PA1
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC0
-#define Y_STOP_PIN         PC1
-#define Z_STOP_PIN         PC2
+#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
+#define Z_MIN_PROBE_PIN                     PC14
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PC15   // "E0-STOP"
+  #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 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 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 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
+#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
+#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
+#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_PIN                     PC13
 #define USB_CONNECT_INVERTING false
 
-#define SD_DETECT_PIN      PC4
+#define SD_DETECT_PIN                       PC4
 
 /**
  *                 _____
@@ -112,40 +112,40 @@
  *                 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
+#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 BEEPER_PIN              EXPA1_10_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
+    #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
+    #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!
+  #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!
+    #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)
 
@@ -159,16 +159,16 @@
      *                   -----
      *                    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
 
   #else
 
@@ -184,8 +184,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_V1_2.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
index 8935da85af17dfc782c038f723b77fcc7198377a..961620ee8ba283f39fe2ff53dd121885fc3668c0 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
@@ -25,7 +25,7 @@
 
 #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
@@ -34,17 +34,17 @@
   //
   // 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/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
index 08f666882eca9d7626650e50da564eb6f2a3cef3..fff3af5b6bc2619a4d9087c6f02836188f5286ff 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
@@ -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
index 2db6b1bc0b92c97248c29340d1759e2266858631..b9272c72116710dbd27896d580a1dc9cfc1d3113 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -41,69 +41,67 @@
 //
 // 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 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 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 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 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 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 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
+#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 SDSS                                -1
+#define LED_PIN                             -1
+#define CASE_LIGHT_PIN                      PA8   // 8
 
-#define PS_ON_PIN          -1
-#define KILL_PIN           PD6      // LED strip 24v
+#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_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
+#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
+  #define FAN_PIN                           PG14  // MAIN BOARD FAN
 #endif
 
 #define FAN_SOFT_PWM
@@ -111,10 +109,10 @@
 //
 // 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
+#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
@@ -122,31 +120,31 @@
 #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
+    #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
+    #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
+    #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
+      #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
+      //#define SHIFT_CLK                   PC6   // 38
+      //#define SHIFT_LD                    PC10  // 42
+      //#define SHIFT_OUT                   PC8   // 40
+      //#define SHIFT_EN                    PA1   // 17
     #endif
   #endif
 
@@ -154,127 +152,127 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        PC5
+      #define BEEPER_PIN                    PC5
 
-      #define BTN_EN1           PB15  // 31
-      #define BTN_EN2           PC1   // 33
-      #define BTN_ENC           PC3   // 35
+      #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
+      #define SD_DETECT_PIN                 PD1   // 49
+      #define KILL_PIN                      PC9   // 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN PC7   // 39
+        #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
+      #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
+      #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_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
+      #define BTN_ENC                       -1
+      #define LCD_SDSS                      PD5   // 53
+      #define SD_DETECT_PIN                 PD1   // 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        PC1   // 33
+      #define BEEPER_PIN                    PC1   // 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         PC12  // 44
-      #define DOGLCD_CS         PC13  // 45
+      #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 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 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 KILL_PIN                      PB15  // 31
 
-      #define STAT_LED_RED_PIN  PC0   // 32
-      #define STAT_LED_BLUE_PIN PC3   // 35
+      #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
+      #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
+      #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 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
+      #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
+      #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
+      #define SD_DETECT_PIN                 PD1   // 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        PC1   // 33
+      #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
+        #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
+        #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
+        #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
+        #define SD_DETECT_PIN               PD1   // 49
+        #define KILL_PIN                    PC9   // 41
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
index db76042ab7f371655503d9ca81df1719cccb88f3..dcd1119c8648ed9a2ecfb3a15842b6048d0aa489 100644
--- a/Marlin/src/pins/stm32f1/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/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index a845ed161b7d21c60b945cca9ee5082a3eb36099..e726ca1831a7ffe4556b21ecae5b00a0d3784ff6 100644
--- a/Marlin/src/pins/stm32f1/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/stm32f1/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
index 3e283911b464cb6a5582b993f0a5417b0851dd99..9c6412c0cb5380b90a81dd10e366cc1e93c7d2cd 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
@@ -36,7 +36,7 @@
 #undef RGB_LED_G_PIN
 #undef RGB_LED_B_PIN
 
-#define FAN1_PIN          PB0 // Fan1
+#define FAN1_PIN                           PB0    // Fan1
 
 #if HAS_TMC_UART
 
@@ -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/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index a35bd298884b9b5078b19829921073cf2885e71e..38cc615f64c6617069dab1c7c18ea0987ad9f70f 100644
--- a/Marlin/src/pins/stm32f1/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/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index 4c14165f799dd5b3bb2a068a3eb6dac69ad2db13..873d02b065a2a09bae4c5a358b2268840b9a2a22 100644
--- a/Marlin/src/pins/stm32f1/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/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index a35bd298884b9b5078b19829921073cf2885e71e..38cc615f64c6617069dab1c7c18ea0987ad9f70f 100644
--- a/Marlin/src/pins/stm32f1/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/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index e02b8b9377b5f44d18153add09b217e3cfeebd9f..24196ad892ffac1d900553bfe94f85f7e0622810 100644
--- a/Marlin/src/pins/stm32f1/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/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index 3849af3ae3a798060146e82de22a39926eeea2c4..6395f6efc934683695f1ed9246939d431e314325 100644
--- a/Marlin/src/pins/stm32f1/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
index 66c5b55ecb74cb49fb4b377cc4e4603688292f8c..83881c128de745dc672cc46a4a6d22a5357c8c36 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -29,20 +29,20 @@
 #endif
 
 #define BOARD_INFO_NAME "Longer3D"
-#define ALFAWISE_UX0             // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
+#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.
+//#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)
+#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
 
@@ -50,60 +50,60 @@
 // 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)
+  #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 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 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 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
+#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)
+#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 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 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
+//#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
+#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                        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)
+  //#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
 
 /**
@@ -118,17 +118,17 @@
  * 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_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 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
+#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
@@ -136,11 +136,11 @@
  * 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)
+  #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
 
 //
@@ -153,12 +153,12 @@
 #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 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)
diff --git a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
index 624c59ebea78faa3b718523df650b917de2f57fc..9829018d8df4861dd0759d73c1e3f0a45e78178f 100644
--- a/Marlin/src/pins/stm32f1/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
index 3b10bae139e4c8e750d12774a3db76992b255d79..db35548e88ee8e6e411bd4a638d535fc8d4991c8 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -43,72 +43,72 @@
 //
 // 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
+#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
+#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 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 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 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 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
+#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
+#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 HEATER_0_PIN                        PC7   // HEATER1
+#define HEATER_1_PIN                        PA6   // HEATER2
+#define HEATER_BED_PIN                      PC6   // HOT BED
 
-#define FAN_PIN            PA7   // FAN
+#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 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 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
+#define BEEPER_PIN                          PC13
+#define LED_PIN                             PB2
 
 /**
  * Note: MKS Robin TFT screens use various TFT controllers
@@ -122,38 +122,38 @@
  * 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_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
+#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
+  #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
+  #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
+  #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/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 1a7d664899c6e01e9e81c8f8961ac97421051c05..4c10a310bf7dbca96b725fe7e036a01478cfe40a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -39,74 +39,74 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PC13
-#define Y_STOP_PIN         PC0
-#define Z_MIN_PIN          PC12
-#define Z_MAX_PIN          PB9
+#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 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 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 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
+#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
+#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 TEMP_BED_PIN                        PA1
+#define TEMP_0_PIN                          PA0
 
-#define FIL_RUNOUT_PIN     PB8  // MT_DET
+#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 BEEPER_PIN                        PD2
+  #define BTN_ENC                           PB3
+  #define LCD_PINS_RS                       PC3
 
-  #define BTN_EN1          PB5
-  #define BTN_EN2          PB4
+  #define BTN_EN1                           PB5
+  #define BTN_EN2                           PB4
 
-  #define LCD_PINS_ENABLE  PC2
+  #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
+    #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
+  #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4    PC1
+    #define LCD_PINS_D4                     PC1
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  -1
-      #define LCD_PINS_D6  -1
-      #define LCD_PINS_D7  -1
+      #define LCD_PINS_D5                   -1
+      #define LCD_PINS_D6                   -1
+      #define LCD_PINS_D7                   -1
     #endif
 
   #endif // !MKS_MINI_12864
@@ -114,9 +114,9 @@
 #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_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.
 
@@ -124,11 +124,11 @@
 // 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
+#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)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
index 9a404ec64d24781a88601f3009bb6ed16ce78cfc..466bdecc8141a6f1f4ee6f5f53bccf182cc1cc16 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -43,89 +43,89 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA3
+#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
+#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 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 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 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 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
+#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
+#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 TEMP_BED_PIN                        PA1   //TB
+#define TEMP_0_PIN                          PA0   //TH1
+#define TEMP_1_PIN                          PA2   //TH2
 
-#define FIL_RUNOUT_PIN     PB10 // MT_DET
+#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
+  #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
+    #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
+  #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4    PA6
+    #define LCD_PINS_D4                     PA6
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PA7
-      #define LCD_PINS_D6  PC4
-      #define LCD_PINS_D7  PC5
+      #define LCD_PINS_D5                   PA7
+      #define LCD_PINS_D6                   PC4
+      #define LCD_PINS_D7                   PC5
     #endif
 
   #endif // !MKS_MINI_12864
@@ -136,18 +136,18 @@
 // 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
+#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)
+  #define ST7920_DELAY_1           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(125)
+  #define ST7920_DELAY_2           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(125)
+  #define ST7920_DELAY_3           DELAY_NS(125)
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index 16e74b169e97c2e10c18b0f955055d80348fb399..50babad2746ecfab5feda11659af73e47e1a0e80 100644
--- a/Marlin/src/pins/stm32f1/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
index 223f520ebe2eb3a5bc9bd2991ff4a58fbce5d893..ae9118e6d0e2b09a69644947687836220fcac85e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -41,78 +41,78 @@
 //
 // 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
 
-#define E1_ENABLE_PIN      PA3
-#define E1_STEP_PIN        PA6
-#define E1_DIR_PIN         PA1
+#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
+#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 HEATER_0_PIN                        PC3   // HEATER1
+#define HEATER_1_PIN                        PB0   // HEATER2
+#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
 
 //
 // SD Card
 //
 #define SDIO_SUPPORT
-#define SD_DETECT_PIN      PD12
+#define SD_DETECT_PIN                       PD12
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         PC5
+#define BEEPER_PIN                          PC5
 
 /**
  * Note: MKS Robin TFT screens use various TFT controllers.
@@ -120,18 +120,18 @@
  * 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    // FSMC_RST
-  #define NO_LCD_REINIT             // Suppress LCD re-initialization
+  #define LCD_RESET_PIN                     PC6   // FSMC_RST
+  #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     PA7  // SPI2_NSS
-    #define TOUCH_SCK_PIN    PB13 // SPI2_SCK
-    #define TOUCH_MISO_PIN   PB14 // SPI2_MISO
-    #define TOUCH_MOSI_PIN   PB15 // SPI2_MOSI
+    #define 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
index 9090fb34c4b3ffc01c870fff2e2c1c2e3bd024d9..b42856721d0fcd53c8a17dee893474c4431715bb 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -47,74 +47,74 @@
 //
 // Servos
 //
-#define SERVO0_PIN         PA8   // BLTOUCH
+#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
+#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
+#define X_ENABLE_PIN                        PE4
+#define X_STEP_PIN                          PE3
+#define X_DIR_PIN                           PE2
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PF8
+  #define X_CS_PIN                          PF8
 #endif
 
-#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
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PF3
+  #define Y_CS_PIN                          PF3
 #endif
 
-#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
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PF6
+  #define Z_CS_PIN                          PF6
 #endif
 
-#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
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PG15
+  #define E0_CS_PIN                         PG15
 #endif
 
-#define E1_ENABLE_PIN      PA3
-#define E1_STEP_PIN        PA6
-#define E1_DIR_PIN         PA1
+#define E1_ENABLE_PIN                       PA3
+#define E1_STEP_PIN                         PA6
+#define E1_DIR_PIN                          PA1
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PG10
+  #define E1_CS_PIN                         PG10
 #endif
 
-#define E2_ENABLE_PIN      PF0
-#define E2_STEP_PIN        PF2
-#define E2_DIR_PIN         PF1
+#define E2_ENABLE_PIN                       PF0
+#define E2_STEP_PIN                         PF2
+#define E2_DIR_PIN                          PF1
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG9
+  #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
+    #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
 
@@ -140,71 +140,71 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PF7
-  #define X_SERIAL_RX_PIN  PF8
+  #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 Y_SERIAL_TX_PIN                   PF4
+  #define Y_SERIAL_RX_PIN                   PF3
 
-  #define Z_SERIAL_TX_PIN  PF5
-  #define Z_SERIAL_RX_PIN  PF6
+  #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 E0_SERIAL_TX_PIN                  PG13
+  #define E0_SERIAL_RX_PIN                  PG15
 
-  #define E1_SERIAL_TX_PIN PG12
-  #define E1_SERIAL_RX_PIN PG10
+  #define E1_SERIAL_TX_PIN                  PG12
+  #define E1_SERIAL_RX_PIN                  PG10
 
-  #define E2_SERIAL_TX_PIN PC13
-  #define E2_SERIAL_RX_PIN PG9
+  #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
+#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-
+#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 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
+#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
+  #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
+  #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
+  #define SD_DETECT_PIN                     PD12
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -215,60 +215,60 @@
  * 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    PF6
-  #define NO_LCD_REINIT             // Suppress LCD re-initialization
+  #define LCD_RESET_PIN                     PF6
+  #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   PA7
+    #define TOUCH_CS_PIN                    PA7
   #else
-    #define BEEPER_PIN     PC5
-    #define BTN_ENC        PG2
-    #define BTN_EN1        PG5
-    #define BTN_EN2        PG4
+    #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
+  #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
+    #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
+  #else                                           // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
 
-    #define LCD_PINS_D4    PF14
+    #define LCD_PINS_D4                     PF14
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  PF15
-      #define LCD_PINS_D6  PF12
-      #define LCD_PINS_D7  PF13
+      #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)
+  #define ST7920_DELAY_1           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(125)
+  #define ST7920_DELAY_2           DELAY_NS(125)
 #endif
 #ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(125)
+  #define ST7920_DELAY_3           DELAY_NS(125)
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MORPHEUS.h b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
index 8c583434e48676e6bac30085b98e1baf671350d9..7311d91a80ffd76b14f1838d74fd9d00befb9a5e 100644
--- a/Marlin/src/pins/stm32f1/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
index b43492af21c39868a324f20500441263af62435f..d144c0e69244b0d7cb8ef84e649e3fd8970da83a 100644
--- a/Marlin/src/pins/stm32f1/pins_STM32F1R.h
+++ b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
@@ -38,61 +38,61 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PB3
-#define Y_STOP_PIN         PB4
-#define Z_STOP_PIN         PB5
+#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 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 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 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
+#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 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
+#define E2_STEP_PIN                         PC10
+#define E2_DIR_PIN                          PC11
+#define E2_ENABLE_PIN                       PA8
 
 //
 // Misc. Functions
 //
-#define SDSS               PA4
-#define LED_PIN            PD2
+#define SDSS                                PA4
+#define LED_PIN                             PD2
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PB0   // EXTRUDER 1
-#define HEATER_1_PIN       PB1
+#define HEATER_0_PIN                        PB0   // EXTRUDER 1
+#define HEATER_1_PIN                        PB1
 
-#define HEATER_BED_PIN     PA3   // BED
+#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
+#define TEMP_BED_PIN                        PA0   // Analog Input
+#define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_1_PIN                          PA2   // Analog Input
 
 //
 // LCD Pins
@@ -100,25 +100,25 @@
 #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
+    #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
+    #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
+    #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
+      #define BEEPER_PIN 33
       // Buttons attached to a shift register
       // Not wired yet
       //#define SHIFT_CLK 38
@@ -132,14 +132,14 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN 37
 
-      #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          41
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         #define LCD_BACKLIGHT_PIN 39
@@ -147,112 +147,112 @@
 
     #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 SD_DETECT_PIN     -1
-      #define KILL_PIN          41
+      #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_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 BTN_ENC                       -1
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
+      #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 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 SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN          31
+      #define KILL_PIN 31
 
-      #define STAT_LED_RED_PIN  32
+      #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 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
+      #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 DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
 
-      #define KILL_PIN          64
+      #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
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
       // not connected to a pin
-      #define SD_DETECT_PIN     49
+      #define SD_DETECT_PIN 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #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
+        #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
+        #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
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
index 99f1cea35ce3143f26703fd40f7193de3056e92e..58b13b90dfe9036dbebe3780aeec29d051d027b8 100644
--- a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
@@ -41,72 +41,72 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PD0
-#define Y_STOP_PIN         PD1
-#define Z_STOP_PIN         PD4
+#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 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 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 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 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 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
+#define E2_STEP_PIN                         PE11
+#define E2_DIR_PIN                          PE10
+#define E2_ENABLE_PIN                       PC5
 
 //
 // Misc. Functions
 //
-#define SDSS               PA15
-#define LED_PIN            PB2
+#define SDSS                                PA15
+#define LED_PIN                             PB2
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       PD12   // EXTRUDER 1
-//#define HEATER_1_PIN       PD13
+#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
+#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
+  #define FAN_PIN                           PD14
 #endif
-#define FAN1_PIN           PD13
+#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
+#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
+  #define SPINDLE_LASER_PWM_PIN             PB8
+  #define SPINDLE_LASER_ENA_PIN             PD5
 #endif
 
 //
@@ -115,54 +115,54 @@
 #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
+    #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
+    #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
+    #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
+      #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 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)
+    #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 BEEPER_PIN 37
 
-      #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          41
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         #define LCD_BACKLIGHT_PIN 39
@@ -170,113 +170,113 @@
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1      64
-      #define BTN_EN2      59
-      #define BTN_ENC      63
+      #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
+      #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_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 BTN_ENC                       -1
+      #define LCD_SDSS 53
       #define SD_DETECT_PIN 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN   33
+      #define BEEPER_PIN 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0    44
-      #define DOGLCD_CS    45
+      #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 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 SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN     31
+      #define KILL_PIN 31
 
-      #define STAT_LED_RED_PIN  32
+      #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 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_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
+      #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 DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
 
-      #define KILL_PIN     64
+      #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
+      #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
+      #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
+        #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
+        #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 KILL_PIN 41
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index 1e3333651247505c0aa7cdcff8d3d586f771ccf4..ddbe09c355fd07ea4c629bad85f477bacd327805 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -34,21 +34,21 @@
   #define ARMED_V1_1
 #endif
 
-#undef BOARD_INFO_NAME // Defined on the command line by Arduino Core STM32
+#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
+#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
+#define X_STOP_PIN                          PE0
+#define Y_STOP_PIN                          PE1
+#define Z_STOP_PIN                          PE14
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -61,7 +61,7 @@
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   PA3
+  #define FIL_RUNOUT_PIN                    PA3
 #endif
 
 //
@@ -69,163 +69,163 @@
 //
 
 #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
+  #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
+  #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 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 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
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB6
 #ifdef ARMED_V1_1
-  #define E0_ENABLE_PIN    PC12
+  #define E0_ENABLE_PIN                     PC12
 #else
-  #define E0_ENABLE_PIN    PB3
+  #define E0_ENABLE_PIN                     PB3
 #endif
-#define E0_CS_PIN          PB4
+#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
+  #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
+  #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
+#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
+  #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 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
+#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
+#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
+#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 DOGLCD_A0                         PE9
+  #define DOGLCD_CS                         PE8
 
-  #define LCD_BACKLIGHT_PIN -1
+  #define LCD_BACKLIGHT_PIN                 -1
 
-  #define LCD_RESET_PIN    PB12   // Must be high or open for LCD to operate normally.
+  #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
+      #define RGB_LED_R_PIN                 PB13
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN PB14
+      #define RGB_LED_G_PIN                 PB14
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN PB15
+      #define RGB_LED_B_PIN                 PB15
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN   PB13
+    #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
+  #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
+    #define DOGLCD_CS                       PB13
+    #define DOGLCD_A0                       PB14
   #endif
 #endif
 
-#define BTN_EN1            PC4
-#define BTN_EN2            PC5
-#define BTN_ENC            PC3
+#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
+#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 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 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 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 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 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 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
index d779994d192630566a26c98de5e04442ea8296ca..5be4368789f04e22944f14c4aa9e171f13b72127 100644
--- a/Marlin/src/pins/stm32f4/pins_BEAST.h
+++ b/Marlin/src/pins/stm32f4/pins_BEAST.h
@@ -41,70 +41,70 @@
 //
 // 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 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 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 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 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
+#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 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
+#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 SDSS                                PA15
+#define LED_PIN                             PB2
 
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
+#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_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
+#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
+  #define FAN_PIN                           PB10
 #endif
 
 #define FAN_SOFT_PWM
@@ -112,10 +112,10 @@
 //
 // 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
+#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
@@ -123,25 +123,25 @@
 #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
+    #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
+    #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
+    #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
+      #define BEEPER_PIN 33
       // Buttons attached to a shift register
       // Not wired yet
       //#define SHIFT_CLK 38
@@ -155,14 +155,14 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN 37
 
-      #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          41
+      #define SD_DETECT_PIN 49
+      #define KILL_PIN 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         #define LCD_BACKLIGHT_PIN 39
@@ -170,113 +170,113 @@
 
     #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 SD_DETECT_PIN     -1
-      #define KILL_PIN          41
+      #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_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 BTN_ENC                       -1
+      #define LCD_SDSS 53
+      #define SD_DETECT_PIN 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
+      #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 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 SDSS 53
+      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN          31
+      #define KILL_PIN 31
 
-      #define STAT_LED_RED_PIN  32
+      #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 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
+      #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 DOGLCD_A0 44
+      #define DOGLCD_CS 66
+      #define LCD_BACKLIGHT_PIN 65                // backlight LED on A11/D65
+      #define SDSS 53
 
-      #define KILL_PIN          64
+      #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
+      #define BTN_EN1 40
+      #define BTN_EN2 63
+      #define BTN_ENC 59
       // not connected to a pin
-      #define SD_DETECT_PIN     49
+      #define SD_DETECT_PIN 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #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
+        #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
+        #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
       #else
-        //#define SD_DETECT_PIN -1   // Ramps doesn't use this
+        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
       #endif
 
     #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
index d0edf897f4076a70cd2a15825f0b8b32b5329743..170b90368bddc34b796f6c77df778a60c379f213 100644
--- a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@@ -40,116 +40,116 @@
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
 
 //#define I2C_EEPROM
-//#define E2END 0x1FFF // 8KB
+//#define E2END 0x1FFF                            // 8KB
 #define SRAM_EEPROM_EMULATION
 
 //
 // Servos
 //
-#define SERVO0_PIN         PC6
-#define SERVO1_PIN         PC7
+#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
+#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 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 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 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 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
+#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
+#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
+  #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 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
+#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
+#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 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 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
+#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
+#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
+  #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
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
index 5d2c83e3b9e34212cafb5bb7363202efa6f05f7e..ee5c4da1fe57ed14154db88b8e66b3d6d26d3359 100644
--- a/Marlin/src/pins/stm32f4/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,13 +100,13 @@
 //
 #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
 
@@ -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
index eaef0b09dff7a491145f6cd152f2383685253efe..ac8b731aae5599b9e7bf17197b447a87312be4d7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -33,121 +33,121 @@
 
 // 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 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
+#define TP                                        // Enable to define servo and probe pins
 
 //
 // Servos
 //
 #if ENABLED(TP)
-  #define SERVO0_PIN       PB11
+  #define SERVO0_PIN                        PB11
 #endif
 
-#define PS_ON_PIN          PH6
+#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
+#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
+//#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
+  #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
+#define X_STEP_PIN                          PC15
+#define X_DIR_PIN                           PF0
+#define X_ENABLE_PIN                        PF1
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PC14
+  #define X_CS_PIN                          PC14
 #endif
 
-#define Y_STEP_PIN         PE3
-#define Y_DIR_PIN          PE2
-#define Y_ENABLE_PIN       PE4
+#define Y_STEP_PIN                          PE3
+#define Y_DIR_PIN                           PE2
+#define Y_ENABLE_PIN                        PE4
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PE1
+  #define Y_CS_PIN                          PE1
 #endif
 
-#define Z_STEP_PIN         PB8
-#define Z_DIR_PIN          PB7   // PB7
-#define Z_ENABLE_PIN       PB9
+#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
+  #define Z_CS_PIN                          PB5
 #endif
 
-#define E0_STEP_PIN        PG12
-#define E0_DIR_PIN         PG11
-#define E0_ENABLE_PIN      PG13
+#define E0_STEP_PIN                         PG12
+#define E0_DIR_PIN                          PG11
+#define E0_ENABLE_PIN                       PG13
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PG10
+  #define E0_CS_PIN                         PG10
 #endif
 
-#define E1_STEP_PIN        PD6
-#define E1_DIR_PIN         PD5
-#define E1_ENABLE_PIN      PD7
+#define E1_STEP_PIN                         PD6
+#define E1_DIR_PIN                          PD5
+#define E1_ENABLE_PIN                       PD7
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PD4
+  #define E1_CS_PIN                         PD4
 #endif
 
-#define E2_STEP_PIN        PD1
-#define E2_DIR_PIN         PD0
-#define E2_ENABLE_PIN      PD2
+#define E2_STEP_PIN                         PD1
+#define E2_DIR_PIN                          PD0
+#define E2_ENABLE_PIN                       PD2
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PC12
+  #define E2_CS_PIN                         PC12
 #endif
 
-#define E3_STEP_PIN        PF3
-#define E3_DIR_PIN         PG3
-#define E3_ENABLE_PIN      PF8
+#define E3_STEP_PIN                         PF3
+#define E3_DIR_PIN                          PG3
+#define E3_ENABLE_PIN                       PF8
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        PG4
+  #define E3_CS_PIN                         PG4
 #endif
 
-#define E4_STEP_PIN        PD14
-#define E4_DIR_PIN         PD11
-#define E4_ENABLE_PIN      PG2
+#define E4_STEP_PIN                         PD14
+#define E4_DIR_PIN                          PD11
+#define E4_ENABLE_PIN                       PG2
 #ifndef E4_CS_PIN
-  #define E4_CS_PIN        PE15
+  #define E4_CS_PIN                         PE15
 #endif
 
-#define E5_STEP_PIN        PE12
-#define E5_DIR_PIN         PE10
-#define E5_ENABLE_PIN      PF14
+#define E5_STEP_PIN                         PE12
+#define E5_DIR_PIN                          PE10
+#define E5_ENABLE_PIN                       PF14
 #ifndef E5_CS_PIN
-  #define E5_CS_PIN        PE7
+  #define E5_CS_PIN                         PE7
 #endif
 
-#define E6_STEP_PIN        PG0
-#define E6_DIR_PIN         PG1
-#define E6_ENABLE_PIN      PE8
+#define E6_STEP_PIN                         PG0
+#define E6_DIR_PIN                          PG1
+#define E6_ENABLE_PIN                       PE8
 #ifndef E6_CS_PIN
-  #define E6_CS_PIN        PF15
+  #define E6_CS_PIN                         PF15
 #endif
 
-#define E7_STEP_PIN        PH12
-#define E7_DIR_PIN         PH15
-#define E7_ENABLE_PIN      PI0
+#define E7_STEP_PIN                         PH12
+#define E7_DIR_PIN                          PH15
+#define E7_ENABLE_PIN                       PI0
 #ifndef E7_CS_PIN
-  #define E7_CS_PIN        PH14
+  #define E7_CS_PIN                         PH14
 #endif
 
 //
@@ -155,13 +155,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PG15
+    #define TMC_SW_MOSI                     PG15
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PB6
+    #define TMC_SW_MISO                     PB6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PB3
+    #define TMC_SW_SCK                      PB3
   #endif
 #endif
 
@@ -190,38 +190,38 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PC14
-  #define X_SERIAL_RX_PIN  PC14
+  #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 Y_SERIAL_TX_PIN                   PE1
+  #define Y_SERIAL_RX_PIN                   PE1
 
-  #define Z_SERIAL_TX_PIN  PB5
-  #define Z_SERIAL_RX_PIN  PB5
+  #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 E0_SERIAL_TX_PIN                  PG10
+  #define E0_SERIAL_RX_PIN                  PG10
 
-  #define E1_SERIAL_TX_PIN PD4
-  #define E1_SERIAL_RX_PIN PD4
+  #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 E2_SERIAL_TX_PIN                  PC12
+  #define E2_SERIAL_RX_PIN                  PC12
 
-  #define E3_SERIAL_TX_PIN PG4
-  #define E3_SERIAL_RX_PIN PG4
+  #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 E4_SERIAL_TX_PIN                  PE15
+  #define E4_SERIAL_RX_PIN                  PE15
 
-  #define E5_SERIAL_TX_PIN PE7
-  #define E5_SERIAL_RX_PIN PE7
+  #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 E6_SERIAL_TX_PIN                  PF15
+  #define E6_SERIAL_RX_PIN                  PF15
 
-  #define E7_SERIAL_TX_PIN PH14
-  #define E7_SERIAL_RX_PIN PH14
+  #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
@@ -230,75 +230,75 @@
 //
 // 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_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_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
+#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 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
+#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_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_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 HEATER_BED_PIN                      PA2   // Hotbed
 
-#define FAN_PIN            PE5   // Fan0
-#define FAN1_PIN           PE6   // Fan1
-#define FAN2_PIN           PC8   // Fan2
+#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
+#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
+  #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
+  #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
 
 /**
@@ -316,18 +316,18 @@
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PC11
-  #define BTN_ENC          PA15
+  #define BEEPER_PIN                        PC11
+  #define BTN_ENC                           PA15
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    PA8
+    #define LCD_PINS_RS                     PA8
 
-    #define BTN_EN1        PD10
-    #define BTN_EN2        PH10
+    #define BTN_EN1                         PD10
+    #define BTN_EN2                         PH10
 
-    #define LCD_PINS_ENABLE PG7
-    #define LCD_PINS_D4    PG8
+    #define LCD_PINS_ENABLE                 PG7
+    #define LCD_PINS_D4                     PG8
 
     //#undef ST7920_DELAY_1
     //#undef ST7920_DELAY_2
@@ -335,43 +335,43 @@
 
   #else
 
-    #define LCD_PINS_RS    PA8
+    #define LCD_PINS_RS                     PA8
 
-    #define BTN_EN1        PD10
-    #define BTN_EN2        PH10
+    #define BTN_EN1                         PD10
+    #define BTN_EN2                         PH10
 
     #if DISABLED(CUSTOM_SPI_PINS)
-      #define SD_DETECT_PIN PB10
-      #define LCD_SDSS     PB12
+      #define SD_DETECT_PIN                 PB10
+      #define LCD_SDSS                      PB12
     #endif
 
-    #define LCD_PINS_ENABLE PC10
-    #define LCD_PINS_D4    PG8
+    #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.
+      #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
+          #define RGB_LED_R_PIN             PG7
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PG6
+          #define RGB_LED_G_PIN             PG6
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PG5
+          #define RGB_LED_B_PIN             PG5
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PF13
+        #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
+      #define LCD_PINS_D5                   PG7
+      #define LCD_PINS_D6                   PG6
+      #define LCD_PINS_D7                   PG5
     #endif
 
   #endif
@@ -383,9 +383,9 @@
     #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
+  //#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
index 3376a997116b1fc8eaa2004874b5ce430e0d2a30..4dbdf0e77f60836ba09e46289437239284499161 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
@@ -30,74 +30,74 @@
 #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
+//#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
+//#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
 
 //
 // Servos
 //
-#define SERVO0_PIN         PA1
+#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
+#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
+  #define Z_MIN_PROBE_PIN                   PA2
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         PE9
-#define X_DIR_PIN          PF1
-#define X_ENABLE_PIN       PF2
+#define X_STEP_PIN                          PE9
+#define X_DIR_PIN                           PF1
+#define X_ENABLE_PIN                        PF2
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PA15
+  #define X_CS_PIN                          PA15
 #endif
 
-#define Y_STEP_PIN         PE11
-#define Y_DIR_PIN          PE8
-#define Y_ENABLE_PIN       PD7
+#define Y_STEP_PIN                          PE11
+#define Y_DIR_PIN                           PE8
+#define Y_ENABLE_PIN                        PD7
  #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PB8
+  #define Y_CS_PIN                          PB8
 #endif
 
-#define Z_STEP_PIN         PE13
-#define Z_DIR_PIN          PC2
-#define Z_ENABLE_PIN       PC0
+#define Z_STEP_PIN                          PE13
+#define Z_DIR_PIN                           PC2
+#define Z_ENABLE_PIN                        PC0
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PB9
+  #define Z_CS_PIN                          PB9
 #endif
 
-#define E0_STEP_PIN        PE14
-#define E0_DIR_PIN         PA0
-#define E0_ENABLE_PIN      PC3
+#define E0_STEP_PIN                         PE14
+#define E0_DIR_PIN                          PA0
+#define E0_ENABLE_PIN                       PC3
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PB3
+  #define E0_CS_PIN                         PB3
 #endif
 
-#define E1_STEP_PIN        PD15
-#define E1_DIR_PIN         PE7
-#define E1_ENABLE_PIN      PA3
+#define E1_STEP_PIN                         PD15
+#define E1_DIR_PIN                          PE7
+#define E1_ENABLE_PIN                       PA3
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PG15
+  #define E1_CS_PIN                         PG15
 #endif
 
-#define E2_STEP_PIN        PD13
-#define E2_DIR_PIN         PG9
-#define E2_ENABLE_PIN      PF0
+#define E2_STEP_PIN                         PD13
+#define E2_DIR_PIN                          PG9
+#define E2_ENABLE_PIN                       PF0
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG12
+  #define E2_CS_PIN                         PG12
 #endif
 
 //
@@ -105,13 +105,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    PC12
+    #define TMC_SW_MOSI                     PC12
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    PC11
+    #define TMC_SW_MISO                     PC11
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     PC10
+    #define TMC_SW_SCK                      PC10
   #endif
 #endif
 
@@ -137,23 +137,23 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PC13
-  #define X_SERIAL_RX_PIN  PC13
+  #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 Y_SERIAL_TX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN                   PE3
 
-  #define Z_SERIAL_TX_PIN  PE1
-  #define Z_SERIAL_RX_PIN  PE1
+  #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 E0_SERIAL_TX_PIN                  PD4
+  #define E0_SERIAL_RX_PIN                  PD4
 
-  #define E1_SERIAL_TX_PIN PD1
-  #define E1_SERIAL_RX_PIN PD1
+  #define E1_SERIAL_TX_PIN                  PD1
+  #define E1_SERIAL_RX_PIN                  PD1
 
-  #define E2_SERIAL_TX_PIN PD6
-  #define E2_SERIAL_RX_PIN PD6
+  #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
@@ -162,28 +162,28 @@
 //
 // 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
+#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
+#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
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 //
@@ -191,16 +191,15 @@
 //   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
+  #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
+  #define SDSS                              PB12
 #endif
 
-
 /**
  *               _____                                             _____
  *           NC | · · | GND                                    5V | · · | GND
@@ -216,17 +215,17 @@
 // LCDs and Controllers
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PG4
-  #define BTN_ENC          PA8
+  #define BEEPER_PIN                        PG4
+  #define BTN_ENC                           PA8
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PG6
+    #define LCD_PINS_RS                     PG6
 
-    #define BTN_EN1        PD11
-    #define BTN_EN2        PG2
+    #define BTN_EN1                         PD11
+    #define BTN_EN2                         PG2
 
-    #define LCD_PINS_ENABLE PG7
-    #define LCD_PINS_D4    PG3
+    #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.
@@ -234,44 +233,43 @@
     #undef ST7920_DELAY_2
     #undef ST7920_DELAY_3
 
-
   #else
 
-    #define LCD_PINS_RS    PD10
+    #define LCD_PINS_RS                     PD10
 
-    #define BTN_EN1        PG10
-    #define BTN_EN2        PF11
-    #define SD_DETECT_PIN  PF12
+    #define BTN_EN1                         PG10
+    #define BTN_EN2                         PF11
+    #define SD_DETECT_PIN                   PF12
 
-    #define LCD_SDSS       PB12
+    #define LCD_SDSS                        PB12
 
-    #define LCD_PINS_ENABLE PD11
-    #define LCD_PINS_D4    PG2
+    #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.
+      #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
+          #define RGB_LED_R_PIN             PG3
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PG6
+          #define RGB_LED_G_PIN             PG6
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PG7
+          #define RGB_LED_B_PIN             PG7
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PG3
+        #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
+      #define LCD_PINS_D5                   PG3
+      #define LCD_PINS_D6                   PG6
+      #define LCD_PINS_D7                   PG7
     #endif
 
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 8c8ea2adc1c037b69e10b273c239f3de1cdb4b4e..8205cd9f4db05618b1d2e89dbdacaaa9dd2600de 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -32,147 +32,147 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 #undef E2END
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 //
 // Servos
 //
-#define SERVO0_PIN         PE11
+#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
+#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
+#define Z_MIN_PROBE_PIN                     PC14  // Z3_PIN
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         PB9
-#define X_DIR_PIN          PE0
-#define X_ENABLE_PIN       PE1
+#define X_STEP_PIN                          PB9
+#define X_DIR_PIN                           PE0
+#define X_ENABLE_PIN                        PE1
 #ifndef X_CS_PIN
-  #define X_CS_PIN         PG13
+  #define X_CS_PIN                          PG13
 #endif
 
-#define Y_STEP_PIN         PB8
-#define Y_DIR_PIN          PG11
-#define Y_ENABLE_PIN       PG12
+#define Y_STEP_PIN                          PB8
+#define Y_DIR_PIN                           PG11
+#define Y_ENABLE_PIN                        PG12
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         PG10
+  #define Y_CS_PIN                          PG10
 #endif
 
-#define Z_STEP_PIN         PA8
-#define Z_DIR_PIN          PD6
-#define Z_ENABLE_PIN       PD7
+#define Z_STEP_PIN                          PA8
+#define Z_DIR_PIN                           PD6
+#define Z_ENABLE_PIN                        PD7
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         PD5
+  #define Z_CS_PIN                          PD5
 #endif
 
-#define E0_STEP_PIN        PC7
-#define E0_DIR_PIN         PD3
-#define E0_ENABLE_PIN      PD4
+#define E0_STEP_PIN                         PC7
+#define E0_DIR_PIN                          PD3
+#define E0_ENABLE_PIN                       PD4
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PD1
+  #define E0_CS_PIN                         PD1
 #endif
 
-#define E1_STEP_PIN        PC6
-#define E1_DIR_PIN         PA15
-#define E1_ENABLE_PIN      PD0
+#define E1_STEP_PIN                         PC6
+#define E1_DIR_PIN                          PA15
+#define E1_ENABLE_PIN                       PD0
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PA14
+  #define E1_CS_PIN                         PA14
 #endif
 
-#define E2_STEP_PIN        PD15
-#define E2_DIR_PIN         PG7
-#define E2_ENABLE_PIN      PG8
+#define E2_STEP_PIN                         PD15
+#define E2_DIR_PIN                          PG7
+#define E2_ENABLE_PIN                       PG8
 #ifndef E2_CS_PIN
-  #define E2_CS_PIN        PG6
+  #define E2_CS_PIN                         PG6
 #endif
 
-#define E3_STEP_PIN        PD14
-#define E3_DIR_PIN         PG4
-#define E3_ENABLE_PIN      PG5
+#define E3_STEP_PIN                         PD14
+#define E3_DIR_PIN                          PG4
+#define E3_ENABLE_PIN                       PG5
 #ifndef E3_CS_PIN
-  #define E3_CS_PIN        PG3
+  #define E3_CS_PIN                         PG3
 #endif
 
-#define E4_STEP_PIN        PD13
-#define E4_DIR_PIN         PD11
-#define E4_ENABLE_PIN      PG2
+#define E4_STEP_PIN                         PD13
+#define E4_DIR_PIN                          PD11
+#define E4_ENABLE_PIN                       PG2
 #ifndef E4_CS_PIN
-  #define E4_CS_PIN        PD10
+  #define E4_CS_PIN                         PD10
 #endif
 
-#define E5_STEP_PIN        PD12
-#define E5_DIR_PIN         PD8
-#define E5_ENABLE_PIN      PD9
+#define E5_STEP_PIN                         PD12
+#define E5_DIR_PIN                          PD8
+#define E5_ENABLE_PIN                       PD9
 #ifndef E5_CS_PIN
-  #define E5_CS_PIN        PB12
+  #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
+#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
+#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
+  #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
+#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
+#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
+  #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
 
@@ -182,13 +182,13 @@
 
 #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
 
@@ -197,70 +197,69 @@
 //
 
 #if HAS_TMC_UART
-  #define X_SERIAL_TX_PIN  PG13
-  #define X_SERIAL_RX_PIN  PG13
+  #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 Y_SERIAL_TX_PIN                   PG10
+  #define Y_SERIAL_RX_PIN                   PG10
 
-  #define Z_SERIAL_TX_PIN  PD5
-  #define Z_SERIAL_RX_PIN  PD5
+  #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 E0_SERIAL_TX_PIN                  PD1
+  #define E0_SERIAL_RX_PIN                  PD1
 
-  #define E1_SERIAL_TX_PIN PA14
-  #define E1_SERIAL_RX_PIN PA14
+  #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 E2_SERIAL_TX_PIN                  PG6
+  #define E2_SERIAL_RX_PIN                  PG6
 
-  #define E3_SERIAL_TX_PIN PG3
-  #define E3_SERIAL_RX_PIN PG3
+  #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 E4_SERIAL_TX_PIN                  PD10
+  #define E4_SERIAL_RX_PIN                  PD10
 
-  #define E5_SERIAL_TX_PIN PB12
-  #define E5_SERIAL_RX_PIN PB12
+  #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
+#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
+#define FIL_RUNOUT_PIN                      PA3
 
 //
 // ST7920 Delays
 //
 #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
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index d135ef0750c028062db80c1d0c6cdae4b23d2fd1..bdadbe36c20f42f163d7dcf543bd6acd7bc15894 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -47,65 +47,65 @@
 //#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
+  #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
+#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
+#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
+  #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
+#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
   //
@@ -115,78 +115,78 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  PE9
-  #define X_SERIAL_RX_PIN  PE8
+  #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 Y_SERIAL_TX_PIN                   PE14
+  #define Y_SERIAL_RX_PIN                   PE13
 
-  #define Z_SERIAL_TX_PIN  PD11
-  #define Z_SERIAL_RX_PIN  PD12
+  #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 E0_SERIAL_TX_PIN                  PD3
+  #define E0_SERIAL_RX_PIN                  PA15
 
-  #define E1_SERIAL_TX_PIN PC4
-  #define E1_SERIAL_RX_PIN PC5
+  #define E1_SERIAL_TX_PIN                  PC4
+  #define E1_SERIAL_RX_PIN                  PC5
 
-  #define E2_SERIAL_TX_PIN PE1
-  #define E2_SERIAL_RX_PIN PE0
+  #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
+#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 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
+#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
+#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 LED_PIN                           PB14
+//#define BTN_PIN                           PC10
+//#define PS_ON_PIN                         PE11
+//#define KILL_PIN                          PC5
 
-#define SDSS               PA4
-#define SD_DETECT_PIN  	   PB10
+#define SDSS                                PA4
+#define SD_DETECT_PIN                       PB10
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       PC9
-  #define BTN_ENC          PA8
+  #define BEEPER_PIN                        PC9
+  #define BTN_ENC                           PA8
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    PD0
+    #define LCD_PINS_RS                     PD0
 
-    #define BTN_EN1        PC11
-    #define BTN_EN2        PC10
+    #define BTN_EN1                         PC11
+    #define BTN_EN2                         PC10
 
-    #define LCD_PINS_ENABLE PD1
-    #define LCD_PINS_D4    PC12
+    #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.
@@ -196,43 +196,43 @@
 
   #else
 
-    #define LCD_PINS_RS    PD2
+    #define LCD_PINS_RS                     PD2
 
-    #define BTN_EN1        PC6
-    #define BTN_EN2        PC7
+    #define BTN_EN1                         PC6
+    #define BTN_EN2                         PC7
 
-    #define LCD_SDSS       PA4
+    #define LCD_SDSS                        PA4
 
-    #define LCD_PINS_ENABLE PC11
-    #define LCD_PINS_D4    PC10
+    #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
+      #define DOGLCD_CS                     PC11
+      #define DOGLCD_A0                     PD2
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
-        #define LCD_BACKLIGHT_PIN PD0
+        #define LCD_BACKLIGHT_PIN           PD0
       #endif
-      #define LCD_RESET_PIN PC10   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                 PC10  // Must be high or open for LCD to operate normally.
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN PC12
+          #define RGB_LED_R_PIN             PC12
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN PD0
+          #define RGB_LED_G_PIN             PD0
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN PD1
+          #define RGB_LED_B_PIN             PD1
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    PC12
+        #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
+      #define LCD_PINS_D5                   PC12
+      #define LCD_PINS_D6                   PD0
+      #define LCD_PINS_D7                   PD1
     #endif
 
   #endif
@@ -240,27 +240,27 @@
   // Alter timing for graphical display
   #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(600)
+      #define ST7920_DELAY_3       DELAY_NS(600)
     #endif
   #endif
 
 #endif // HAS_SPI_LCD
 
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN    PB6
+  #define RGB_LED_R_PIN                     PB6
 #endif
 #ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN    PB5
+  #define RGB_LED_G_PIN                     PB5
 #endif
 #ifndef RGB_LED_B_PIN
-  #define RGB_LED_B_PIN    PB7
+  #define RGB_LED_B_PIN                     PB7
 #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_GENERIC_STM32F4.h b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
index 2909b7c53824c6ab2a794ab08ff3aaba14dc0143..924b94c4f1fe8ac2968686fd7c4edcd99540dc9c 100644
--- a/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
+++ b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
@@ -37,7 +37,7 @@
 //#define I2C_EEPROM
 
 #ifndef E2END
-  #define E2END 0xFFF // 4KB
+  #define E2END 0xFFF                             // 4KB
 #endif
 
 // Ignore temp readings during development.
@@ -46,12 +46,12 @@
 //
 // 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
+#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)
@@ -65,120 +65,119 @@
 // Steppers
 //
 
-#define X_STEP_PIN         PD3
-#define X_DIR_PIN          PD2
-#define X_ENABLE_PIN       PD0
+#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
+#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
+#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
+#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
+#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
+#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
+#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
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        PA2
+#define HEATER_BED_PIN                      PA0
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PC6
+  #define FAN_PIN                           PC6
 #endif
-#define FAN1_PIN           PC7
-#define FAN2_PIN           PC8
+#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
+#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
+//#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
+//#define E_MUX0_PIN                        PG3
+//#define E_MUX1_PIN                        PG4
 
 //
 // Servos
 //
 
-//#define SERVO0_PIN         PE13
-//#define SERVO1_PIN         PE14
+//#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
+#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
+#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
+#define FIL_RUNOUT_PIN                      PA3
 
 //
 // ST7920 Delays
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 2b3ad6019920f31b7fb2e5ddd9589f5968f8c072..d21cdd09583c393e42c26541338140e00c73a004 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -35,14 +35,14 @@
 //
 // Servos
 //
-//#define SERVO0_PIN         PD12
+//#define SERVO0_PIN                        PD12
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         PG3
-#define Y_STOP_PIN         PG4
-#define Z_STOP_PIN         PG5
+#define X_STOP_PIN                          PG3
+#define Y_STOP_PIN                          PG4
+#define Z_STOP_PIN                          PG5
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -54,43 +54,43 @@
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PE6
-#define FIL_RUNOUT2_PIN    PE7
+#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
+#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
+#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
+#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
+#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
+#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
@@ -98,37 +98,37 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC1   // Analog Input
-#define TEMP_1_PIN         PC2   // Analog Input
-#define TEMP_BED_PIN       PC0   // Analog Input
+#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
+#define HEATER_0_PIN                        PA1
+#define HEATER_1_PIN                        PA0
+#define HEATER_BED_PIN                      PA2
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PC15
+  #define FAN_PIN                           PC15
 #endif
-#define FAN1_PIN           PF6
-#define FAN2_PIN           PF7
+#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
+#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
+//#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
+//#define E_MUX0_PIN                        -1
+//#define E_MUX1_PIN                        -1
 
 //
 // SD support
@@ -138,34 +138,34 @@
 //
 // 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 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
+#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
+#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
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index f498b7d0b9f6f9827af14ede6029c062c11e7df9..c54c5c180681bbba0e8555106cd6653f86ca8b6b 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -32,20 +32,20 @@
 //
 // Servos
 //
-//#define SERVO0_PIN         PD12
-//#define SERVO1_PIN         -1
+//#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
+#define X_STOP_PIN                          PB12
+#define Y_STOP_PIN                          PB13
+#define Z_STOP_PIN                          PB14
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PE1
+#define FIL_RUNOUT_PIN                      PE1
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -57,37 +57,37 @@
 //
 // Steppers
 //
-#define X_STEP_PIN         PB10
-#define X_DIR_PIN          PB2
-#define X_ENABLE_PIN       PB11
+#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
+#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
+#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
+#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
+#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
@@ -95,51 +95,51 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         PC0   // Analog Input
-#define TEMP_1_PIN         -1    // Analog Input
-#define TEMP_BED_PIN       PC1   // Analog Input
+#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
+#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 FAN1_PIN                            PC15
+#define FAN2_PIN                            PA0
 
-#define ORIG_E0_AUTO_FAN_PIN PC15   // Use this by NOT overriding E0_AUTO_FAN_PIN
+#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
+//#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
+//#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 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
+#define SCK_PIN                             PC12
+#define MISO_PIN                            PC8
+#define MOSI_PIN                            PD2
+#define SS_PIN                              PC11
 
 //
 // SD support
@@ -151,18 +151,18 @@
 //
 
 // 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
+#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
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
index 5d97de12ebf2e83f84edd7f8c3b5bdc0b6c00a88..36298d05f5e6f1f6165a698b77e9b4e2bbb44550 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
@@ -40,63 +40,62 @@
 //
 // 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
+#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
+#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 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 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 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
+#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
+#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
+#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 SDSS                                -1    // PB12
 
-#define SD_DETECT_PIN      PF9
-#define BEEPER_PIN         PG2
+#define SD_DETECT_PIN                       PF9
+#define BEEPER_PIN                          PG2
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
index a6bc2b49a6c06b7ebe584da4763394ba7ae6a69b..9fcd5a1474c8a967f73cc56fc15e6f9c849db365 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
@@ -46,13 +46,13 @@
 //
 #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
 
@@ -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
index 0fb469112d41ceb44952dfed5caef49289bf0de1..19853a78fea21190c62cf460c2c1f1d666266f2e 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -38,112 +38,112 @@
 #ifdef E2END
   #undef E2END
 #endif
-#define E2END 0xFFF // 4KB
+#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
+#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
+#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
+#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 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
+#define FAN_PIN                             PC9
+#define FAN1_PIN                            PA8
 
 //
 // I2C
 //
-#define SCK_PIN            PA5
-#define MISO_PIN           PA6
-#define MOSI_PIN           PA7
+#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 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
+#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 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
+  #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
+    #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
+    #define LCD_PINS_D5                     PE13
+    #define LCD_PINS_D6                     PE14
+    #define LCD_PINS_D7                     PE15
   #endif
 
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 2b6e6f6c335ba43a237449ec07fcf66ddd6aa42e..1a008cd4ae32d253ac032e228702227ea33288ba 100644
--- a/Marlin/src/pins/stm32f4/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
index 35faf076abb22c8c5f9026bfc1337e05ba2af3c5..7eb95a4f5044aa9de51fd16bd8f8fbf136a1d6eb 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -32,133 +32,133 @@
 
 //#define I2C_EEPROM
 
-#define E2END 0xFFF // EEPROM end address (4kB)
+#define E2END 0xFFF                               // EEPROM end address (4kB)
 
 //
 // Servos
 //
-//#define SERVO0_PIN         PE13
-//#define SERVO1_PIN         PE14
+//#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
+#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
+  #define Z_MIN_PROBE_PIN                   PA4
 #endif
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     PA3
+#define FIL_RUNOUT_PIN                      PA3
 
 //
 // Steppers
 //
 
-#define STEPPER_ENABLE_PIN PB2
+#define STEPPER_ENABLE_PIN                  PB2
 
-#define X_STEP_PIN         PC6   // X_STEP
-#define X_DIR_PIN          PC7   // X_DIR
-#define X_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
+  #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   //
+#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
+  #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
+#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
+  #define Z_CS_PIN                          PD8
 #endif
 
-#define E0_STEP_PIN        PB1
-#define E0_DIR_PIN         PB13
-#define E0_ENABLE_PIN      PB2
+#define E0_STEP_PIN                         PB1
+#define E0_DIR_PIN                          PB13
+#define E0_ENABLE_PIN                       PB2
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        PE11
+  #define E0_CS_PIN                         PE11
 #endif
 
-#define E1_STEP_PIN        PC4
-#define E1_DIR_PIN         PC5
-#define E1_ENABLE_PIN      PB2
+#define E1_STEP_PIN                         PC4
+#define E1_DIR_PIN                          PC5
+#define E1_ENABLE_PIN                       PB2
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        PB0
+  #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
+#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.
+//#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
+//#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
+#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
+#define HEATER_0_PIN                        PD15
+#define HEATER_1_PIN                        PD14
+#define HEATER_BED_PIN                      PD12
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PD13
+  #define FAN_PIN                           PD13
 #endif
-#define FAN1_PIN           PB5   // PA0
-#define FAN2_PIN           PB4   // PA1
+#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
+#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
+//#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 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
+#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
+  #define SD_DETECT_PIN                     PB7
+  #define SS_PIN                           PB_15  // USD_CS -> CS for onboard SD
 #endif
 
 //
@@ -166,29 +166,29 @@
 //
 #if HAS_SPI_LCD
   #if ENABLED(SDSUPPORT)
-    #define SDSS           PB6   // CS for SD card in LCD
+    #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
+  #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)
+  #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
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
index 45a1f68e5a3a841edba50f7d72c15c2584ec0d00..736445cdabe5ed5059afde245c41d5896a294913 100644
--- a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -28,7 +28,7 @@
 #define BOARD_INFO_NAME      "RemRam v1"
 #define DEFAULT_MACHINE_NAME "RemRam"
 
-#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM
+#define SRAM_EEPROM_EMULATION                     // Emulate the EEPROM using Backup SRAM
 
 #if HOTENDS > 1 || E_STEPPERS > 1
   #error "RemRam supports only one hotend / E-stepper."
@@ -38,96 +38,96 @@
 // 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
+  #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
+  #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
+  #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 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 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 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
+#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
+#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
+#define HEATER_0_PIN                          33
+#define HEATER_BED_PIN                        31
 
 #ifndef FAN_PIN
-  #define FAN_PIN          30   // "FAN1"
+  #define FAN_PIN                             30  // "FAN1"
 #endif
-#define FAN1_PIN           32   // "FAN2"
+#define FAN1_PIN                              32  // "FAN2"
 
-#define ORIG_E0_AUTO_FAN_PIN 32   // Use this by NOT overriding E0_AUTO_FAN_PIN
+#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 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
+#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
+#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
+#define STEP_TIMER                             2
diff --git a/Marlin/src/pins/stm32f7/pins_THE_BORG.h b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
index bfc9507c451e52cc1f39d9722fd44179895874ec..9968d9d1f1f8e43d6307730a93bbadc4166848cc 100644
--- a/Marlin/src/pins/stm32f7/pins_THE_BORG.h
+++ b/Marlin/src/pins/stm32f7/pins_THE_BORG.h
@@ -31,7 +31,7 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 #ifndef E2END
-  #define E2END 0xFFF   // EEPROM end address
+  #define E2END 0xFFF                             // EEPROM end address
 #endif
 
 // Ignore temp readings during development.
@@ -40,148 +40,142 @@
 //
 // 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
+#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
+  #define Z_MIN_PROBE_PIN                   PA4
 #endif
 
 //
 // Steppers
 //
-#define STEPPER_ENABLE_PIN PE0
+#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 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 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 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 E0_STEP_PIN        PB1
-#define E0_DIR_PIN         PB2
-#define E0_ENABLE_PIN      PE11
+#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 E1_STEP_PIN        PC4
-#define E1_DIR_PIN         PC5
-#define E1_ENABLE_PIN      PB0
+#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 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
+#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_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_BED_PIN                        PF10  // Analog Input
 
-#define TEMP_5_PIN         PE12  // Analog Input, Probe temp
+#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
+#define HEATER_0_PIN                        PD15
+#define HEATER_1_PIN                        PD14
+#define HEATER_BED_PIN                      PF6
 
 #ifndef FAN_PIN
-  #define FAN_PIN          PD13
+  #define FAN_PIN                           PD13
 #endif
-#define FAN1_PIN           PA0
-#define FAN2_PIN           PA1
+#define FAN1_PIN                            PA0
+#define FAN2_PIN                            PA1
 
-#define ORIG_E0_AUTO_FAN_PIN  PA1   // Use this by NOT overriding E0_AUTO_FAN_PIN
+#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
+//#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
+#define E_MUX0_PIN                          PG3
+#define E_MUX1_PIN                          PG4
 
 //
 // Servos
 //
 
-#define SERVO0_PIN         PE13
-#define SERVO1_PIN         PE14
-
+#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
+#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
+#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
+//#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 206e22bb9cb72aacebd81fcb15193b83db3003b0..4ee74660ead9a1e326574534693ea5a15881b3f5 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 22ceb975403f6a8263c8a0deb2294532db21b044..f7597dbbae74e08a5f8945379b6a53a4748aecba 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 88b045b833f608f0e3a0a7fc209e9b3315a7b720..575428f097b2ebabae359f8f09cee4a47f02647c 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 4f10e08084ab39820bca37ae9c7a768d14315767..68c548f8331359835f7f34cf3cd12345738f7fa3 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 c1198a4d4bad8fb217caaf0c42899b2a97c86fbe..f5f05ddeaf16d959f0e0141ba8bdd6215570a3c6 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 0ced699938c53e5cab637dce1492de7fed7f8677..01003b056d8e5825738e8d421a98642a73178ff5 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 985cd46df427b5c0d9a9293718fa00a83b1dc444..eb116ee3e8922c85c1e31560f98b6d2f708cc7d8 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 72eb21c1aaace87a0cc09867fe5d8e0e35af54e9..05f433cb89284b79983ce6aacac80500dee5012a 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 6c43c4aaa8a28f139e9667dca4ec5617116e31f5..0f895c9e6bdf4d42d1689c3ec6d69a65f23ed668 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 28fd51b8a058bd45a7aac2a4ce2069cff09fd6d2..8528533d7b8bda4526e7420d77df9d4cb486bf67 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