diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e38d04e32d..2b52874b0b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -99,7 +99,7 @@
 */
 //#define ABL_EZABL // TH3D EZABL or Any NO Sensor
 //#define ABL_NCSW //Creality ABL or Any NC Sensor
-#define ABL_BLTOUCH
+//#define ABL_BLTOUCH
 
 //#define CREALITY_ABL_MOUNT //Using creality ABL mount
 //#define E3D_DUALFAN_MOUNT // Using HD Modular mount as above with 2 5015 blowers and sensor on the right
@@ -110,7 +110,7 @@
    Requires a sensor from above
    Melzi board users may only select ABL_BI for bilinear leveling
 */
-#define ABL_BI
+//#define ABL_BI
 //#define ABL_UBL
 
 //#define POWER_LOSS_RECOVERY //Large and does not fit with any other features on Melzi, or UBL on Atmega
@@ -121,8 +121,8 @@
    UBL and Extreme are recommended with solid bed mounts as it becomes a one time commissioning.
    Standard is recommended in most other scenarios.
 */
-#define MeshFast
-//#define MeshStd
+//#define MeshFast
+#define MeshStd
 //#define MeshFine
 //#define MeshExtreme
 
@@ -284,6 +284,9 @@
 
 #if ENABLED(MachineCR2020)
   #define EnclosureLight
+  #define LCD_CONTRAST_INIT 165
+  #define SUICIDE_PIN 12 // Power up method is triggering the kill. Need to add consistent inversion upstream
+  #define SUICIDE_PIN_INVERTING true
 #endif
 #if ENABLED(PLUS)
   #define lerdgeFilSensor //Using lerdge filament sensor, which is opposite polarity to stock)
@@ -1066,12 +1069,12 @@
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
 #define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
 
-#if NONE(ABL_EZABL, ABL_BLTOUCH)
+#if NONE(ABL_EZABL, ABL_BLTOUCH, MachineCR2020)
   #define Z_MIN_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
   #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
 #else
-#define Z_MIN_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
+  #define Z_MIN_ENDSTOP_INVERTING true  // set to true to invert the logic of the endstop.
+  #define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
 #endif
 /**
  * Stepper Drivers
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3372ecf2f7..9e5735da61 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2571,7 +2571,7 @@
 /**
  * User-defined menu items that execute custom GCode
  */
-#if ANY(ABL_UBL,ABL_BI) && NONE(MachineCR10Orig, LowMemoryBoard)
+#if ANY(ABL_UBL, ABL_BI) && NONE(MachineCR10Orig, LowMemoryBoard)
   #define CUSTOM_USER_MENUS
 #endif
 
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index 5e734795e9..c283c6aec9 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -217,7 +217,7 @@ void setup_killpin() {
 
 void setup_powerhold() {
   #if HAS_SUICIDE
-    OUT_WRITE(SUICIDE_PIN, HIGH);
+    OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
   #endif
   #if HAS_POWER_SWITCH
     #if ENABLED(PS_DEFAULT_OFF)
diff --git a/Marlin/src/Marlin.h b/Marlin/src/Marlin.h
index 8b64c9a2cb..c473f22eb6 100644
--- a/Marlin/src/Marlin.h
+++ b/Marlin/src/Marlin.h
@@ -368,7 +368,7 @@ bool pin_is_protected(const pin_t pin);
 void protected_pin_err();
 
 #if HAS_SUICIDE
-  inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); }
+  inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_INVERTING); }
 #endif
 
 #if ENABLED(G29_RETRY_AND_RECOVER)
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 03f73fe877..945f7c0a75 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -68,7 +68,7 @@
      * a print without suicide...
      */
     #if HAS_SUICIDE
-      OUT_WRITE(SUICIDE_PIN, HIGH);
+      OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
     #endif
 
     #if DISABLED(AUTO_POWER_CONTROL)
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index b9f60d3dfc..7e97f187a3 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -41,7 +41,7 @@
 
 #define SD_DETECT_PIN 49  // Always define onboard SD detect
 
-#define PS_ON_PIN     12 // Used by CR2020 Industrial series
+#define PS_ON_PIN     40 // Used by CR2020 Industrial series
 
 #include "pins_RAMPS.h"