diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
index 18159a5bd..f711003c7 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
@@ -70,7 +70,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .enabled(0)
       #endif
       .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), F("Nozzle Offset"))
-      #if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+      #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
       .enabled(1)
       #else
       .enabled(0)
@@ -174,7 +174,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
     #endif
     case 9:  GOTO_SCREEN(InterfaceSettingsScreen);  LockScreen::check_passcode(); break;
     case 10: GOTO_SCREEN(RestoreFailsafeDialogBox); LockScreen::check_passcode(); break;
-    #if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+    #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
     case 11: GOTO_SCREEN(FilamentMenu); break;
     #endif
     case 12: GOTO_SCREEN(EndstopStatesScreen); break;
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/backlash_compensation_screen.cpp
index a09b84b1b..257b80004 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/backlash_compensation_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/backlash_compensation_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(BACKLASH_GCODE)
+#if BOTH(LULZBOT_TOUCH_UI, BACKLASH_GCODE)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_auto_calibration_dialog_box.cpp
index f367918f5..395fe83fb 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_auto_calibration_dialog_box.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_auto_calibration_dialog_box.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(CALIBRATION_GCODE)
+#if BOTH(LULZBOT_TOUCH_UI, CALIBRATION_GCODE)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_erase_flash_dialog_box.cpp
index 2da592fe3..6db2ff4d3 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_erase_flash_dialog_box.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/confirm_erase_flash_dialog_box.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(DEVELOPER_SCREENS)
+#if BOTH(LULZBOT_TOUCH_UI, DEVELOPER_SCREENS)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/developer_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/developer_menu.cpp
index 9bec9bf55..1743a1f79 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/developer_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/developer_menu.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(DEVELOPER_SCREENS)
+#if BOTH(LULZBOT_TOUCH_UI, DEVELOPER_SCREENS)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/filament_runout_screen.cpp
index 570f83835..ccad90171 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/filament_runout_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/filament_runout_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(FILAMENT_RUNOUT_SENSOR)
+#if BOTH(LULZBOT_TOUCH_UI, FILAMENT_RUNOUT_SENSOR)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp
index 806055ded..1cc4471b5 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(JUNCTION_DEVIATION)
+#if BOTH(LULZBOT_TOUCH_UI, JUNCTION_DEVIATION)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/linear_advance_screen.cpp
index 499b9db59..8b7137cb8 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/linear_advance_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/linear_advance_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(LIN_ADVANCE)
+#if BOTH(LULZBOT_TOUCH_UI, LIN_ADVANCE)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/nudge_nozzle_screen.cpp
index 99badde0b..b956c37a9 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/nudge_nozzle_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/nudge_nozzle_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(BABYSTEPPING)
+#if BOTH(LULZBOT_TOUCH_UI, BABYSTEPPING)
 
 #include "screens.h"
 #include "screen_data.h"
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
index fa53a0130..c4f456c3e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
@@ -76,7 +76,7 @@ SCREEN_TABLE {
 #else
   DECL_SCREEN(JerkScreen),
 #endif
-#if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+#if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
   DECL_SCREEN(FilamentMenu),
 #endif
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
index d8c48de9e..2687089e8 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
@@ -60,7 +60,7 @@ enum {
 #else
   JERK_SCREEN_CACHE,
 #endif
-#if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+#if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
   FILAMENT_MENU_CACHE,
 #endif
 #if ENABLED(LIN_ADVANCE)
@@ -490,7 +490,7 @@ class DefaultAccelerationScreen : public BaseNumericAdjustmentScreen, public Cac
   };
 #endif
 
-#if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+#if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
   class FilamentMenu : public BaseNumericAdjustmentScreen, public CachedScreen<FILAMENT_MENU_CACHE> {
     public:
       static void onRedraw(draw_mode_t);
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/statistics_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/statistics_screen.cpp
index efc1cc38f..18a3a4da6 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/statistics_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/statistics_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(PRINTCOUNTER)
+#if BOTH(LULZBOT_TOUCH_UI, PRINTCOUNTER)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stress_test_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stress_test_screen.cpp
index 5ef833147..76d9fb2a9 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stress_test_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stress_test_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(DEVELOPER_SCREENS)
+#if BOTH(LULZBOT_TOUCH_UI, DEVELOPER_SCREENS)
 
 #include "screens.h"
 #include "screen_data.h"
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_registers_screen.cpp
index 4cb63077d..c5d3b5f4b 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_registers_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/touch_registers_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(DEVELOPER_SCREENS)
+#if BOTH(LULZBOT_TOUCH_UI, DEVELOPER_SCREENS)
 
 #include "screens.h"
 
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/tune_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/tune_menu.cpp
index 37b60ed88..08f1d67aa 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/tune_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/tune_menu.cpp
@@ -54,7 +54,7 @@ void TuneMenu::onRedraw(draw_mode_t what) {
     #ifdef TOUCH_UI_PORTRAIT
        .tag(2).enabled(1)      .button( BTN_POS(1,1), BTN_SIZE(2,1), F("Temperature"))
        .tag(3).enabled(!isPrinting()).button( BTN_POS(1,2), BTN_SIZE(2,1), F("Change Filament"))
-       #if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+        #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
           .enabled(1)
         #else
           .enabled(0)
@@ -118,7 +118,7 @@ void TuneMenu::onRedraw(draw_mode_t what) {
         .enabled(0)
       #endif
        .tag(8).           button( BTN_POS(2,3), BTN_SIZE(1,1), F("Cancel Print"))
-       #if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+        #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
           .enabled(1)
         #else
           .enabled(0)
@@ -141,10 +141,8 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
     case 4:
       #if ENABLED(BABYSTEPPING)
         GOTO_SCREEN(NudgeNozzleScreen);
-      #else
-        #if HAS_BED_PROBE
-          GOTO_SCREEN(ZOffsetScreen);
-        #endif
+      #elif HAS_BED_PROBE
+        GOTO_SCREEN(ZOffsetScreen);
       #endif
       break;
     case 5:  GOTO_SCREEN(FeedratePercentScreen);     break;
@@ -155,7 +153,7 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
       current_screen.forget();
       PUSH_SCREEN(StatusScreen);
       break;
-    #if ENABLED(LIN_ADVANCE) || ENABLED(FILAMENT_RUNOUT_SENSOR)
+    #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
     case 9:  GOTO_SCREEN(FilamentMenu); break;
     #endif
     default:
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/widget_demo_screen.cpp
index a3988ed53..a3244bfe8 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/widget_demo_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/widget_demo_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../config.h"
 
-#if ENABLED(LULZBOT_TOUCH_UI) && ENABLED(DEVELOPER_SCREENS)
+#if BOTH(LULZBOT_TOUCH_UI, DEVELOPER_SCREENS)
 
 #include "screens.h"
 
diff --git a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
index 8fee5d23b..28b37cc84 100644
--- a/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
@@ -118,7 +118,7 @@
     //#define LCD_SCREEN_ROT_180
     //#define LCD_SCREEN_ROT_270
 
-    #if ENABLED(FYSETC_MINI_12864) || ENABLED(U8GLIB_ST7920)
+    #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
       #define FORCE_SOFT_SPI
     #endif
   #endif
diff --git a/config/examples/Formbot/Raptor/Configuration.h b/config/examples/Formbot/Raptor/Configuration.h
index d8196751a..cd2fa902b 100644
--- a/config/examples/Formbot/Raptor/Configuration.h
+++ b/config/examples/Formbot/Raptor/Configuration.h
@@ -82,11 +82,11 @@
  * If a UART connection is used to configure the driver, please select that as well in Configuration_adv.h.
  */
 //#define X_2208
-//#define X_SpreadCycle
+//#define X_SPREADCYCLE
 //#define Y_2208
-//#define Y_SpreadCycle
+//#define Y_SPREADCYCLE
 //#define E_2208
-//#define E_SpreadCycle
+//#define E_SPREADCYCLE
 
 
 /**
@@ -788,25 +788,25 @@
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
  */
 #if ENABLED(X_2208)
-  #if ENABLED(X_SpreadCycle)
-    #define x_accel 1750
+  #if ENABLED(X_SPREADCYCLE)
+    #define X_ACCEL 1750
   #else
-    #define x_accel 1000
+    #define X_ACCEL 1000
   #endif
 #else
-    #define x_accel 1500
+    #define X_ACCEL 1500
 #endif
 
 #if ENABLED(Y_2208)
-  #if ENABLED(Y_SpreadCycle)
-    #define y_accel 500
+  #if ENABLED(Y_SPREADCYCLE)
+    #define Y_ACCEL 500
   #else
-    #define y_accel 300
+    #define Y_ACCEL 300
   #endif
 #else
-  #define y_accel 500
+  #define Y_ACCEL 500
 #endif
-#define DEFAULT_MAX_ACCELERATION      { x_accel, y_accel, 400, 4000 }
+#define DEFAULT_MAX_ACCELERATION      { X_ACCEL, Y_ACCEL, 400, 4000 }
 
 /**
  * Default Acceleration (change/s) change = mm/s
@@ -843,12 +843,12 @@
  * value set here, it may happen instantaneously.
  */
 #if DISABLED(JUNCTION_DEVIATION)
-  #if ENABLED(X_SpreadCycle) || DISABLED(X_2208)
+  #if ENABLED(X_SPREADCYCLE) || DISABLED(X_2208)
     #define DEFAULT_XJERK 20.0
   #else
     #define DEFAULT_XJERK 10.0
   #endif
-  #if ENABLED(Y_SpreadCycle) || DISABLED(Y_2208)
+  #if ENABLED(Y_SPREADCYCLE) || DISABLED(Y_2208)
     #define DEFAULT_YJERK 10.0
   #else
     #define DEFAULT_YJERK  5.0