Merge branch 'Ultimaker:main' into master

195 files changed, 219 insertions, 606 deletions

diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json
index 067422354e..352cd23394 100644
--- a/resources/definitions/SV02.def.json
+++ b/resources/definitions/SV02.def.json
@@ -44,7 +44,6 @@
         "machine_max_jerk_xy": { "value": 8 },

         "machine_max_jerk_z": { "value": 0.4 },

         "machine_max_jerk_e": { "value": 5 },

-        "machine_heated_bed": { "default_value": true },

         "material_diameter": { "default_value": 1.75 },

         "infill_overlap": { "default_value": 15	},

         "acceleration_print": { "value": 500 },

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index c411162359..6763cbb7f2 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -2256,7 +2256,7 @@
                     "maximum_value": "machine_height",
                     "maximum_value_warning": "resolveOrValue('infill_sparse_thickness') * 10",
                     "type": "float",
-                    "value": "0 if infill_sparse_density > 0 else 0",
+                    "value": "0",
                     "limit_to_extruder": "infill_extruder_nr",
                     "enabled": "infill_sparse_density > 0",
                     "settable_per_mesh": true,
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 5818c11a6f..8c6d8c0dda 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -50,23 +50,29 @@
         "wall_thickness": {
             "value": "wall_line_width_0 + wall_line_width_x"
         },
-        "infill_before_walls": {
-            "value": "False"
-        },
         "infill_material_flow": {
             "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow"
         },
         "retraction_combing": {
             "value": "'no_outer_surfaces'"
         },
+        "retraction_count_max": {
+            "value": 25
+        },
+        "retraction_extrusion_window": {
+            "value": 1
+        },
         "roofing_layer_count": {
-            "value": "0"
+            "value": "1"
         },
         "roofing_material_flow": {
             "value": "material_flow"
         },
         "skin_material_flow": {
-            "value": "0.97 * material_flow"
+            "value": "0.95 * material_flow"
+        },
+        "support_interface_material_flow": {
+            "value": "skin_material_flow"
         },
         "skin_monotonic" : {
             "value": true
@@ -89,11 +95,124 @@
         "meshfix_maximum_deviation": {
             "value": "machine_nozzle_size / 10"
         },
-        "jerk_travel": {
-            "value": "jerk_print"
+        "jerk_travel_enabled": {
+            "value": false
+        },
+        "acceleration_travel_enabled": {
+            "value": false
         },
         "acceleration_travel": {
             "value": "acceleration_wall"
+        },
+        "skin_edge_support_thickness": {
+            "value": "4 * layer_height if infill_sparse_density < 30 else 0"
+        },
+        "bridge_settings_enabled": {
+            "value": false
+        },
+        "bridge_wall_min_length": {
+            "value": 0
+        },
+        "bridge_skin_support_threshold": {
+            "value": 50
+        },
+        "bridge_sparse_infill_max_density": {
+            "value": 0
+        },
+        "bridge_wall_coast": {
+            "value": 0
+        },
+        "bridge_wall_speed": {
+            "value": "speed_wall"
+        },
+        "bridge_wall_material_flow": {
+            "value": "wall_material_flow"
+        },
+        "bridge_skin_speed": {
+            "value": "speed_topbottom"
+        },
+        "bridge_skin_material_flow": {
+            "value": "skin_material_flow"
+        },
+        "bridge_skin_density": {
+            "value": "80"
+        },
+        "bridge_fan_speed": {
+             "value": "cool_fan_speed_max"
+        },
+        "bridge_enable_more_layers": {
+            "value": false
+        },
+        "bridge_skin_speed_2": {
+            "value": "speed_topbottom"
+        },
+        "bridge_skin_material_flow_2": {
+            "value": "skin_material_flow"
+        },
+        "bridge_skin_density_2": {
+            "value": 100
+        },
+        "bridge_fan_speed_2": {
+            "value": "cool_fan_speed_min"
+        },
+        "bridge_skin_speed_3": {
+             "value": "speed_topbottom"
+        },
+        "bridge_skin_material_flow_3": {
+            "value": "skin_material_flow"
+        },
+        "bridge_skin_density_3": {
+             "value": 100
+        },
+        "bridge_fan_speed_3": {
+             "value": "cool_fan_speed_min"
+        },
+        "jerk_print": {
+            "value": "20",
+            "minimum_value_warning": 20
+        },
+        "jerk_infill": {
+            "minimum_value_warning": 20
+        },
+        "jerk_wall": {
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_roofing": {
+            "minimum_value_warning": 20
+        },
+        "jerk_topbottom": {
+            "minimum_value_warning": 20
+        },
+        "jerk_support": {
+            "minimum_value_warning": 20
+        },
+        "jerk_support_infill": {
+            "minimum_value_warning": 20
+        },
+        "jerk_support_interface": {
+            "minimum_value_warning": 20
+        },
+        "jerk_prime_tower": {
+            "minimum_value_warning": 20
+        },
+        "jerk_layer_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_print_layer_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_travel": {
+            "value": "jerk_print",
+            "minimum_value_warning": 20
+        },
+        "jerk_travel_layer_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_skirt_brim": {
+            "minimum_value_warning": 20
         }
     }
 }
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index fd21ab5271..858d5f91a7 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -101,20 +101,6 @@
         "infill_wipe_dist": { "value": "0" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_enabled": { "value": "True" },
-        "jerk_print": { "value": "20", "minimum_value_warning": 20 },
-        "jerk_infill": {"minimum_value_warning": 20 },
-        "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
-        "jerk_roofing": {"minimum_value_warning": 20 },
-        "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_infill": {"minimum_value_warning": 20 },
-        "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
-        "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
-        "jerk_print_layer_0": {"minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"minimum_value_warning": 20 },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@@ -136,8 +122,6 @@
         "raft_margin": { "value": "10" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 640a062c6d..67f8ddab83 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -93,20 +93,6 @@
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
-        "jerk_print": { "value": "20", "minimum_value_warning": 20 },
-        "jerk_infill": {"minimum_value_warning": 20 },
-        "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
-        "jerk_roofing": {"minimum_value_warning": 20 },
-        "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_infill": {"minimum_value_warning": 20 },
-        "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
-        "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
-        "jerk_print_layer_0": {"minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"minimum_value_warning": 20 },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@@ -128,8 +114,6 @@
         "raft_speed": { "value": "25" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },
@@ -155,7 +139,6 @@
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
-        "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
         "initial_layer_line_width_factor": { "value": "120" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 0d5d7499cc..005c876117 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -95,20 +95,6 @@
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
-        "jerk_print": { "value": "20", "minimum_value_warning": 20 },
-        "jerk_infill": {"minimum_value_warning": 20 },
-        "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
-        "jerk_roofing": {"minimum_value_warning": 20 },
-        "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_infill": {"minimum_value_warning": 20 },
-        "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
-        "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
-        "jerk_print_layer_0": {"minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"minimum_value_warning": 20 },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@@ -130,8 +116,6 @@
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
         "retraction_combing": { "value": "'no_outer_surfaces'"},
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },
@@ -157,7 +141,6 @@
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
-        "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
         "optimize_wall_printing_order": { "value": "True" },
diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json
index 06ba86de2d..82b05f3366 100644
--- a/resources/definitions/uni_base.def.json
+++ b/resources/definitions/uni_base.def.json
@@ -138,7 +138,6 @@
         "machine_height":                    {"default_value": 250},
         "machine_extruder_count":            {"value": 2}, 
         "machine_buildplate_type":           {"value": "glass"},
-        "machine_heated_bed":                {"default_value": true},
         "machine_center_is_zero":            {"default_value": false},
         "machine_gcode_flavor":              {"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_head_with_fans_polygon":    {"default_value": [
diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json
index ec069b24fb..b9a1484ae7 100644
--- a/resources/definitions/voron2_base.def.json
+++ b/resources/definitions/voron2_base.def.json
@@ -98,8 +98,9 @@
         "machine_start_gcode":                          { "default_value": "print_start" },
         "machine_end_gcode":                            { "default_value": "print_end" },
         "adhesion_type":                                { "default_value": "skirt" },
+        "retraction_amount":                            { "default_value": 0.75 },
         "skirt_brim_minimal_length":                    { "default_value": 550 },
-        "retraction_speed":                             { "default_value": 80, "maximum_value_warning": 130 },
+        "retraction_speed":                             { "default_value": 30, "maximum_value_warning": 130 },
         "retraction_retract_speed":                     { "maximum_value_warning": 130 },
         "retraction_prime_speed":                       { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 },
         "retraction_hop_enabled":                       { "default_value": true },
diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json
index 1ef9398987..9f73419d46 100644
--- a/resources/definitions/zav_base.def.json
+++ b/resources/definitions/zav_base.def.json
@@ -147,7 +147,6 @@
         "machine_height":                    {"default_value": 270},
         "machine_extruder_count":            {"value": 1}, 
         "machine_buildplate_type":           {"value": "glass"},
-        "machine_heated_bed":                {"default_value": true},
         "machine_center_is_zero":            {"default_value": false},
         "machine_gcode_flavor":              {"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_head_with_fans_polygon":    {"default_value": [
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
index ed1312583e..f2095ba055 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
@@ -22,11 +22,6 @@ top_bottom_thickness = 0.8
 infill_sparse_density = 15
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
+
 
 
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index 48fb654a87..b74cd522ac 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index b98688044f..1caacdf72f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index 344cd30b8d..315b26a3b1 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index 4e33b36ee1..d4a999d8eb 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index 8cdf66b6fe..aa371be6f3 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index ff9e5755b3..abd125f483 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index 1d68116a7f..c8cf2a3bd4 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index 168b920b80..b4bbdddff7 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index 70347ae80f..19418812af 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index 9b2de341e6..36ea7c975e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index b9193339bf..88691ef1d6 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
index 70abf19142..b59ed875b4 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
@@ -16,12 +16,6 @@ is_experimental = True
 infill_sparse_density = 10
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 acceleration_print = 4000
 acceleration_wall = 2000
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 0cf2b8f993..924edf577d 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 0ca960acd7..b92e07a877 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
index 95d4d65b4a..98ad3af40b 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
@@ -22,11 +22,6 @@ top_bottom_thickness = 0.8
 infill_sparse_density = 15
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
+
 
 
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index ad0eda8726..8939d670b1 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index 1fcbb95940..44f76d561f 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index 7d1026b479..7bf1fc834a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index 52bd47103f..a95862c35a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
index 55eaac45cf..bfdd35017c 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index b831e25ce6..022fb2b50d 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index e1b8a1c712..3637040c4c 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index ed808aaf03..6cce98ca60 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index adc4169968..32e0463447 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index bccd269c87..0b7ffb4154 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index f13476802c..186281c17c 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index 585c2f72b5..545a8b5654 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
index 4c9608ddaf..76d9191fc1 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
@@ -22,11 +22,6 @@ top_bottom_thickness = 0.8
 infill_sparse_density = 15
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
+
 
 
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index 11a2c5e134..ca098b5bfa 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index f9a3c3f775..472c0b4359 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
index 12752123f4..51cfaebe34 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
@@ -16,12 +16,6 @@ is_experimental = True
 infill_sparse_density = 10
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 acceleration_print = 4000
 acceleration_wall = 2000
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
index 7aaff9a062..7851ecd793 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
@@ -22,11 +22,6 @@ top_bottom_thickness = 0.8
 infill_sparse_density = 15
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
+
 
 
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 84c9293467..2b1b769595 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 8d8825ca41..daa327a2f5 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -14,12 +14,6 @@ variant = AA 0.4
 [values]
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 speed_print = 30
 speed_infill = =speed_print
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
index a3e850c05d..ec93cc5599 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
@@ -16,12 +16,6 @@ is_experimental = True
 infill_sparse_density = 10
 
 jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
 
 acceleration_print = 4000
 acceleration_wall = 2000
diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml
index 49adcf0cca..e5216a3404 100644
--- a/resources/qml/ColorDialog.qml
+++ b/resources/qml/ColorDialog.qml
@@ -29,7 +29,7 @@ UM.Dialog
     // the size of the dialog ourselves.
     // Ugly workaround for windows having overlapping elements due to incorrect dialog width
     minimumWidth: content.width + (Qt.platform.os == "windows" ? 4 * margin : 2 * margin)
-    minimumHeight: content.height + buttonArea.height + (Qt.platform.os == "windows" ? 5 * margin : 3 * margin)
+    minimumHeight: content.height + footer.height + (Qt.platform.os == "windows" ? 5 * margin : 3 * margin)
 
     property alias color: colorInput.text
     property var swatchColors: [
diff --git a/resources/qml/MachineSettings/GcodeTextArea.qml b/resources/qml/MachineSettings/GcodeTextArea.qml
index 7791e169c2..d4bc58cdc4 100644
--- a/resources/qml/MachineSettings/GcodeTextArea.qml
+++ b/resources/qml/MachineSettings/GcodeTextArea.qml
@@ -67,6 +67,8 @@ UM.TooltipArea
             font: UM.Theme.getFont("fixed")
             renderType: Text.NativeRendering
             color: UM.Theme.getColor("text")
+            selectionColor: UM.Theme.getColor("text_selection")
+            selectedTextColor: UM.Theme.getColor("text")
             wrapMode: TextEdit.NoWrap
 
             onActiveFocusChanged:
@@ -91,7 +93,7 @@ UM.TooltipArea
                     }
                     if (gcodeTextArea.hovered || gcodeTextArea.activeFocus)
                     {
-                        return UM.Theme.getColor("border_main")
+                        return UM.Theme.getColor("text_field_border_active")
                     }
                     return UM.Theme.getColor("border_field_light")
                 }
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
index 56320f0b73..79e51d0130 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
index 5e84e3f167..12b5d00005 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
index 10cbfab427..96c0b34b82 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
index 161ca2e079..261c2552a8 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
index e88b527308..c58be35862 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
index 36d599faf3..f00847c032 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
index 87784fa7cf..11b1e2e84c 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@@ -25,6 +25,7 @@ raft_base_line_spacing = 1
 raft_interface_line_spacing = 1
 raft_interface_line_width = 0.2
 raft_surface_line_width = 0.2
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
index c49f135c87..b45b7de66e 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
@@ -23,6 +23,7 @@ raft_base_line_spacing = 2
 raft_base_line_width = 0.8
 raft_interface_line_spacing = 1
 raft_margin = 12
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
index 3231fc1cef..568e8ed542 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@@ -26,6 +26,7 @@ raft_interface_line_spacing = 1.2
 raft_interface_line_width = 0.57
 raft_margin = 15
 raft_surface_line_width = 0.5
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 45)
 speed_print = 45
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
index 70aecc029f..4f67fa891d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
index 8b28161b09..6c39f15e6d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
index b1d7adfd0b..578b7615b5 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
index a64996c8f0..d39191f6d5 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
index f3dd14c276..b2c62ba2b4 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
@@ -39,8 +39,7 @@ jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
index 232d74d602..35b5f52e1e 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
@@ -29,18 +29,8 @@ cool_min_speed = 20
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0
-jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
-jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
index 4371dcf524..169b990d3d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
@@ -25,6 +25,7 @@ raft_base_line_spacing = 1
 raft_interface_line_spacing = 1
 raft_interface_line_width = 0.2
 raft_surface_line_width = 0.2
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
index ecd8c76a50..b822d913b3 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
@@ -23,6 +23,7 @@ raft_base_line_spacing = 2
 raft_base_line_width = 0.8
 raft_interface_line_spacing = 1
 raft_margin = 12
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 40)
 speed_print = 40
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
index 14844dc216..941f119653 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
@@ -26,6 +26,7 @@ raft_interface_line_spacing = 1.2
 raft_interface_line_width = 0.57
 raft_margin = 15
 raft_surface_line_width = 0.5
+retraction_count_max = 15
 retraction_hop_enabled = 0.2
 speed_layer_0 = =math.ceil(speed_print * 30 / 45)
 speed_print = 45
diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
index c63858f825..a24b18563d 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -12,7 +12,6 @@ material = generic_cpe
 variant = AA 0.25
 
 [values]
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
index c17554a0cc..53bb10c2eb 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -21,7 +21,6 @@ cool_min_layer_time_fan_speed_max = 5
 cool_min_speed = 5
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 multiple_mesh_overlap = 0
@@ -30,7 +29,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
index 36a3e23c27..ce7087bf3a 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -12,7 +12,6 @@ material = generic_petg
 variant = AA 0.25
 
 [values]
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
index 77af8bae1e..f26fcd025f 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
@@ -31,9 +31,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 45
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
-retraction_extrusion_window = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
index f2b4caf168..30d20139e1 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
@@ -29,7 +28,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
index addd4790db..e213684360 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 6
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.15
 machine_min_cool_heat_time_window = 15
@@ -29,7 +28,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
index 3c1baa8640..70c1b4afaa 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.06
 machine_min_cool_heat_time_window = 15
@@ -31,7 +30,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
index e0c239c536..bd452fc538 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 7
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -30,7 +29,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
index f33132ee5b..0c1224aa2b 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
@@ -23,7 +23,6 @@ infill_overlap = 0
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
@@ -39,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
index 8c02c9c816..1bce358b5d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 7
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.15
 machine_min_cool_heat_time_window = 15
@@ -37,8 +36,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
index 4ff801f4fa..b997f3acff 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
@@ -23,7 +23,6 @@ infill_overlap = 0
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.06
 machine_min_cool_heat_time_window = 15
@@ -39,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
index 180d96011d..d6181b9207 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -22,7 +22,6 @@ cool_min_speed = 5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -36,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
index 5a49c5d95f..c151870622 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
@@ -38,9 +38,8 @@ prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
 retraction_amount = 6.5
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
index 1da161a2fb..7e21bec438 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
@@ -37,9 +37,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
index 52aadd5b2d..c47bfb3c18 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 2.5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -36,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
index e20587931f..227b16db92 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -16,7 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 7
 jerk_print = 25
-jerk_roofing = 1
 layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
index b5cc9b7261..9c02ed5200 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
@@ -36,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
index 4e7696c0b3..fe3f453f9c 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.15
 machine_min_cool_heat_time_window = 15
@@ -37,9 +36,8 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
 retraction_amount = 7
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
index caed386864..c824bc59ab 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.5
@@ -34,9 +33,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
index 8fdcd54797..6510c0db81 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 10
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
index ff729395b9..d37c9aef29 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 20
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
index 911932c819..2313d3e7f2 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 15
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
index 53bf19e17b..e68fde0763 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -30,7 +30,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
index a1cfef6d5f..c0c9e7c48a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -31,7 +31,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 388959da4a..e85db940a5 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -30,7 +30,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
index ae1cd2f262..a9adf2e3de 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
@@ -16,5 +16,6 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 20
 support_brim_enable = True
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
index 9652a2f50a..90be6c2b37 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
@@ -16,6 +16,7 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 15
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
index 72cc7dc901..98d9566577 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.18
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
index e828b94f2e..cc8c3bf10a 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
index e7c07c73fa..6a54c04e7b 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.8
 brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
index bcb92ccefa..7947e3cfe8 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.8
 brim_replaces_support = False
 layer_height = 0.4
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_interface_height = 0.9
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
index 3ce14a2ad0..3e2c92bbf6 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = BB 0.8
 brim_replaces_support = False
 layer_height = 0.3
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
index d875b9c8f3..5ced8748b1 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
index a3a0073bba..071db69a43 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -30,7 +30,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
index 516f24dec5..6c3a7e7a81 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 8
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
index d0668b64f6..8ae871f4fe 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
@@ -19,7 +19,6 @@ cool_min_layer_time_fan_speed_max = 5
 cool_min_speed = 2.5
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
@@ -31,9 +30,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 6
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
-retraction_extrusion_window = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
index 0b8555734e..b933ae005b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 5
 
 infill_overlap = 0
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 material_final_print_temperature = =material_print_temperature - 10
@@ -28,7 +27,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
index f3dce95478..526e12bfe0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -28,7 +28,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
index f895647971..be5d77a69e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 5
 
 infill_overlap = 0
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -30,7 +29,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
index bba0f354c9..bc16d73c04 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 7
 
 infill_overlap = 0
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -30,7 +29,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
index 85d31733e6..5190288662 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
@@ -38,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
index a9cdf6336d..5467595bd3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 7
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -36,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
index ff5d6f4f7c..c694b5db79 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
@@ -38,8 +38,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
index a61e50f280..5287ce24c4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -36,8 +36,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
index 0ce09d5812..62a5516b2c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -33,7 +33,6 @@ material_shrinkage_percentage_z = 100.1
 
 prime_tower_enable = False
 retraction_prime_speed = =retraction_speed
-skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
 skin_overlap = 20
 top_bottom_thickness = 0.9
 
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
index 75eba5b995..88089479ad 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 2.5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -36,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
index fdf769ed38..dd35987ced 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
@@ -20,7 +20,6 @@ cool_min_speed = 2.5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -35,9 +34,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
index 821e1f4840..5eff4b3248 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 2.5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 
 machine_min_cool_heat_time_window = 15
@@ -37,9 +36,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
index a9e32a5283..c3837c7850 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -16,7 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 7
 jerk_print = 25
-jerk_roofing = 1
 layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index 4bf6623cf6..50206224a9 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -33,7 +33,6 @@ material_shrinkage_percentage_z = 100.1
 
 prime_tower_enable = False
 retraction_prime_speed = =retraction_speed
-skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
 skin_overlap = 20
 top_bottom_thickness = 1.2
 
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
index 566f474dc4..90a68d134e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -22,9 +22,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
-
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
@@ -36,9 +34,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
index e968507192..d59d5c18f7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 
 machine_min_cool_heat_time_window = 15
@@ -36,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
index ca8410766a..c0445e739c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -35,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
index 4572e3fabc..14a7451bcc 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 10
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
index 596f34d7b9..c466b76c1c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 20
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
index 4f1a91337a..804149a584 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -25,7 +25,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 15
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
index dc4858e463..ab71a4c37e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
index d2e23c81a9..ac2181d373 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -29,7 +29,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 3d4076c08c..e4bb128599 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
index afb19f1769..94802d49fc 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
@@ -16,5 +16,6 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 20
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
index 6b1cef8991..bafe3e88d6 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
@@ -16,6 +16,7 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 15
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
index 0a9a37ca05..c1b9556636 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.18
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
index a899959d98..0a4e11c158 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
index 0cd6094bbc..8bd0e5d375 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ is_experimental = True
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
index 388ebeff72..587b7b29cd 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.8
 brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
index e9030819ea..c1cbac87a0 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -14,5 +14,6 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_interface_height = 0.9
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
index c35737bb97..b5e22bef62 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
index 52499d000c..f895450c0a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
index e77d2a2dd9..ec8409137c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
@@ -21,7 +21,6 @@ cool_min_layer_time_fan_speed_max = 5
 cool_min_speed = 5
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 multiple_mesh_overlap = 0
@@ -30,7 +29,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
index 7a3b50c550..76c8372166 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -13,7 +13,6 @@ variant = AA 0.25
 
 [values]
 retraction_combing_max_distance = 8
-retraction_extrusion_window = 0.5
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
index 85a608c293..df673c641c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
@@ -19,7 +19,6 @@ cool_min_layer_time_fan_speed_max = 5
 cool_min_speed = 2.5
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
@@ -31,9 +30,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 6
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.2
-retraction_extrusion_window = 6.5
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
index 1d12f8f8d9..fc2156acf5 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 5
 
 infill_overlap = 0
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 material_final_print_temperature = =material_print_temperature - 10
@@ -28,7 +27,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
index 12db110133..9a17e20047 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 6
 
 infill_overlap = 0
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 material_final_print_temperature = =material_print_temperature - 10
@@ -28,7 +27,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
index eb4db520bd..1511dd698e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
@@ -17,7 +17,6 @@ cool_min_speed = 5
 
 infill_overlap = 0
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -30,7 +29,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
index 71102926d8..881e89d91b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -16,7 +16,6 @@ cool_fan_speed_max = 50
 cool_min_speed = 7
 infill_overlap = 0
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -29,7 +28,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 retraction_combing_max_distance = 50
-retraction_extrusion_window = 1
 retraction_hop = 0.2
 retraction_hop_enabled = False
 retraction_hop_only_when_collides = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
index b8a6fbc38a..bdfd6aadea 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
@@ -17,13 +17,11 @@ material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 retraction_combing_max_distance = 50
 retraction_prime_speed = =retraction_speed
-skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0
 skin_overlap = 20
 speed_print = 60
 speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
-top_thickness = =0.8 if infill_sparse_density < 30 and skin_edge_support_thickness == 0.8 else top_bottom_thickness
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 speed_infill = =math.ceil(speed_print * 50 / 60)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
index d9bc39705b..1e2f58a3c3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -37,8 +36,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
index 03999c27e1..ce5d8a5c89 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 7
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -36,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
index de05aa5cac..99d5d7ef1d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
@@ -23,7 +23,6 @@ infill_overlap = 0
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -38,8 +37,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
index 658e118686..15b7a619e8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
@@ -22,7 +22,6 @@ cool_min_speed = 5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
@@ -36,8 +35,6 @@ prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
-retraction_count_max = 80
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
index 78eda2718b..bedfaa177a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
@@ -18,14 +18,12 @@ material_final_print_temperature = =material_print_temperature - 5
 material_shrinkage_percentage_xy = 100.5
 material_shrinkage_percentage_z = 100.1
 retraction_combing_max_distance = 8
-skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0
 skin_overlap = 20
 speed_print = 60
 speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
-top_thickness = =0.8 if infill_sparse_density < 30 and skin_edge_support_thickness == 0.8 else top_bottom_thickness
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 speed_infill = =math.ceil(speed_print * 50 / 60)
 initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
index a9e107d887..e85891cdc8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
@@ -22,7 +22,6 @@ material_shrinkage_percentage_xy = 100.2
 material_shrinkage_percentage_z = 100.1
 prime_tower_enable = False
 retraction_prime_speed = =retraction_speed
-skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0
 skin_overlap = 20
 speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 40 / 70)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
index 5087857b86..74161daa57 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -33,7 +33,6 @@ material_shrinkage_percentage_z = 100.1
 
 prime_tower_enable = False
 retraction_prime_speed = =retraction_speed
-skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
 skin_overlap = 20
 top_bottom_thickness = 0.9
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
index 5da2b96e2d..4ee2ec2f4e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
@@ -21,9 +21,7 @@ cool_min_speed = 2.5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
-
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
@@ -37,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
index cc5a911809..bd01a9e7e6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
@@ -21,9 +21,7 @@ cool_min_speed = 2.5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
-
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
@@ -37,9 +35,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
index 82646132a0..9cc83fa123 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
@@ -21,7 +21,6 @@ cool_min_speed = 2.5
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 
 machine_min_cool_heat_time_window = 15
@@ -37,9 +36,8 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
index e102ff7ac3..535b85955a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -16,7 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 7
 jerk_print = 25
-jerk_roofing = 1
 layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index d3637ca861..48f65ed4da 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -33,7 +33,6 @@ material_shrinkage_percentage_z = 100.1
 
 prime_tower_enable = False
 retraction_prime_speed = =retraction_speed
-skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
 skin_overlap = 20
 top_bottom_thickness = 1.2
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
index 8778abc64e..dd4fe11a2c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 
 machine_min_cool_heat_time_window = 15
@@ -36,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
index 1725470319..346bb31931 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 
 machine_min_cool_heat_time_window = 15
@@ -36,9 +35,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
index 782b9d896a..e8617e309f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10
 infill_wipe_dist = 0.1
-jerk_enabled = True
 jerk_print = 25
 
 machine_min_cool_heat_time_window = 15
@@ -35,9 +34,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.8
-retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 skin_line_width = =round(line_width / 0.8, 2)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
index 1d2d0c68fd..aa86db8c84 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 10
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
index 7026544931..4bf0036315 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -26,7 +26,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 20
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
index 98c8df6a6a..69a33b38f8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -25,7 +25,7 @@ prime_tower_enable = True
 prime_tower_flow = 100
 prime_tower_min_volume = 15
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
index f6d8169fe8..9301d7d69f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index 561acf9fbc..f410bd8c85 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -29,7 +29,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index fa432061bb..3df2f2ca0e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -28,7 +28,7 @@ multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
 retract_at_layer_change = False
-retraction_count_max = 12
+retraction_count_max = 15
 retraction_extra_prime_amount = 0.5
 retraction_hop = 1.5
 retraction_hop_only_when_collides = False
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
index ef24c27b5a..b4ebe1f4e9 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
@@ -16,5 +16,6 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 20
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
index d630c3bd3a..5f14866677 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
@@ -16,6 +16,7 @@ brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 skin_overlap = 15
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
index 8d5448aafb..9e35615f14 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
@@ -15,5 +15,6 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.18
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
index cf4c07a411..b1774d2c27 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.4
 brim_replaces_support = False
 material_standby_temperature = 100
 prime_tower_enable = False
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
index e7a9936864..bd85b127a7 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ is_experimental = True
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
index 979295a38d..037e813e7f 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
@@ -15,4 +15,5 @@ variant = BB 0.8
 brim_replaces_support = False
 material_print_temperature = =default_material_print_temperature + 5
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
index ffdc9c9d26..9a8a17da20 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -14,5 +14,6 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_interface_height = 0.9
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
index 871af303ed..4229ad1758 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = BB 0.8
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
+retraction_count_max = 5
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_height = 1.2
diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt
index 3051b7c23e..33ac01743d 100644
--- a/resources/texts/change_log.txt
+++ b/resources/texts/change_log.txt
@@ -75,6 +75,7 @@ Ultimaker Cura 5.0 is now compatible with Apple M1.
 - Fixed a bug where travels would go through the model with printing PVA
 - Fixed a bug where Concentric ironing was affecting the print quality		
 - Fixed a bug where there were missing infill layers
+- Fixed AppRun permissions, contributed by probonopd
 
 * Printer definitions, profiles and materials:
 - Added Atom 3 and Atom 3 Lite printer definitions, contributed by Daniel-Kurth
diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg
index 2d59246c4a..1763fa9dfd 100644
--- a/resources/variants/ultimaker3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.25.inst.cfg
@@ -26,8 +26,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
-retraction_extrusion_window = 1
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index ead9c3b87a..a9189830ed 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -17,7 +17,6 @@ default_material_print_temperature = 200
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
@@ -34,8 +33,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = =not magic_spiralize
 retraction_amount = 6.5
-retraction_count_max = 25
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index d82cca6b01..bf9e8592d6 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -23,7 +23,6 @@ raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
 retraction_amount = 6.5
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 09706598ab..148d621a21 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -22,11 +22,7 @@ gradual_support_infill_steps = 2
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -50,8 +46,6 @@ raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
 retraction_amount = 4.5
-retraction_count_max = 15
-retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 3
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 60dfc44e8c..7465a9c802 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -15,9 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
@@ -25,8 +22,6 @@ raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
 retraction_amount = 4.5
-retraction_count_max = 20
-retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
index d6f375932e..ac7aa996c7 100644
--- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
@@ -26,8 +26,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
-retraction_extrusion_window = 1
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index df7e9486a2..e9c918a48e 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -17,7 +17,6 @@ default_material_print_temperature = 200
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
@@ -34,8 +33,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = True
 retraction_amount = 6.5
-retraction_count_max = 25
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index f95c820780..777f5a3a19 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -23,7 +23,6 @@ raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
 retraction_amount = 6.5
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index b50c9cc81b..ed95e4b44a 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -22,11 +22,7 @@ gradual_support_infill_steps = 2
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -50,8 +46,6 @@ raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
 retraction_amount = 4.5
-retraction_count_max = 15
-retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 3
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index 798685946f..7ec5df9128 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -15,9 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
@@ -25,8 +22,6 @@ raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
 retraction_amount = 4.5
-retraction_count_max = 20
-retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
index fdbd9f6d3b..14d1e3a7b8 100644
--- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
@@ -26,8 +26,7 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
-retraction_extrusion_window = 1
+
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index 237b38fa11..63cfebe329 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -17,7 +17,6 @@ default_material_print_temperature = 200
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
@@ -34,8 +33,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = =not magic_spiralize
 retraction_amount = 6.5
-retraction_count_max = 25
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg
index 181a237405..f6049f3c6d 100644
--- a/resources/variants/ultimaker_s3_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa04.inst.cfg
@@ -23,7 +23,6 @@ raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
 retraction_amount = 6.5
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
 speed_print = 70
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 56b2d3a5c3..1766d16d8f 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -21,11 +21,7 @@ gradual_support_infill_steps = 2
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -49,8 +45,6 @@ raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
 retraction_amount = 4.5
-retraction_count_max = 15
-retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 3
diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg
index 2fad997372..835c96b09e 100644
--- a/resources/variants/ultimaker_s3_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb04.inst.cfg
@@ -15,9 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
@@ -25,8 +22,6 @@ raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
 retraction_amount = 4.5
-retraction_count_max = 20
-retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg
index f83e60119b..9a5194ad15 100644
--- a/resources/variants/ultimaker_s3_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc04.inst.cfg
@@ -22,7 +22,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg
index 2563ca2c11..8a839f040e 100644
--- a/resources/variants/ultimaker_s3_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc06.inst.cfg
@@ -22,7 +22,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
index c57414f18a..edd2141acc 100644
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@@ -26,8 +26,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
-retraction_extrusion_window = 1
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index 6eb4ac8e25..5e55770225 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -34,8 +34,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = =not magic_spiralize
 retraction_amount = 6.5
-retraction_count_max = 25
-retraction_extrusion_window = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 8e4b7780f0..8453254625 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -23,7 +23,6 @@ raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
 retraction_amount = 6.5
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
 speed_print = 70
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index 0c0e162745..8811be723c 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -21,11 +21,7 @@ gradual_support_infill_steps = 2
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0
-jerk_enabled = True
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
@@ -49,8 +45,6 @@ raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
 retraction_amount = 4.5
-retraction_count_max = 15
-retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 3
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 90c19685ba..4b7c64f635 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -15,9 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
@@ -25,8 +22,6 @@ raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
 retraction_amount = 4.5
-retraction_count_max = 20
-retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg
index 356df76f2e..ac5420f127 100644
--- a/resources/variants/ultimaker_s5_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc04.inst.cfg
@@ -22,7 +22,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg
index 027274bca5..0d27f9cdce 100644
--- a/resources/variants/ultimaker_s5_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc06.inst.cfg
@@ -22,7 +22,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print