diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b7b818cece..05e9d6a8c1 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -9,7 +9,7 @@
 //#define MachineEnder3
 //#define MachineEnder4
 //#define MachineEnder5
-//#define MachineEnder5Plus
+#define MachineEnder5Plus
 //#define MachineMini
 //#define MachineCR20 //Buzzer doesnt work
 //#define MachineCR20Pro
@@ -17,7 +17,7 @@
 //#define MachineCR10S
 //#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66
 //#define MachineCRX
-#define MachineCR10Max
+//#define MachineCR10Max
 //#define MachineS4
 //#define MachineS5
 
@@ -306,7 +306,7 @@
   #define SolidBedMounts
 #endif
 
-#if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, GraphicLCD)
+#if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineCRX, MachineCR10Max, MachineEnder5Plus) || ENABLED(GraphicLCD)
   #define SHOW_CUSTOM_BOOTSCREEN
 // Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
   #define CUSTOM_STATUS_SCREEN_IMAGE
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3afdb9edda..f1d9b4c0c8 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1616,7 +1616,7 @@
 
   #define PARK_HEAD_ON_PAUSE                      // Park the nozzle during pause and filament change.
   #define HOME_BEFORE_FILAMENT_CHANGE             // Ensure homing has been completed prior to parking for filament change
-  #if NONE(MachineCR10Orig, MachineEnder4, MachineCR10SPro, MachineEnder5Plus, MachineCRX)
+  #if NONE(MachineCR10Orig, MachineEnder4, EXTENSIBLE_UI)
     #define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
     #define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
   #endif