diff --git a/TH3DUF_R2/Configuration.h b/TH3DUF_R2/Configuration.h
index 298dd87..79493c4 100644
--- a/TH3DUF_R2/Configuration.h
+++ b/TH3DUF_R2/Configuration.h
@@ -773,6 +773,21 @@
 //#define WANHAO_D6_OEM
 //#define CUSTOM_PROBE
 
+//===========================================================================
+// ************************    ZONESTAR PRINTERS     ************************
+//===========================================================================
+
+//===========================================================================
+// Zonestar Z5F Options - Select 'Arduino Mega 2560' from Tools > Board
+//===========================================================================
+//#define ZONESTAR_Z5F
+
+//Stock ABL Option
+//#define ZONESTAR_Z5F_STOCK_ABL
+
+// EZABL Probe Mounts
+//#define CUSTOM_PROBE
+
 //===========================================================================
 // ***********************  MKS Gen L Based Printer   ***********************
 // *************  Select 'Arduino Mega 2560' from Tools > Board *************
@@ -1099,7 +1114,7 @@
 
 #define LCD_LANGUAGE en
 
-#define UNIFIED_VERSION "TH3D U1.R2.B4"
+#define UNIFIED_VERSION "TH3D U1.R2.B5"
 #include "Configuration_backend.h"
 
 #endif // CONFIGURATION_H
diff --git a/TH3DUF_R2/Configuration_adv.h b/TH3DUF_R2/Configuration_adv.h
index b003d67..5c4b96c 100644
--- a/TH3DUF_R2/Configuration_adv.h
+++ b/TH3DUF_R2/Configuration_adv.h
@@ -143,6 +143,10 @@
     #define E0_AUTO_FAN_PIN 7
     #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
     #define EXTRUDER_AUTO_FAN_SPEED   255  
+  #elif ENABLED(ZONESTAR_Z5F)
+    #define E0_AUTO_FAN_PIN 6
+    #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
+    #define EXTRUDER_AUTO_FAN_SPEED   255 
   #else  
     #define E0_AUTO_FAN_PIN -1
     #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
diff --git a/TH3DUF_R2/Configuration_backend.h b/TH3DUF_R2/Configuration_backend.h
index 5e1042b..997d6bd 100644
--- a/TH3DUF_R2/Configuration_backend.h
+++ b/TH3DUF_R2/Configuration_backend.h
@@ -52,6 +52,11 @@
 #if ENABLED(CUSTOM_PROBE)
   #define EZABL_ENABLE
 #endif
+#if ENABLED(ZONESTAR_Z5F_STOCK_ABL)
+  #define EZABL_ENABLE
+  #define X_PROBE_OFFSET_FROM_EXTRUDER 35
+  #define Y_PROBE_OFFSET_FROM_EXTRUDER 0
+#endif
 #if ENABLED(SIDEWINDER_X1_OEM)
   #define EZABL_ENABLE
   #define X_PROBE_OFFSET_FROM_EXTRUDER 0 //TODO
@@ -248,6 +253,72 @@
   #endif
 #endif
 
+//ZoneStar Z5F Settings
+#if ENABLED(ZONESTAR_Z5F)
+  #define BAUDRATE 115200
+
+  #define REPRAP_DISCOUNT_SMART_CONTROLLER
+  #define LCD2004
+
+  #define X_MIN_ENDSTOP_INVERTING true
+  #define Y_MIN_ENDSTOP_INVERTING true
+  #define Z_MIN_ENDSTOP_INVERTING true
+  #define X_MAX_ENDSTOP_INVERTING false
+  #define Y_MAX_ENDSTOP_INVERTING false
+  #define Z_MAX_ENDSTOP_INVERTING false
+  #define Z_MIN_PROBE_ENDSTOP_INVERTING false
+
+  #if ENABLED(CUSTOM_ESTEPS)
+    #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, CUSTOM_ESTEPS_VALUE }
+  #else
+    #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 95 }
+  #endif
+  
+  #define DEFAULT_MAX_FEEDRATE          { 200, 200, 15, 50 }
+  #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 500, 5000 }
+
+  #define DEFAULT_ACCELERATION          1000   
+  #define DEFAULT_RETRACT_ACCELERATION  1000  
+  #define DEFAULT_TRAVEL_ACCELERATION   1000   
+  
+  #define DEFAULT_XJERK                 7.0
+  #define DEFAULT_YJERK                 7.0
+  #define DEFAULT_ZJERK                 0.3
+  #define DEFAULT_EJERK                 5.0
+  
+  #define INVERT_X_DIR true
+  #define INVERT_Y_DIR true
+  #define INVERT_Z_DIR false
+  
+  #if ENABLED(REVERSE_E_MOTOR_DIRECTION)
+    #define INVERT_E0_DIR false
+  #else
+    #define INVERT_E0_DIR true
+  #endif
+    
+  #ifndef MOTHERBOARD
+    #define MOTHERBOARD BOARD_ZRIB_V20
+  #endif
+
+  #define X_BED_SIZE 220
+  #define Y_BED_SIZE 220
+  #define Z_MAX_POS 220
+
+  #if ENABLED(HOME_ADJUST)
+    #define X_MIN_POS X_HOME_ADJUST_LOCATION
+    #define Y_MIN_POS Y_HOME_ADJUST_LOCATION
+  #else
+    #define X_MIN_POS -15
+    #define Y_MIN_POS -21
+  #endif
+  
+  //#define ENCODER_PULSES_PER_STEP 4
+  //#define ENCODER_STEPS_PER_MENU_ITEM 1
+  
+  #define PRINTER_ENABLED_CHECK
+
+#endif
+
 //AnyCubic Mega Zero Settings
 #if ENABLED(AC_MEGA_ZERO)
   #define SLIM_1284P
diff --git a/TH3DUF_R2/pins_RAMPS.h b/TH3DUF_R2/pins_RAMPS.h
index 291ed45..646d9f2 100644
--- a/TH3DUF_R2/pins_RAMPS.h
+++ b/TH3DUF_R2/pins_RAMPS.h
@@ -97,8 +97,14 @@
 #else
   #define Y_MAX_PIN        15
 #endif
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+
+#if ENABLED(ZONESTAR_Z5F_STOCK_ABL)
+  #define Z_MIN_PIN          19 //18
+  #define Z_MAX_PIN          18 //19
+#else
+  #define Z_MIN_PIN          18
+  #define Z_MAX_PIN          19
+#endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
diff --git a/TH3DUF_R2/pins_ZRIB_V20.h b/TH3DUF_R2/pins_ZRIB_V20.h
index 94a083d..817f60b 100644
--- a/TH3DUF_R2/pins_ZRIB_V20.h
+++ b/TH3DUF_R2/pins_ZRIB_V20.h
@@ -24,8 +24,8 @@
  * ZRIB V2.0 pin assignments
  */
 
-#define ZRIB_V20_D6_PIN 6
-#define ZRIB_V20_D9_PIN 9
+#define ZRIB_V20_D6_PIN 9 //6
+#define ZRIB_V20_D9_PIN 6 //9
 #define RAMPS_D9_PIN         ZRIB_V20_D6_PIN
 #define ORIG_E0_AUTO_FAN_PIN ZRIB_V20_D9_PIN
 #define ORIG_E1_AUTO_FAN_PIN ZRIB_V20_D9_PIN