diff --git a/.travis.yml b/.travis.yml
index 9bbc420d53..25a0c51423 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,8 @@ before_install:
   #
   # Publish the buildroot script folder
   - chmod +x ${TRAVIS_BUILD_DIR}/buildroot/bin/*
-  - export PATH=${TRAVIS_BUILD_DIR}/buildroot/bin/:${PATH}
   - chmod +x ${TRAVIS_BUILD_DIR}/buildroot/share/tests/*
-  - export PATH=${TRAVIS_BUILD_DIR}/buildroot/share/tests/:${PATH}
+  - export PATH=${TRAVIS_BUILD_DIR}/buildroot/bin/:${TRAVIS_BUILD_DIR}/buildroot/share/tests/:${PATH}
 
 install:
   #- pip install -U platformio
diff --git a/Marlin/src/HAL/HAL_AVR/SanityCheck.h b/Marlin/src/HAL/HAL_AVR/SanityCheck.h
index 5b15bca082..4485b8f39b 100644
--- a/Marlin/src/HAL/HAL_AVR/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_AVR/SanityCheck.h
@@ -79,11 +79,11 @@
     #elif PIN_EXISTS(E5_AUTO_FAN) && SPINDLE_LASER_PWM_PIN == E5_AUTO_FAN_PIN
       #error "SPINDLE_LASER_PWM_PIN is used by E5_AUTO_FAN_PIN."
     #elif PIN_EXISTS(FAN) && SPINDLE_LASER_PWM_PIN == FAN_PIN
-      #error "SPINDLE_LASER_PWM_PIN is used FAN_PIN."
+      #error "SPINDLE_LASER_PWM_PIN is used by FAN_PIN."
     #elif PIN_EXISTS(FAN1) && SPINDLE_LASER_PWM_PIN == FAN1_PIN
-      #error "SPINDLE_LASER_PWM_PIN is used FAN1_PIN."
+      #error "SPINDLE_LASER_PWM_PIN is used by FAN1_PIN."
     #elif PIN_EXISTS(FAN2) && SPINDLE_LASER_PWM_PIN == FAN2_PIN
-      #error "SPINDLE_LASER_PWM_PIN is used FAN2_PIN."
+      #error "SPINDLE_LASER_PWM_PIN is used by FAN2_PIN."
     #elif PIN_EXISTS(CONTROLLERFAN) && SPINDLE_LASER_PWM_PIN == CONTROLLERFAN_PIN
       #error "SPINDLE_LASER_PWM_PIN is used by CONTROLLERFAN_PIN."
     #elif PIN_EXISTS(MOTOR_CURRENT_PWM_XY) && SPINDLE_LASER_PWM_PIN == MOTOR_CURRENT_PWM_XY_PIN
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index 96921ed755..a792ce46f1 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -40,6 +40,11 @@
 #include "../../module/planner.h"
 #include "../../module/motion.h"
 
+#if DISABLED(LCD_PROGRESS_BAR) && ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
+  #include "../../feature/filwidth.h"
+  #include "../../gcode/parser.h"
+#endif
+
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #include "../../feature/bedlevel/ubl/ubl.h"
 #endif
@@ -97,11 +102,11 @@ static void createChar_P(const char c, const byte * const ptr) {
   #define LCD_STR_PROGRESS  "\x03\x04\x05"
 #endif
 
-void MarlinUI::set_custom_characters(
-  #if ENABLED(LCD_PROGRESS_BAR) || ENABLED(SHOW_BOOTSCREEN)
-    const HD44780CharSet screen_charset/*=CHARSET_INFO*/
+void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARSET_INFO*/) {
+  #if DISABLED(LCD_PROGRESS_BAR) && DISABLED(SHOW_BOOTSCREEN)
+    UNUSED(screen_charset);
   #endif
-) {
+
   // CHARSET_BOOT
   #if ENABLED(SHOW_BOOTSCREEN)
     const static PROGMEM byte corner[4][8] = { {
@@ -341,7 +346,7 @@ void MarlinUI::init_lcd() {
     lcd.begin(LCD_WIDTH, LCD_HEIGHT);
   #endif
 
-  LCD_SET_CHARSET(on_status_screen() ? CHARSET_INFO : CHARSET_MENU);
+  set_custom_characters(on_status_screen() ? CHARSET_INFO : CHARSET_MENU);
 
   lcd.clear();
 }
@@ -398,7 +403,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
   }
 
   void MarlinUI::show_bootscreen() {
-    LCD_SET_CHARSET(CHARSET_BOOT);
+    set_custom_characters(CHARSET_BOOT);
     lcd.clear();
 
     #define LCD_EXTRA_SPACE (LCD_WIDTH-8)
@@ -470,7 +475,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
 
     lcd.clear();
     safe_delay(100);
-    LCD_SET_CHARSET(CHARSET_INFO);
+    set_custom_characters(CHARSET_INFO);
     lcd.clear();
   }
 
@@ -583,7 +588,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
 
 #if ENABLED(LCD_PROGRESS_BAR)
 
-  inline void lcd_draw_progress_bar(const uint8_t percent) {
+  void MarlinUI::draw_progress_bar(const uint8_t percent) {
     const int16_t tix = (int16_t)(percent * (LCD_WIDTH) * 3) / 100,
               cel = tix / 3,
               rem = tix % 3;
@@ -612,7 +617,7 @@ void MarlinUI::draw_status_message(const bool blink) {
     // or if there is no message set.
     if (ELAPSED(millis(), progress_bar_ms + PROGRESS_BAR_MSG_TIME) || !has_status()) {
       const uint8_t progress = get_progress();
-      if (progress > 2) return lcd_draw_progress_bar(progress);
+      if (progress > 2) return draw_progress_bar(progress);
     }
 
   #elif ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index f70bd486be..67dd089707 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -37,6 +37,12 @@
 #include "../../module/motion.h"
 #include "../../module/temperature.h"
 
+#if ENABLED(FILAMENT_LCD_DISPLAY)
+  #include "../../feature/filwidth.h"
+  #include "../../module/planner.h"
+  #include "../../gcode/parser.h"
+#endif
+
 #if ENABLED(SDSUPPORT)
   #include "../../sd/cardreader.h"
 #endif
@@ -477,9 +483,7 @@ void MarlinUI::draw_status_screen() {
 
     #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
       // Alternate Status message and Filament display
-      if (PENDING(millis(), next_filament_display))
-        draw_status_message(blink);
-      else {
+      if (ELAPSED(millis(), next_filament_display)) {
         lcd_put_u8str_P(PSTR(LCD_STR_FILAM_DIA));
         lcd_put_wchar(':');
         lcd_put_u8str(wstring);
@@ -488,9 +492,9 @@ void MarlinUI::draw_status_screen() {
         lcd_put_u8str(mstring);
         lcd_put_wchar('%');
       }
-    #else
-      draw_status_message(blink);
+      else
     #endif
+        draw_status_message(blink);
   }
 }
 
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 352eed24df..8046a5d811 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -243,7 +243,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint32_t encoder/*=0*/) {
       #if ENABLED(AUTO_BED_LEVELING_UBL)
         if (!ubl.lcd_map_control)
       #endif
-          LCD_SET_CHARSET(screen == status_screen ? CHARSET_INFO : CHARSET_MENU);
+          set_custom_characters(screen == status_screen ? CHARSET_INFO : CHARSET_MENU);
     #endif
 
     refresh(LCDVIEW_CALL_REDRAW_NEXT);
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 480c2829d9..0967e6b9ba 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -52,11 +52,13 @@ static void lcd_factory_settings() {
 
 #if ENABLED(LCD_PROGRESS_BAR_TEST)
 
+  #include "../lcdprint.h"
+
   static void progress_bar_test() {
     static int8_t bar_percent = 0;
     if (ui.use_click()) {
       ui.goto_previous_screen();
-      LCD_SET_CHARSET(CHARSET_MENU);
+      ui.set_custom_characters(CHARSET_MENU);
       return;
     }
     bar_percent += (int8_t)ui.encoderPosition;
@@ -65,12 +67,12 @@ static void lcd_factory_settings() {
     draw_menu_item_static(0, PSTR(MSG_PROGRESS_BAR_TEST), true, true);
     lcd_moveto((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2);
     lcd_put_u8str(int(bar_percent)); lcd_put_wchar('%');
-    lcd_moveto(0, LCD_HEIGHT - 1); lcd_draw_progress_bar(bar_percent);
+    lcd_moveto(0, LCD_HEIGHT - 1); ui.draw_progress_bar(bar_percent);
   }
 
   void _progress_bar_test() {
     ui.goto_screen(progress_bar_test);
-    LCD_SET_CHARSET(CHARSET_INFO);
+    ui.set_custom_characters(CHARSET_INFO);
   }
 
 #endif // LCD_PROGRESS_BAR_TEST
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index b190e3c4b3..67f6606aa0 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -211,6 +211,12 @@
     FONT_EDIT,
     FONT_MENU
   };
+#else
+  enum HD44780CharSet : uint8_t {
+    CHARSET_MENU,
+    CHARSET_INFO,
+    CHARSET_BOOT
+  };
 #endif
 
 ////////////////////////////////////////////
@@ -282,23 +288,15 @@ public:
 
         static constexpr bool drawing_screen = false, first_page = true;
 
-        enum HD44780CharSet : uint8_t { CHARSET_MENU, CHARSET_INFO, CHARSET_BOOT };
-
-        static void set_custom_characters(
-          #if ENABLED(LCD_PROGRESS_BAR) || ENABLED(SHOW_BOOTSCREEN)
-            const HD44780CharSet screen_charset=CHARSET_INFO
-          #endif
-        );
+        static void set_custom_characters(const HD44780CharSet screen_charset=CHARSET_INFO);
 
         #if ENABLED(LCD_PROGRESS_BAR)
           static millis_t progress_bar_ms;  // Start time for the current progress bar cycle
+          static void draw_progress_bar(const uint8_t percent);
           #if PROGRESS_MSG_EXPIRE > 0
             static millis_t MarlinUI::expire_status_ms; // = 0
             static inline void reset_progress_bar_timeout() { expire_status_ms = 0; }
           #endif
-          #define LCD_SET_CHARSET(C) set_custom_characters(C)
-        #else
-          #define LCD_SET_CHARSET(C) set_custom_characters()
         #endif
 
       #endif
diff --git a/buildroot/bin/opt_add b/buildroot/bin/opt_add
index 8361cac527..8ef7e07917 100755
--- a/buildroot/bin/opt_add
+++ b/buildroot/bin/opt_add
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-eval "echo \"#define ${1} ${2}\" >>Marlin/Configuration.h"
+eval "echo \"#define ${1} ${2}\" >>Marlin/Configuration_adv.h"
diff --git a/buildroot/bin/opt_add_adv b/buildroot/bin/opt_add_adv
deleted file mode 100755
index 8ef7e07917..0000000000
--- a/buildroot/bin/opt_add_adv
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-eval "echo \"#define ${1} ${2}\" >>Marlin/Configuration_adv.h"
diff --git a/buildroot/bin/opt_disable b/buildroot/bin/opt_disable
index c219f36170..1d36159968 100755
--- a/buildroot/bin/opt_disable
+++ b/buildroot/bin/opt_disable
@@ -5,3 +5,7 @@ SED=$(which gsed || which sed)
 for opt in "$@" ; do
   eval "${SED} -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration.h"
 done
+
+for opt in "$@" ; do
+  eval "${SED} -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration_adv.h"
+done
diff --git a/buildroot/bin/opt_disable_adv b/buildroot/bin/opt_disable_adv
deleted file mode 100755
index bbb7ca5ae5..0000000000
--- a/buildroot/bin/opt_disable_adv
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-SED=$(which gsed || which sed)
-
-for opt in "$@" ; do
-  eval "${SED} -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration_adv.h"
-done
diff --git a/buildroot/bin/opt_enable b/buildroot/bin/opt_enable
index 7be02ed9b4..f5540d2c63 100755
--- a/buildroot/bin/opt_enable
+++ b/buildroot/bin/opt_enable
@@ -5,3 +5,7 @@ SED=$(which gsed || which sed)
 for opt in "$@" ; do
   eval "${SED} -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration.h"
 done
+
+for opt in "$@" ; do
+  eval "${SED} -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration_adv.h"
+done
diff --git a/buildroot/bin/opt_enable_adv b/buildroot/bin/opt_enable_adv
deleted file mode 100755
index 73a9d95415..0000000000
--- a/buildroot/bin/opt_enable_adv
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-SED=$(which gsed || which sed)
-
-for opt in "$@" ; do
-  eval "${SED} -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration_adv.h"
-done
diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set
index 4b6f034bdb..ef37a358ec 100755
--- a/buildroot/bin/opt_set
+++ b/buildroot/bin/opt_set
@@ -3,3 +3,4 @@
 SED=$(which gsed || which sed)
 
 eval "${SED} -E -i 's/(\/\/)?(#define \b${1}\b).*$/\2 ${2}/g' Marlin/Configuration.h"
+eval "${SED} -E -i 's/(\/\/)?(#define \b${1}\b).*$/\2 ${2}/g' Marlin/Configuration_adv.h"
diff --git a/buildroot/bin/opt_set_adv b/buildroot/bin/opt_set_adv
deleted file mode 100755
index 1eca929214..0000000000
--- a/buildroot/bin/opt_set_adv
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-SED=$(which gsed || which sed)
-
-eval "${SED} -E -i 's/(\/\/)?(#define \b${1}\b).*$/\2 ${2}/g' Marlin/Configuration_adv.h"
diff --git a/buildroot/share/tests/DUE_tests b/buildroot/share/tests/DUE_tests
index e24cce2edd..78ca3bd2dd 100755
--- a/buildroot/share/tests/DUE_tests
+++ b/buildroot/share/tests/DUE_tests
@@ -15,14 +15,14 @@ exec_test $1 $2 "RAMPS4DUE_EFB S_CURVE_ACCELERATION EEPROM_SETTINGS"
 
 restore_configs
 opt_set MOTHERBOARD BOARD_RADDS
-opt_enable USE_XMAX_PLUG USE_YMAX_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR
-opt_enable_adv Z_TRIPLE_STEPPER_DRIVERS Z_TRIPLE_ENDSTOPS Z_STEPPER_AUTO_ALIGN
-opt_add_adv Z2_MAX_ENDSTOP_INVERTING false
-opt_add_adv Z3_MAX_ENDSTOP_INVERTING false
+opt_enable USE_XMAX_PLUG USE_YMAX_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR \
+           Z_TRIPLE_STEPPER_DRIVERS Z_TRIPLE_ENDSTOPS Z_STEPPER_AUTO_ALIGN
+opt_add Z2_MAX_ENDSTOP_INVERTING false
+opt_add Z3_MAX_ENDSTOP_INVERTING false
 pins_set RAMPS X_MAX_PIN -1
 pins_set RAMPS Y_MAX_PIN -1
-opt_add_adv Z2_MAX_PIN 2
-opt_add_adv Z3_MAX_PIN 3
+opt_add Z2_MAX_PIN 2
+opt_add Z3_MAX_PIN 3
 exec_test $1 $2 "Test RADDS with Z_TRIPLE_STEPPER_DRIVERS and Z_STEPPER_AUTO_ALIGN"
 
 #
diff --git a/buildroot/share/tests/LPC1768_tests b/buildroot/share/tests/LPC1768_tests
index aeb37b4ee0..9e3882a299 100755
--- a/buildroot/share/tests/LPC1768_tests
+++ b/buildroot/share/tests/LPC1768_tests
@@ -31,7 +31,7 @@ opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
 exec_test $1 $2 "MKS_SBASE SWITCHING_EXTRUDER"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_MKS_SBASE
+opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EEB
 opt_set EXTRUDERS 2
 opt_set TEMP_SENSOR_0 1
 opt_set TEMP_SENSOR_1 5
@@ -40,26 +40,26 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT \
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
-           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
-opt_enable_adv ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
-               LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA
+           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
+           ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
+           LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA
 opt_set GRID_MAX_POINTS_X 16
 exec_test $1 $2 "MKS SBASE Many Features"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_MKS_SBASE
+opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
 opt_enable COREYX USE_XMAX_PLUG DAC_MOTOR_CURRENT_DEFAULT \
            REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING \
            AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS \
-           FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR FAN_SOFT_PWM
-opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME \
-               ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK \
-               VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
-               EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS \
-               MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
-opt_set_adv FAN_MIN_PWM 50
-opt_set_adv FAN_KICKSTART_TIME 100
-opt_set_adv XY_FREQUENCY_LIMIT  15
+           FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR FAN_SOFT_PWM \
+           SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME \
+           ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK \
+           VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
+           EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS \
+           MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
+opt_set FAN_MIN_PWM 50
+opt_set FAN_KICKSTART_TIME 100
+opt_set XY_FREQUENCY_LIMIT  15
 exec_test $1 $2 "MKS SBASE Many less common options"
 
 restore_configs
@@ -70,8 +70,8 @@ opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
 opt_set X_DRIVER_TYPE TMC2130
 opt_set Y_DRIVER_TYPE TMC2130
 opt_set Z_DRIVER_TYPE TMC2130
-opt_enable_adv TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD TMC_DEBUG \
-               SENSORLESS_PROBING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY
+opt_enable TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD TMC_DEBUG \
+           SENSORLESS_PROBING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY
 exec_test $1 $2 "Delta Config (generic) + BOARD_COHESION3D_REMIX + UBL + EEPROM_SETTINGS + SENSORLESS_PROBING"
 
 # clean up
diff --git a/buildroot/share/tests/STM32F1_tests b/buildroot/share/tests/STM32F1_tests
index af1cf0fb9c..1a503ef114 100755
--- a/buildroot/share/tests/STM32F1_tests
+++ b/buildroot/share/tests/STM32F1_tests
@@ -13,8 +13,5 @@ opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSU
            PAREN_COMMENTS GCODE_MOTION_MODES SINGLENOZZLE TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_PARK
 exec_test $1 $2 "STM32F1R EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT PAREN_COMMENTS GCODE_MOTION_MODES"
 
-opt_enable SPINDLE_LASER_ENABLE NO_LCD_MENUS
-exec_test $1 $2 "STM32F1R SPINDLE_LASER_ENABLE"
-
 # cleanup
 restore_configs
diff --git a/buildroot/share/tests/megaatmega2560_tests b/buildroot/share/tests/megaatmega2560_tests
index 6b02e5e87a..d234a42584 100755
--- a/buildroot/share/tests/megaatmega2560_tests
+++ b/buildroot/share/tests/megaatmega2560_tests
@@ -30,16 +30,16 @@ opt_set TEMP_SENSOR_BED 1
 opt_set POWER_SUPPLY 1
 opt_set GRID_MAX_POINTS_X 16
 opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING \
-           SDSUPPORT EEPROM_SETTINGS FAST_FILE_TRANSFER \
-           REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
-           BLINKM PCA9632 RGB_LED NEOPIXEL_LED AUTO_POWER_CONTROL PINS_DEBUGGING \
+           SDSUPPORT EEPROM_SETTINGS REPRAP_DISCOUNT_SMART_CONTROLLER \
+           BLINKM PCA9632 RGB_LED NEOPIXEL_LED AUTO_POWER_CONTROL \
            NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
            AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
-           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE
-opt_enable_adv FWRETRACT ARC_P_CIRCLES ADVANCED_PAUSE_FEATURE CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
-               POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
-               MAX7219_DEBUG LED_CONTROL_MENU CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CODEPENDENT_XY_HOMING
-opt_set_adv FANMUX0_PIN 53
+           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
+           FWRETRACT ARC_P_CIRCLES ADVANCED_PAUSE_FEATURE CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
+           POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE FAST_FILE_TRANSFER \
+           LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST PINS_DEBUGGING \
+           MAX7219_DEBUG LED_CONTROL_MENU CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CODEPENDENT_XY_HOMING
+opt_set FANMUX0_PIN 53
 exec_test $1 $2 "RAMPS with 2 extruders, RRDFGSC, Linear ABL, LEDs, and many options"
 
 #
@@ -55,9 +55,9 @@ opt_set TEMP_SENSOR_3 20
 opt_set TEMP_SENSOR_4 999
 opt_set TEMP_SENSOR_BED 1
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
-           EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
-opt_enable_adv USB_FLASH_DRIVE_SUPPORT SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI \
-               CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION
+           EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT \
+           USB_FLASH_DRIVE_SUPPORT SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI \
+           CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION
 exec_test $1 $2 "Azteeg X3 with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more"
 
 #
@@ -66,7 +66,7 @@ exec_test $1 $2 "Azteeg X3 with 5 extruders, RRDFGSC, probeless UBL, Linear Adva
 opt_enable Z_PROBE_SLED SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE
 opt_set LCD_LANGUAGE jp-kana
 opt_disable SEGMENT_LEVELED_MOVES
-opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING BABYSTEP_HOTEND_Z_OFFSET
+opt_enable BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING BABYSTEP_HOTEND_Z_OFFSET
 exec_test $1 $2 "... Sled Z Probe, Skew, UBL Cartesian moves, Japanese, and Z probe BABYSTEPPING"
 
 #
@@ -77,7 +77,7 @@ restore_configs
 opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE \
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
 opt_set NUM_SERVOS 1
-opt_enable_adv NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
+opt_enable NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
 exec_test $1 $2 "RAMPS with ZONESTAR_LCD, Servo Probe, 3-Point ABL, DEBUG_LEVELING_FEATURE, EEPROM, G38, and more"
 
 #
@@ -97,12 +97,12 @@ opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR G26_MESH_EDITING LCD_BED_LE
            M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR \
            INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
            ULTIMAKERCONTROLLER SDSUPPORT \
-           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632
-opt_enable_adv BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS \
-               ADVANCED_PAUSE_FEATURE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE \
-               LCD_INFO_MENU M114_DETAIL
-opt_set_adv PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
-opt_set_adv I2C_SLAVE_ADDRESS 63
+           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 \
+           BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS \
+           ADVANCED_PAUSE_FEATURE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE \
+           LCD_INFO_MENU M114_DETAIL
+opt_set PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
+opt_set I2C_SLAVE_ADDRESS 63
 exec_test $1 $2 "MINIRAMBO for PWM_MOTOR_CURRENT etc"
 
 #
@@ -122,8 +122,7 @@ restore_configs
 opt_set MOTHERBOARD BOARD_RUMBA
 opt_set EXTRUDERS 2
 opt_set TEMP_SENSOR_1 1
-opt_enable USE_XMAX_PLUG
-opt_enable_adv DUAL_X_CARRIAGE
+opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE
 exec_test $1 $2 "DUAL_X_CARRIAGE"
 
 #
@@ -154,15 +153,15 @@ opt_enable COREYX USE_XMAX_PLUG \
            REPRAP_DISCOUNT_SMART_CONTROLLER BABYSTEPPING DAC_MOTOR_CURRENT_DEFAULT \
            FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \
            ENDSTOP_INTERRUPTS_FEATURE ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM SDSUPPORT \
-           SWITCHING_TOOLHEAD NUM_SERVOS DEBUG_LEVELING_FEATURE
-opt_set_adv FAN_MIN_PWM 50
-opt_set_adv FAN_KICKSTART_TIME 100
-opt_set_adv XY_FREQUENCY_LIMIT  15
-opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
-               ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK \
-               VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
-               EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS \
-               MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
+           SWITCHING_TOOLHEAD NUM_SERVOS DEBUG_LEVELING_FEATURE \
+           SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
+           ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK \
+           VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
+           EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS \
+           MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
+opt_set FAN_MIN_PWM 50
+opt_set FAN_KICKSTART_TIME 100
+opt_set XY_FREQUENCY_LIMIT  15
 exec_test $1 $2 "Many less common options"
 
 ######## Other Standard LCD/Panels ##############
@@ -196,12 +195,11 @@ exec_test $1 $2 "Many less common options"
 # G3D_PANEL with SDCARD_SORT_ALPHA and STATUS_MESSAGE_SCROLLING
 #
 #restore_configs
-#opt_enable G3D_PANEL SDSUPPORT
-#opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES
-#opt_set_adv SDSORT_GCODE true
-#opt_set_adv SDSORT_USES_RAM true
-#opt_set_adv SDSORT_USES_STACK true
-#opt_set_adv SDSORT_CACHE_NAMES true
+#opt_enable G3D_PANEL SDSUPPORT SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES
+#opt_set SDSORT_GCODE true
+#opt_set SDSORT_USES_RAM true
+#opt_set SDSORT_USES_STACK true
+#opt_set SDSORT_CACHE_NAMES true
 #exec_test $1 $2 "Stuff"
 #
 # REPRAPWORLD_KEYPAD
@@ -297,12 +295,12 @@ exec_test $1 $2 "Delta Config (FLSUN AC because it's complex)"
 #
 use_example_configs SCARA
 opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
-           EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER
+           EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER \
+           MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD SENSORLESS_HOMING
 opt_set X_DRIVER_TYPE TMC2130
 opt_set Y_DRIVER_TYPE TMC2130
 opt_set Z_DRIVER_TYPE TMC2130
 opt_set E0_DRIVER_TYPE TMC2130
-opt_enable_adv MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD SENSORLESS_HOMING
 exec_test $1 $2 "SCARA with TMC2130"
 #
 # TMC2208 Config
@@ -313,8 +311,7 @@ opt_set Y_DRIVER_TYPE TMC2208
 opt_set Z_DRIVER_TYPE TMC2208
 opt_set E0_DRIVER_TYPE TMC2208
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
-opt_enable REPRAPWORLD_KEYPAD
-opt_enable_adv MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD TMC_DEBUG
+opt_enable REPRAPWORLD_KEYPAD MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD TMC_DEBUG
 exec_test $1 $2 "TMC2208 Config"
 #
 # tvrrug Config need to check board type for sanguino atmega644p
diff --git a/buildroot/share/tests/teensy35_tests b/buildroot/share/tests/teensy35_tests
index 185c960c1b..053ad97a43 100755
--- a/buildroot/share/tests/teensy35_tests
+++ b/buildroot/share/tests/teensy35_tests
@@ -23,9 +23,9 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT \
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
-           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER
-opt_enable_adv ADVANCED_PAUSE_FEATURE LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA PARK_HEAD_ON_PAUSE
-opt_set_adv I2C_SLAVE_ADDRESS 63
+           PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
+           ADVANCED_PAUSE_FEATURE LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA PARK_HEAD_ON_PAUSE
+opt_set I2C_SLAVE_ADDRESS 63
 opt_set GRID_MAX_POINTS_X 16
 exec_test $1 $2 "Teensy3.5 with many features"
 
@@ -33,9 +33,7 @@ exec_test $1 $2 "Teensy3.5 with many features"
 # Test a Sled Z Probe with Linear leveling
 #
 restore_configs
-opt_enable EEPROM_SETTINGS \
-           Z_PROBE_SLED AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE
-opt_enable_adv GCODE_MACROS
+opt_enable EEPROM_SETTINGS Z_PROBE_SLED AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE GCODE_MACROS
 exec_test $1 $2 "Sled Z Probe with Linear leveling"
 
 #
@@ -49,8 +47,8 @@ exec_test $1 $2 "Sled Z Probe with Linear leveling"
 #
 # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
 #
-# opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
-# opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES
+# opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS \
+#            EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES
 # exec_test $1 $2 "...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES"
 
 #
@@ -94,9 +92,9 @@ exec_test $1 $2 "COREXZ"
 # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
 #
 restore_configs
-opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
+opt_enable Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
 pins_set RAMPS X_MAX_PIN -1
-opt_add_adv Z2_MAX_PIN 2
+opt_add Z2_MAX_PIN 2
 opt_enable USE_XMAX_PLUG
 exec_test $1 $2 "Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS"