diff --git a/platformio.ini b/platformio.ini
index 4cf12236fb..13fc658758 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -657,43 +657,43 @@ build_flags = ${common.build_flags} -DMachineCR10Max -DHotendAllMetal -DBedDC -D
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC
 
 [env:E5P_UBL]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL
 
 [env:E5P_BIL_Slnt]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DCrealitySilentBoard
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DCrealitySilentBoard
 
 [env:E5P_UBL_Slnt]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DCrealitySilentBoard
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DCrealitySilentBoard
 
 [env:E5P_BIL_DZ]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DDualZ
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DDualZ
 
 [env:E5P_UBL_DZ]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DDualZ
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DDualZ
 
 [env:E5PBILSlntDZ]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DCrealitySilentBoard -DDualZ
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DCrealitySilentBoard -DDualZ
 
 [env:E5PUBLSlntDZ]
 platform      = atmelavr
@@ -789,73 +789,73 @@ build_flags = ${common.build_flags} -DMachineCRX -DHotendAllMetal -DBedDC -DFilS
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DForce10SProDisplay
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal
 
 [env:CRXPro_UBL_NoFil]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DForce10SProDisplay
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL
 
 [env:CRXPro_BIL_Fil]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DForce10SProDisplay -DFilSensors
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DFilSensors
 
 [env:CRXPro_UBL_Fil]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DForce10SProDisplay -DFilSensors
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DFilSensors
 
 [env:CRXPro_BILNoFilMC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DForce10SProDisplay -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DHotendMosquito
 
 [env:CRXPro_UBLNoFilMC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DForce10SProDisplay -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DHotendMosquito
 
 [env:CRXPro_BIL_Fil_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DForce10SProDisplay -DFilSensors -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DFilSensors -DHotendMosquito
 
 [env:CRXPro_UBL_Fil_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DForce10SProDisplay -DFilSensors -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DFilSensors -DHotendMosquito
 
 [env:CRXPro_BILNoFilME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DForce10SProDisplay -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DHotendMosquito -DHotendE3D
 
 [env:CRXPro_UBLNoFilME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DForce10SProDisplay -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DHotendMosquito -DHotendE3D
 
 [env:CRXPro_BIL_Fil_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DForce10SProDisplay -DFilSensors -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DFilSensors -DHotendMosquito -DHotendE3D
 
 [env:CRXPro_UBL_Fil_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DForce10SProDisplay -DFilSensors -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineCRXPro -DHotendAllMetal -DABL_UBL -DFilSensors -DHotendMosquito -DHotendE3D
 
 [env:10SPro_BLT_UBL_Enc]
 platform      = atmelavr
@@ -1325,49 +1325,49 @@ build_flags = ${common.build_flags} -DMachineCR10Max -DHotendAllMetal -DBedDC -D
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DHotendMosquito
 
 [env:E5P_UBL_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DHotendMosquito
 
 [env:E5P_BIL_Slnt_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DCrealitySilentBoard -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DCrealitySilentBoard -DHotendMosquito
 
 [env:E5P_UBL_Slnt_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DCrealitySilentBoard -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DCrealitySilentBoard -DHotendMosquito
 
 [env:E5P_BIL_DZ_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DDualZ -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DDualZ -DHotendMosquito
 
 [env:E5P_UBL_DZ_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DDualZ -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DDualZ -DHotendMosquito
 
 [env:E5PBILSlntDZ_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DCrealitySilentBoard -DDualZ -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DCrealitySilentBoard -DDualZ -DHotendMosquito
 
 [env:E5PUBLSlntDZ_MC]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DCrealitySilentBoard -DDualZ -DHotendMosquito
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DCrealitySilentBoard -DDualZ -DHotendMosquito
 
 [env:CRX_BLT_BILNoFilMC]
 platform      = atmelavr
@@ -1745,49 +1745,49 @@ build_flags = ${common.build_flags} -DMachineCR10Max -DHotendAllMetal -DBedDC -D
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DHotendMosquito -DHotendE3D
 
 [env:E5P_UBL_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DHotendMosquito -DHotendE3D
 
 [env:E5P_BIL_Slnt_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DCrealitySilentBoard -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DCrealitySilentBoard -DHotendMosquito -DHotendE3D
 
 [env:E5P_UBL_Slnt_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DCrealitySilentBoard -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DCrealitySilentBoard -DHotendMosquito -DHotendE3D
 
 [env:E5P_BIL_DZ_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DDualZ -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DDualZ -DHotendMosquito -DHotendE3D
 
 [env:E5P_UBL_DZ_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DDualZ -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DDualZ -DHotendMosquito -DHotendE3D
 
 [env:E5PBILSlntDZ_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DForce10SProDisplay -DCrealitySilentBoard -DDualZ -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DCrealitySilentBoard -DDualZ -DHotendMosquito -DHotendE3D
 
 [env:E5PUBLSlntDZ_ME]
 platform      = atmelavr
 extends       = common_avr8
 board         = megaatmega2560
-build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DForce10SProDisplay -DCrealitySilentBoard -DDualZ -DHotendMosquito -DHotendE3D
+build_flags = ${common.build_flags} -DMachineEnder5Plus -DHotendAllMetal -DBedDC -DABL_UBL -DCrealitySilentBoard -DDualZ -DHotendMosquito -DHotendE3D
 
 [env:CRX_BLTBILNoFilME]
 platform      = atmelavr