diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h
index 53ecb4c18c17396fdea2f1208151144949adf940..0e76a2a232f44cbdd2ae368a074fd6e0ae0e4293 100644
--- a/Marlin/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/pins_AZTEEG_X3_PRO.h
@@ -134,9 +134,9 @@
 
 #if ENABLED(VIKI2) || ENABLED(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
@@ -146,9 +146,9 @@
 // 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
-                                // as the wiring diagram uses pin 44 for DOGLCD_A0
+  #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
 
 //
diff --git a/Marlin/pins_GEN6.h b/Marlin/pins_GEN6.h
index 10a285790dfe82192c4541299263abd5df605850..5611e4d92fa88a9fdae1200ba87de8641957822a 100644
--- a/Marlin/pins_GEN6.h
+++ b/Marlin/pins_GEN6.h
@@ -107,7 +107,7 @@
 //
 #define SDSS               17
 #define DEBUG_PIN           0
-#define CASE_LIGHT_PIN   16     // MUST BE HARDWARE PWM
+#define CASE_LIGHT_PIN     16   // MUST BE HARDWARE PWM
 
 // RS485 pins
 #define TX_ENABLE_PIN      12
@@ -116,6 +116,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN  5     // Pin should have a pullup/pulldown!
-#define SPINDLE_LASER_PWM_PIN    16     // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN  5   // Pin should have a pullup/pulldown!
+#define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
 #define SPINDLE_DIR_PIN           6
diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/pins_GEN7_CUSTOM.h
index 9b83df9aeeaeb7e977df0e6c2ef706f91ab75344..d64e94e2d368586b3c3ffd51644740783844d296 100644
--- a/Marlin/pins_GEN7_CUSTOM.h
+++ b/Marlin/pins_GEN7_CUSTOM.h
@@ -96,14 +96,14 @@
 // Heaters
 //
 #define HEATER_0_PIN     4
-#define HEATER_BED_PIN   3  // (bed)
+#define HEATER_BED_PIN   3   // (bed)
 
 //
 // Misc. Functions
 //
-#define SDSS            31  // SCL pin of I2C header || CS Pin for SD Card support
+#define SDSS            31   // SCL pin of I2C header || CS Pin for SD Card support
 #define PS_ON_PIN       19
-#define CASE_LIGHT_PIN  15    // MUST BE HARDWARE PWM
+#define CASE_LIGHT_PIN  15   // MUST BE HARDWARE PWM
 
 // A pin for debugging
 #define DEBUG_PIN       -1
diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/pins_MEGATRONICS_3.h
index 5e4ca4b5864308380b234777068293d934682201..2ebb209bcbf324636ef57ecd8e209128218eb109 100644
--- a/Marlin/pins_MEGATRONICS_3.h
+++ b/Marlin/pins_MEGATRONICS_3.h
@@ -131,7 +131,7 @@
 #define SDSS               53
 #define LED_PIN            13
 #define PS_ON_PIN          12
-#define CASE_LIGHT_PIN     45 // try the keypad connector
+#define CASE_LIGHT_PIN     45   // Try the keypad connector
 
 //
 // LCD / Controller
@@ -144,9 +144,9 @@
 
 #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 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
diff --git a/Marlin/pins_MIGHTYBOARD_REVE.h b/Marlin/pins_MIGHTYBOARD_REVE.h
index bd13a379d94281cce63f11ffd04150a20c061906..5b5d6e7ed1359bbaa331f34c36888a594506f8ab 100644
--- a/Marlin/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/pins_MIGHTYBOARD_REVE.h
@@ -64,20 +64,20 @@
 //
 // 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)
@@ -89,25 +89,25 @@
 //
 // 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
@@ -115,17 +115,17 @@
 // 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
 
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       69 // K7
+#define TEMP_BED_PIN        69   // K7
 
 // SPI for Max6675 or Max31855 Thermocouple
 // Uses a separate SPI bus
@@ -135,10 +135,10 @@
 //  2 E4 CS2
 // 78 E2 SCK
 //
-#define THERMO_SCK_PIN     78 // E2
-#define THERMO_DO_PIN       3 // E5
-#define THERMO_CS1          5 // E3
-#define THERMO_CS2          2 // E4
+#define THERMO_SCK_PIN      78   // E2
+#define THERMO_DO_PIN        3   // E5
+#define THERMO_CS1           5   // E3
+#define THERMO_CS2           2   // E4
 
 #define MAX6675_SS          THERMO_CS1
 #define MAX6675_SCK_PIN     THERMO_SCK_PIN
@@ -150,10 +150,10 @@
 // 2 extruders or 1 extruder and a heated bed.
 // With no heated bed, an additional 24V fan is possible.
 //
-#define MOSFET_A_PIN     6 // H3
-#define MOSFET_B_PIN    11 // B5 - Rev A of this file had this pin assigned to 9
-#define MOSFET_C_PIN    45 // L4
-#define MOSFET_D_PIN    44 // L5
+#define MOSFET_A_PIN         6   // H3
+#define MOSFET_B_PIN        11   // B5 - Rev A of this file had this pin assigned to 9
+#define MOSFET_C_PIN        45   // L4
+#define MOSFET_D_PIN        44   // L5
 
 #if HOTENDS > 1
   #if TEMP_SENSOR_BED
@@ -195,43 +195,43 @@
 //
 // Extruder Auto Fan Pins
 //
-#define ORIG_E0_AUTO_FAN_PIN   7 // H4
-#define ORIG_E1_AUTO_FAN_PIN  12 // B6
+#define ORIG_E0_AUTO_FAN_PIN  7   // H4
+#define ORIG_E1_AUTO_FAN_PIN 12   // B6
 
 //
 // Misc. Functions
 //
-#define LED_PIN             13 // B7
-#define CUTOFF_RESET_PIN    16 // H1
-#define CUTOFF_TEST_PIN     17 // H0
-#define CASE_LIGHT_PIN      44 // L5   MUST BE HARDWARE PWM
+#define LED_PIN             13   // B7
+#define CUTOFF_RESET_PIN    16   // H1
+#define CUTOFF_TEST_PIN     17   // H0
+#define CASE_LIGHT_PIN      44   // L5   MUST BE HARDWARE PWM
 
 //
 // LCD / Controller
 //
 #ifdef 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
 
-  #define BTN_CENTER            15 // J0
-  #define BTN_ENC               BTN_CENTER
+  #define BTN_CENTER        15   // J0
+  #define BTN_ENC           BTN_CENTER
 
   //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
@@ -239,29 +239,29 @@
   //
 
   #define SAV_3DLCD
-  #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_DOWN            73 // J3
-  #define BTN_LEFT            72 // J2
-  #define BTN_RIGHT           14 // J1
-  #define BTN_CENTER          15 // J0
-  #define BTN_ENC             BTN_CENTER
+  #define BTN_UP            75   // J4
+  #define BTN_DOWN          73   // J3
+  #define BTN_LEFT          72   // J2
+  #define BTN_RIGHT         14   // J1
+  #define BTN_CENTER        15   // J0
+  #define BTN_ENC           BTN_CENTER
 
-  #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
 
 //
 // SD Card
 //
-#define SDSS                53 // B0
-#define SD_DETECT_PIN       9  // H6
+#define SDSS                53   // B0
+#define SD_DETECT_PIN        9   // H6
 
 #define MAX_PIN             THERMO_SCK_PIN
 
@@ -275,9 +275,6 @@
 
 
 
-
-
-
 // Check if all pins are defined in mega/pins_arduino.h
 #include <Arduino.h>
 static_assert(NUM_DIGITAL_PINS > MAX_PIN, "add missing pins to [arduino dir]/hardware/arduino/avr/variants/mega/pins_arduino.h based on fastio.h"
diff --git a/Marlin/pins_MINITRONICS.h b/Marlin/pins_MINITRONICS.h
index 43f63ab23123acc0b7b51a926efaba0cdb5a34ba..fbdf7cbb66ec06771879569aca75ba8fe4f24f13 100644
--- a/Marlin/pins_MINITRONICS.h
+++ b/Marlin/pins_MINITRONICS.h
@@ -104,9 +104,9 @@
 
 #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
diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h
index a317b1b7636e5766d2ec6da907fdae9814a655b1..268ebfefcb4fa71f0d9fa545396e76387f7e715b 100644
--- a/Marlin/pins_RAMBO.h
+++ b/Marlin/pins_RAMBO.h
@@ -151,12 +151,12 @@
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS 70
+    #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_D4     72
+    #define LCD_PINS_D5     73
+    #define LCD_PINS_D6     74
+    #define LCD_PINS_D7     75
 
     #if ENABLED(VIKI2) || ENABLED(miniVIKI)
       #define BEEPER_PIN 44
@@ -202,12 +202,12 @@
     //#define SHIFT_OUT 40
     //#define SHIFT_EN 17
 
-    #define LCD_PINS_RS 75
+    #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 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/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 4939a2b245293929c7fc879a79ccf6eeefc91d6d..411e0f47cabe357ee611eb9929eb7ae87cdc8968 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -220,25 +220,25 @@
 #if ENABLED(ULTRA_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 ENABLED(NEWPANEL) && ENABLED(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
-    #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 DISABLED(NEWPANEL)
-      #define BEEPER_PIN 33
+      #define BEEPER_PIN        33
       // Buttons are attached to a shift register
       // Not wired yet
       //#define SHIFT_CLK 38
@@ -251,118 +251,125 @@
   #if ENABLED(NEWPANEL)
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-      #define BEEPER_PIN 37
 
-      #define BTN_EN1 31
-      #define BTN_EN2 33
-      #define BTN_ENC 35
+      #define BEEPER_PIN        37
 
-      #define SD_DETECT_PIN 49
-      #define KILL_PIN 41
+      #define BTN_EN1           31
+      #define BTN_EN2           33
+      #define BTN_ENC           35
+
+      #define SD_DETECT_PIN     49
+      #define KILL_PIN          41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
         #define LCD_BACKLIGHT_PIN 39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-      #define BTN_EN1 64
-      #define BTN_EN2 59
-      #define BTN_ENC 63
-      #define SD_DETECT_PIN 42
+
+      #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  // reverse if the encoder turns the wrong way.
-      #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  // reverse if the encoder turns the wrong way.
-      #define BTN_EN2 7   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf
-                          // tells about 40/42.
-                          // 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_EN1           22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2            7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+
+      #define BTN_ENC           -1
+      #define LCD_SDSS          53
+      #define SD_DETECT_PIN     49
+
     #elif ENABLED(VIKI2) || ENABLED(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  // reverse if the encoder turns the wrong way.
-      #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 DOGLCD_A0         44
+      #define DOGLCD_CS         66
       #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
-      #define SDSS   53
+      #define SDSS              53
 
-      #define KILL_PIN 64
+      #define KILL_PIN          64
       // GLCD features
-      //#define LCD_CONTRAST 190
+      //#define LCD_CONTRAST   190
       // 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 are directly attached using AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1 64 // encoder
-        #define BTN_EN2 59 // encoder
-        #define BTN_ENC 63 // enter button
-        #define SHIFT_OUT 40 // shift register
-        #define SHIFT_CLK 44 // shift register
-        #define SHIFT_LD 42 // shift register
+        #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 // the click
+        #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
       #endif
diff --git a/Marlin/pins_SCOOVO_X9H.h b/Marlin/pins_SCOOVO_X9H.h
index a687c9728514aa287a2d27d68b51626f66c748f1..6b7cf4f800cf6089012d4639a2bc07288e946f79 100644
--- a/Marlin/pins_SCOOVO_X9H.h
+++ b/Marlin/pins_SCOOVO_X9H.h
@@ -126,21 +126,21 @@
 //
 // 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 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_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_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
 
@@ -151,7 +151,7 @@
   #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
diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/pins_ULTIMAKER.h
index cb117680710a91498f4ed41635f3ae09f8536eb0..d8e7d26bf301263c47b097a9026324b425dcec24 100644
--- a/Marlin/pins_ULTIMAKER.h
+++ b/Marlin/pins_ULTIMAKER.h
@@ -109,7 +109,7 @@
 #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 SUICIDE_PIN        54   // PIN that has to be turned on right after start, to keep power flowing.
 #define CASE_LIGHT_PIN      8
 
 //
@@ -121,12 +121,12 @@
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS 20
+    #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_D4    16
+    #define LCD_PINS_D5    21
+    #define LCD_PINS_D6     5
+    #define LCD_PINS_D7     6
 
     // buttons are directly attached
     #define BTN_EN1 40