diff --git a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
index 9075315841..f627fbf74b 100644
--- a/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
@@ -15,7 +15,8 @@ variant = AA 0.4
 speed_infill = =speed_print
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 speed_layer_0 = 20
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 2
@@ -25,8 +26,9 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
 jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 wall_line_width_x = =line_width
diff --git a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index db4a001daf..be622d6cfe 100644
--- a/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -16,14 +16,18 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 speed_print = 30
+speed_infill = =speed_print
 speed_layer_0 = 20
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
diff --git a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index 12ba19a5d2..352c26d312 100644
--- a/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -16,14 +16,18 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 speed_print = 30
+speed_infill = =speed_print
 speed_layer_0 = 20
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
diff --git a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
index 5ed11ab78e..553a68201d 100644
--- a/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
@@ -12,21 +12,23 @@ material = generic_pla
 variant = AA 0.4
 
 [values]
+speed_infill = =speed_print
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+speed_layer_0 = 20
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 2
-infill_sparse_density = 15
 fill_perimeter_gaps = nowhere
+infill_sparse_density = 15
 infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
 jerk_layer_0 = 5
 line_width = =machine_nozzle_size
-speed_infill = =speed_print
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_print
-speed_layer_0 = 20
 wall_line_width_x = =line_width
diff --git a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index 87da046a9f..0943bb2032 100644
--- a/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -16,14 +16,18 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 speed_print = 30
+speed_infill = =speed_print
 speed_layer_0 = 20
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
diff --git a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index 8175cd7c4a..053b849aff 100644
--- a/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -16,14 +16,18 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 speed_print = 30
+speed_infill = =speed_print
 speed_layer_0 = 20
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
diff --git a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
index 40cef6653d..458b283dd8 100644
--- a/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
@@ -15,7 +15,8 @@ variant = AA 0.4
 speed_infill = =speed_print
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 speed_layer_0 = 20
 top_bottom_thickness = =wall_thickness
 wall_thickness = =line_width * 2
@@ -25,8 +26,9 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
 jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 wall_line_width_x = =line_width
diff --git a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 1aed2360e5..d19ad53fae 100644
--- a/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -16,14 +16,18 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 speed_print = 30
+speed_infill = =speed_print
 speed_layer_0 = 20
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
diff --git a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index f2246a6d09..23d8b1e39b 100644
--- a/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -16,14 +16,18 @@ infill_line_width = =line_width
 jerk_print = 30
 jerk_infill = =jerk_print
 jerk_topbottom = =jerk_print
-jerk_wall_0 = =jerk_print
-jerk_wall_x = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
 line_width = =machine_nozzle_size
 speed_print = 30
+speed_infill = =speed_print
 speed_layer_0 = 20
 speed_topbottom = =speed_print
 speed_wall = =speed_print
-speed_wall_0 = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
 top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3