diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg
index 35176a92f..add6fbaff 100644
--- a/config/CreatBot_D1000/base.cfg
+++ b/config/CreatBot_D1000/base.cfg
@@ -173,12 +173,21 @@ rate: 3200
 
 [resonance_tester]
 accel_chip: adxl345
-probe_points: 300, 300, 20
-min_freq: 25
-max_freq: 70
-accel_per_hz: 100
+probe_points: 500, 500, 20
+min_freq: 5
+max_freq: 133.3
+accel_per_hz: 75
 hz_per_sec: 1
 
+[input_shaper]
+#shaper_freq_x: 0
+#shaper_freq_y: 0
+shaper_type: mzv
+#shaper_type_x:
+#shaper_type_y:
+damping_ratio_x: 0.1
+damping_ratio_y: 0.1
+
 [fan]
 pin:tool:PA10
 kick_start_time: 0.5
@@ -336,6 +345,10 @@ speed:100
 z_hop:5
 z_hop_speed: 10
 
+[gcode_macro ENABLE_FORCE_MOVE]
+gcode:
+    SET_KINEMATIC_POSITION X=500 Y=500 Z=500
+
 [gcode_macro T0]
 gcode:
     SET_SERVO SERVO=switch_nozzle angle=135
diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg
index 384e5bfa5..51f09b3eb 100644
--- a/config/CreatBot_D600Pro2/base.cfg
+++ b/config/CreatBot_D600Pro2/base.cfg
@@ -174,11 +174,20 @@ rate: 3200
 [resonance_tester]
 accel_chip: adxl345
 probe_points: 300, 300, 20
-min_freq: 25
-max_freq: 70
-accel_per_hz: 100
+min_freq: 5
+max_freq: 133.3
+accel_per_hz: 75
 hz_per_sec: 1
 
+[input_shaper]
+#shaper_freq_x: 0
+#shaper_freq_y: 0
+shaper_type: mzv
+#shaper_type_x:
+#shaper_type_y:
+damping_ratio_x: 0.1
+damping_ratio_y: 0.1
+
 [fan]
 pin:tool:PA10
 kick_start_time: 0.5
@@ -331,11 +340,15 @@ initial_angle: 135
 # initial_pulse_width:
 
 [safe_z_home]
-home_xy_position: 500,500
+home_xy_position: 300,300
 speed:100
 z_hop:5
 z_hop_speed: 10
 
+[gcode_macro ENABLE_FORCE_MOVE]
+gcode:
+    SET_KINEMATIC_POSITION X=300 Y=300 Z=300
+
 [gcode_macro T0]
 gcode:
     SET_SERVO SERVO=switch_nozzle angle=135
diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index e681d1c4b..5ba5c6dc0 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@@ -410,6 +410,7 @@ z_hop:5
 [gcode_macro ENABLE_FORCE_MOVE]
 gcode:
     SET_KINEMATIC_POSITION X=200 Y=150 Z=150
+
 [gcode_macro _RESTORE_DEFAULT_EXTRUDER]
 gcode:
     SET_GCODE_OFFSET Z=0
@@ -422,10 +423,7 @@ gcode:
 gcode:
     ACTIVATE_EXTRUDER EXTRUDER=extruder
     SET_DUAL_CARRIAGE CARRIAGE=0
-    SAVE_GCODE_STATE NAME=park0
-    G90
     G1 X-20 F6000
-    RESTORE_GCODE_STATE NAME=park0
 
 [gcode_macro T0]
 gcode:
@@ -434,6 +432,8 @@ gcode:
         {% set x_home = true %}
     {% endif %}
     {% if printer.toolhead.extruder != 'extruder' or x_home %}
+        SAVE_GCODE_STATE NAME=park0
+        G90
         _PARK_{printer.toolhead.extruder}
         ACTIVATE_EXTRUDER EXTRUDER=extruder
         SET_DUAL_CARRIAGE CARRIAGE=0
@@ -441,16 +441,14 @@ gcode:
         SET_GCODE_OFFSET Y=0
         SET_GCODE_OFFSET X=0
         G1 X0 F6000
+        RESTORE_GCODE_STATE NAME=park0
     {% endif %}
 
 [gcode_macro _PARK_extruder1]
 gcode:
     ACTIVATE_EXTRUDER EXTRUDER=extruder1
     SET_DUAL_CARRIAGE CARRIAGE=1
-    SAVE_GCODE_STATE NAME=park1
-    G90
-    G1 X475
-    RESTORE_GCODE_STATE NAME=park1
+    G1 X475 F6000
 
 [gcode_macro T1]
 gcode:
@@ -465,6 +463,8 @@ gcode:
     {% endif %}
 
     {% if printer.toolhead.extruder != 'extruder1' or x_home %}
+        SAVE_GCODE_STATE NAME=park1
+        G90
         _PARK_{printer.toolhead.extruder}
         ACTIVATE_EXTRUDER EXTRUDER=extruder1
         SET_DUAL_CARRIAGE CARRIAGE=1
@@ -472,6 +472,7 @@ gcode:
         SET_GCODE_OFFSET Y={y_offset}
         SET_GCODE_OFFSET X={x_offset}
         G1 X455 F6000
+        RESTORE_GCODE_STATE NAME=park1
     {% endif %}