diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index fff323db..f9f72df1 100755
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -716,7 +716,7 @@
 #endif
 
 #if ENABLED(KNUTWURST_CHIRON)
-  #define USE_ZMAX_PLUG
+  //#define USE_ZMAX_PLUG
 #endif
 
 //#define USE_YMAX_PLUG
@@ -775,8 +775,8 @@
     #define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
     #define Y_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
     #define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
-    #define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
-    #define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+    #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
     #define Z_MAX_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 endstop.
 #endif
@@ -1235,7 +1235,7 @@
 
 #if ENABLED(KNUTWURST_TFT_LEVELING)
     //#define NOZZLE_TO_PROBE_OFFSET { 0, 0, -17 } // Chiron Default Value!
-    #define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 } // Chiron Default Value!
+    #define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 }
 #endif
 
 #if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
@@ -1531,6 +1531,8 @@
     #define X_BED_SIZE 215
     #define Y_BED_SIZE 215
     #define Z_MAX_POS 206
+    #define X_MAX_POS X_BED_SIZE
+    #define Y_MAX_POS Y_BED_SIZE
 #endif
 
 #if ANY(KNUTWURST_MEGA_S, KNUTWURST_MEGA_P)
@@ -1540,6 +1542,8 @@
     #define X_BED_SIZE 225
     #define Y_BED_SIZE 220
     #define Z_MAX_POS 210
+    #define X_MAX_POS X_BED_SIZE
+    #define Y_MAX_POS Y_BED_SIZE
 #endif
 
 #if ENABLED(KNUTWURST_MEGA_X)
@@ -1549,20 +1553,21 @@
     #define X_BED_SIZE 310
     #define Y_BED_SIZE 310
     #define Z_MAX_POS 305
+    #define X_MAX_POS X_BED_SIZE
+    #define Y_MAX_POS Y_BED_SIZE
 #endif
 
 #if ENABLED(KNUTWURST_CHIRON)
     #define X_MIN_POS -10
     #define Y_MIN_POS 0
     #define Z_MIN_POS 0
-    #define X_BED_SIZE 410
-    #define Y_BED_SIZE 410
-    #define Z_MAX_POS 453
+    #define X_BED_SIZE 400
+    #define Y_BED_SIZE 400
+    #define Z_MAX_POS 455
+    #define X_MAX_POS X_BED_SIZE +10
+    #define Y_MAX_POS Y_BED_SIZE +10
 #endif
 
-// Travel limits (mm) after homing, corresponding to endstop positions.
-#define X_MAX_POS X_BED_SIZE
-#define Y_MAX_POS Y_BED_SIZE
 
 /**
  * Software Endstops
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3215ea65..ee046588 100755
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -559,7 +559,7 @@
       #endif
       
       #if ENABLED(KNUTWURST_CHIRON)
-          #define Z2_USE_ENDSTOP      _ZMAX_
+          #define Z2_USE_ENDSTOP      _XMAX_
       #endif
 
       #define Z2_ENDSTOP_ADJUSTMENT   0
@@ -635,8 +635,9 @@
 #define Z_HOME_BUMP_MM 2
 #define HOMING_BUMP_DIVISOR { 2, 2, 4 }  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
 //#define QUICK_HOME                     // If homing includes X and Y, do a diagonal move initially
-#define HOMING_BACKOFF_MM { 2, 2, 0 }  // (mm) Move away from the endstops after homing
-
+#if DISABLED(KNUTWURST_CHIRON)
+    #define HOMING_BACKOFF_MM { 2, 2, 0 }  // (mm) Move away from the endstops after homing
+#endif
 // When G28 is called, this option will make Y home before X
 //#define HOME_Y_BEFORE_X
 
@@ -1756,7 +1757,7 @@
 
 // @section hidden
 
-
+/*
 #if ENABLED(KNUTWURST_CHIRON)
     #if ENABLED(SDSUPPORT)
       #define BLOCK_BUFFER_SIZE 8 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
@@ -1769,6 +1770,7 @@
     #define TX_BUFFER_SIZE 0
     #define RX_BUFFER_SIZE 64
 #else
+*/
     // The number of linear motions that can be in the plan at any give time.
     // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering.
     #if ENABLED(SDSUPPORT)
@@ -1797,7 +1799,7 @@
     // To use flow control, set this buffer size to at least 1024 bytes.
     // :[0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048]
     #define RX_BUFFER_SIZE 256
-#endif
+//#endif
 
 #if RX_BUFFER_SIZE >= 1024
   // Enable to have the controller send XON/XOFF control characters to
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9c983ac1..2e5ace0d 100755
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -44,7 +44,7 @@
  #define CUSTOM_BUILD_VERSION "1.2.0-b_4.7"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2021-06-19"
+  #define STRING_DISTRIBUTION_DATE "2021-06-21"
 #endif
 
 /**
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h b/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h
index fbb686ed..10856bcb 100755
--- a/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h
@@ -89,7 +89,7 @@
     #define X_MIN_PIN                          3
   #endif
   #ifndef X_MAX_PIN
-    #define X_MAX_PIN                          2
+    #define X_MAX_PIN                         43
   #endif
 #endif
 #ifndef Y_STOP_PIN
@@ -113,7 +113,7 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN                     32
+  #define Z_MIN_PROBE_PIN                      2
 #endif
 
 //