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 f8090e057c..9d67e2fadd 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
@@ -1,37 +1,95 @@
-[general]
-version = 2
-name = Draft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = draft
-material = generic_cpe_plus_ultimaker3_AA_0.4
-weight = -2
-
-[values]
-brim_width = 7
-cool_fan_speed_max = 80
-cool_min_speed = 5
-infill_wipe_dist = 0
-layer_height = 0.2
-machine_nozzle_cool_down_speed = 0.9
-machine_nozzle_heat_up_speed = 1.4
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature + 5
-prime_tower_size = 17
-retraction_combing = off
-retraction_hop = 0.2
-retraction_hop_enabled = False
-retraction_min_travel = =5
-retraction_prime_speed = =15
-speed_topbottom = =math.ceil(speed_print * 65 / 50)
-speed_wall = =math.ceil(speed_print * 50 / 50)
-speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
-support_z_distance = =layer_height
-switch_extruder_prime_speed = =15
-switch_extruder_retraction_amount = =8
-switch_extruder_retraction_speeds = 20
-wall_thickness = 1
-
+[general]
+version = 2
+name = Draft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_cpe_plus_ultimaker3_AA_0.4
+weight = -2
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = brim
+brim_width = 7
+cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+cool_fan_speed = 1
+cool_fan_speed_max = 80
+cool_min_layer_time = 5
+cool_min_speed = 5
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.2
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
+material_bed_temperature = 107
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature + 10
+material_print_temperature_layer_0 = =material_print_temperature
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 17
+prime_tower_wipe_enabled = True
+retraction_amount = 7
+retraction_combing = off
+retraction_count_max = 25
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_prime_tower = =speed_topbottom
+speed_print = 50
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = =math.ceil(speed_print * 65 / 50)
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 50 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.3 / 0.35, 2)
+wall_thickness = 1
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 a8d989fbae..bf6f3bcb55 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
@@ -1,38 +1,95 @@
-[general]
-version = 2
-name = Fast Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = fast
-material = generic_cpe_plus_ultimaker3_AA_0.4
-weight = -1
-
-[values]
-brim_width = 7
-cool_fan_speed_max = 80
-cool_min_speed = 6
-infill_wipe_dist = 0
-layer_height = 0.15
-machine_nozzle_cool_down_speed = 0.9
-machine_nozzle_heat_up_speed = 1.4
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature + 5
-prime_tower_size = 17
-retraction_combing = off
-retraction_hop = 0.2
-retraction_hop_enabled = False
-retraction_min_travel = =5
-retraction_prime_speed = =15
-speed_print = 45
-speed_topbottom = =math.ceil(speed_print * 55 / 45)
-speed_wall = =math.ceil(speed_print * 45 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
-support_z_distance = =layer_height
-switch_extruder_prime_speed = =15
-switch_extruder_retraction_amount = =8
-switch_extruder_retraction_speeds = 20
-wall_thickness = 1.3
-
+[general]
+version = 2
+name = Fast Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = fast
+material = generic_cpe_plus_ultimaker3_AA_0.4
+weight = -1
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = brim
+brim_width = 7
+cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+cool_fan_speed = 1
+cool_fan_speed_max = 80
+cool_min_layer_time = 5
+cool_min_speed = 6
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.15
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
+material_bed_temperature = 107
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature + 10
+material_print_temperature_layer_0 = =material_print_temperature
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 17
+prime_tower_wipe_enabled = True
+retraction_amount = 7
+retraction_combing = off
+retraction_count_max = 25
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_prime_tower = =speed_topbottom
+speed_print = 45
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = =math.ceil(speed_print * 55 / 45)
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 45 / 45)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.3 / 0.35, 2)
+wall_thickness = 1.3
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 5495276f1c..3a90954640 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
@@ -1,35 +1,95 @@
-[general]
-version = 2
-name = High Quality
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = high
-material = generic_cpe_plus_ultimaker3_AA_0.4
-weight = 1
-
-[values]
-brim_width = 7
-cool_min_speed = 5
-infill_wipe_dist = 0
-layer_height = 0.06
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature - 3
-prime_tower_size = 17
-retraction_combing = off
-retraction_hop = 0.2
-retraction_hop_enabled = False
-retraction_min_travel = =5
-retraction_prime_speed = =15
-speed_print = 40
-speed_topbottom = =math.ceil(speed_print * 30 / 35)
-speed_wall = =math.ceil(speed_print * 35 / 40)
-speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
-support_z_distance = =layer_height
-switch_extruder_prime_speed = =15
-switch_extruder_retraction_amount = =8
-switch_extruder_retraction_speeds = 20
-wall_thickness = 1.3
-
+[general]
+version = 2
+name = High Quality
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = high
+material = generic_cpe_plus_ultimaker3_AA_0.4
+weight = 1
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = brim
+brim_width = 7
+cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+cool_fan_speed = 1
+cool_fan_speed_max = 50
+cool_min_layer_time = 5
+cool_min_speed = 5
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.06
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 107
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature + 2
+material_print_temperature_layer_0 = =material_print_temperature
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 17
+prime_tower_wipe_enabled = True
+retraction_amount = 7
+retraction_combing = off
+retraction_count_max = 25
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_prime_tower = =speed_topbottom
+speed_print = 40
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = =math.ceil(speed_print * 30 / 35)
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 35 / 40)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.3 / 0.35, 2)
+wall_thickness = 1.3
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 d18b878a4f..b78e1aa3de 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
@@ -1,34 +1,95 @@
-[general]
-version = 2
-name = Normal Quality
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_cpe_plus_ultimaker3_AA_0.4
-weight = 0
-
-[values]
-brim_width = 7
-cool_min_speed = 7
-infill_wipe_dist = 0
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature
-prime_tower_size = 17
-retraction_combing = off
-retraction_hop = 0.2
-retraction_hop_enabled = False
-retraction_min_travel = =5
-retraction_prime_speed = =15
-speed_print = 40
-speed_topbottom = =math.ceil(speed_print * 30 / 35)
-speed_wall = =math.ceil(speed_print * 35 / 40)
-speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
-support_z_distance = =layer_height
-switch_extruder_prime_speed = =15
-switch_extruder_retraction_amount = =8
-switch_extruder_retraction_speeds = 20
-wall_thickness = 1.3
-
+[general]
+version = 2
+name = Normal Quality
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_cpe_plus_ultimaker3_AA_0.4
+weight = 0
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = brim
+brim_width = 7
+cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+cool_fan_speed = 1
+cool_fan_speed_max = 50
+cool_min_layer_time = 5
+cool_min_speed = 7
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.1
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 107
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature + 5
+material_print_temperature_layer_0 = =material_print_temperature
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 17
+prime_tower_wipe_enabled = True
+retraction_amount = 7
+retraction_combing = off
+retraction_count_max = 25
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_prime_tower = =speed_topbottom
+speed_print = 40
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = =math.ceil(speed_print * 30 / 35)
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 35 / 40)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.3 / 0.35, 2)
+wall_thickness = 1.3
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 e9370877e7..4046279f19 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
@@ -1,36 +1,113 @@
-[general]
-version = 2
-name = Draft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = draft
-material = generic_pc_ultimaker3_AA_0.4
-weight = -2
-
-[values]
-adhesion_type = raft
-cool_fan_full_at_height = =layer_height_0 + layer_height
-cool_fan_speed_max = 90
-cool_min_layer_time_fan_speed_max = 5
-cool_min_speed = 6
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
-infill_overlap_mm = 0.05
-layer_height = 0.2
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
-material_print_temperature = =default_material_print_temperature + 10
-material_print_temperature_layer_0 = =material_print_temperature + 5
-ooze_shield_angle = 40
-raft_airgap = 0.25
-raft_margin = 15
-retraction_count_max = 80
-skin_overlap = 30
-speed_layer_0 = 25
-support_interface_line_distance = 0.4
-support_interface_pattern = lines
-support_pattern = zigzag
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
-xy_offset = -0.15
-
+[general]
+version = 2
+name = Draft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_pc_ultimaker3_AA_0.4
+weight = -2
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = raft
+brim_width = 20
+cool_fan_full_at_height = =layer_height_0 + layer_height
+cool_fan_speed = 0
+cool_fan_speed_max = 90
+cool_min_layer_time = 5
+cool_min_layer_time_fan_speed_max = 5
+cool_min_speed = 6
+infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+infill_overlap = 0
+infill_overlap_mm = 0.05
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.2
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 107
+material_flow = 100
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature + 10
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+ooze_shield_dist = 2
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+raft_margin = 15
+retraction_amount = 8
+retraction_count_max = 80
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+retraction_speed = 35
+skin_overlap = 30
+speed_infill = =speed_print
+speed_layer_0 = 25
+speed_prime_tower = =speed_topbottom
+speed_print = 50
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_infill_rate = 15
+support_pattern = zigzag
+support_roof_density = 100
+support_roof_enable = False
+support_roof_line_distance = 0.4
+support_roof_pattern = lines
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+xy_offset = -0.15
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
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 cdb37b8f12..aa5d2448c3 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
@@ -1,37 +1,112 @@
-[general]
-version = 2
-name = Fast Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = fast
-material = generic_pc_ultimaker3_AA_0.4
-weight = -1
-
-[values]
-adhesion_type = raft
-cool_fan_full_at_height = =layer_height_0 + layer_height
-cool_fan_speed_max = 85
-cool_min_layer_time_fan_speed_max = 5
-cool_min_speed = 7
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
-infill_overlap = =0
-infill_overlap_mm = 0.05
-layer_height = 0.15
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature + 10
-material_print_temperature_layer_0 = =material_print_temperature + 5
-ooze_shield_angle = 40
-raft_airgap = 0.25
-raft_margin = 15
-retraction_count_max = 80
-skin_overlap = 30
-speed_layer_0 = 25
-support_interface_line_distance = 0.4
-support_interface_pattern = lines
-support_pattern = zigzag
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
-xy_offset = -0.15
-
+[general]
+version = 2
+name = Fast Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = fast
+material = generic_pc_ultimaker3_AA_0.4
+weight = -1
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = raft
+brim_width = 20
+cool_fan_full_at_height = =layer_height_0 + layer_height
+cool_fan_speed = 0
+cool_fan_speed_max = 85
+cool_min_layer_time = 5
+cool_min_layer_time_fan_speed_max = 5
+cool_min_speed = 7
+infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+infill_overlap_mm = 0.05
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.15
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 107
+material_flow = 100
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature + 10
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+ooze_shield_dist = 2
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+raft_margin = 15
+retraction_amount = 8
+retraction_count_max = 80
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+retraction_speed = 35
+skin_overlap = 30
+speed_infill = =speed_print
+speed_layer_0 = 25
+speed_prime_tower = =speed_topbottom
+speed_print = 50
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_infill_rate = 15
+support_pattern = zigzag
+support_roof_density = 100
+support_roof_enable = False
+support_roof_line_distance = 0.4
+support_roof_pattern = lines
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+xy_offset = -0.15
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
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 f5e91fa71b..f770e06c2f 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
@@ -1,35 +1,114 @@
-[general]
-version = 2
-name = High Quality
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = high
-material = generic_pc_ultimaker3_AA_0.4
-weight = 1
-
-[values]
-adhesion_type = raft
-cool_fan_full_at_height = =layer_height_0 + layer_height
-cool_min_layer_time_fan_speed_max = 5
-cool_min_speed = 8
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
-infill_overlap_mm = 0.05
-layer_height = 0.06
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature - 10
-material_print_temperature_layer_0 = =material_print_temperature + 5
-ooze_shield_angle = 40
-raft_airgap = 0.25
-raft_margin = 15
-retraction_count_max = 80
-skin_overlap = 30
-speed_layer_0 = 25
-support_interface_line_distance = 0.4
-support_interface_pattern = lines
-support_pattern = zigzag
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
-xy_offset = -0.15
-
+[general]
+version = 2
+name = High Quality
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = high
+material = generic_pc_ultimaker3_AA_0.4
+weight = 1
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = raft
+brim_width = 20
+cool_fan_full_at_height = =layer_height_0 + layer_height
+cool_fan_speed = 0
+cool_fan_speed_max = 50
+cool_min_layer_time = 5
+cool_min_layer_time_fan_speed_max = 5
+cool_min_speed = 8
+infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+infill_overlap = 0
+infill_overlap_mm = 0.05
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.06
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 107
+material_flow = 100
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature - 10
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+ooze_shield_dist = 2
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+raft_margin = 15
+retraction_amount = 8
+retraction_count_max = 80
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+retraction_speed = 35
+skin_overlap = 30
+speed_infill = =speed_print
+speed_layer_0 = 25
+speed_prime_tower = =speed_topbottom
+speed_print = 50
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_infill_rate = 15
+support_pattern = zigzag
+support_roof_density = 100
+support_roof_enable = False
+support_roof_line_distance = 0.4
+support_roof_pattern = lines
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+xy_offset = -0.15
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
+
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 d391e9df4f..2b66d22ab5 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
@@ -1,34 +1,113 @@
-[general]
-version = 2
-name = Normal Quality
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_pc_ultimaker3_AA_0.4
-weight = 0
-
-[values]
-adhesion_type = raft
-cool_fan_full_at_height = =layer_height_0 + layer_height
-cool_min_layer_time_fan_speed_max = 5
-cool_min_speed = 5
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
-infill_overlap_mm = 0.05
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature
-material_print_temperature_layer_0 = =material_print_temperature + 5
-ooze_shield_angle = 40
-raft_airgap = 0.25
-raft_margin = 15
-retraction_count_max = 80
-skin_overlap = 30
-speed_layer_0 = 25
-support_interface_line_distance = 0.4
-support_interface_pattern = lines
-support_pattern = zigzag
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
-xy_offset = -0.15
-
+[general]
+version = 2
+name = Normal Quality
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_pc_ultimaker3_AA_0.4
+weight = 0
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = raft
+brim_width = 20
+cool_fan_full_at_height = =layer_height_0 + layer_height
+cool_fan_speed = 0
+cool_fan_speed_max = 50
+cool_min_layer_time = 5
+cool_min_layer_time_fan_speed_max = 5
+cool_min_speed = 5
+infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+infill_overlap = 0
+infill_overlap_mm = 0.05
+infill_pattern = triangles
+infill_sparse_density = 20
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.1
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.875
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 107
+material_flow = 100
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+ooze_shield_dist = 2
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+raft_margin = 15
+retraction_amount = 8
+retraction_count_max = 80
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+retraction_speed = 35
+skin_overlap = 30
+speed_infill = =speed_print
+speed_layer_0 = 25
+speed_prime_tower = =speed_topbottom
+speed_print = 50
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+speed_wall_x = =speed_wall
+support_angle = 60
+support_bottom_distance = =support_z_distance
+support_infill_rate = 15
+support_pattern = zigzag
+support_roof_density = 100
+support_roof_enable = False
+support_roof_line_distance = 0.4
+support_roof_pattern = lines
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 1.2
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+xy_offset = -0.15
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
\ No newline at end of file
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 03ea216f32..8f9c1c5af1 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
@@ -1,43 +1,106 @@
-[general]
-version = 2
-name = Draft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = draft
-material = generic_tpu_ultimaker3_AA_0.4
-weight = -2
-
-[values]
-brim_width = 8.75
-cool_fan_speed_max = 100
-cool_min_layer_time_fan_speed_max = 6
-gradual_infill_step_height = =5 * layer_height
-gradual_infill_steps = 4
-infill_line_width = =round(line_width * 0.38 / 0.38, 2)
-infill_pattern = tetrahedral
-infill_sparse_density = 96
-layer_height = 0.2
-line_width = =machine_nozzle_size * 0.95
-material_final_print_temperature = =material_print_temperature - 10
-material_flow = 106
-material_initial_print_temperature = =material_print_temperature - 5
-material_print_temperature = =default_material_print_temperature + 2
-material_print_temperature_layer_0 = =material_print_temperature
-retraction_count_max = 12
-retraction_extra_prime_amount = 0.8
-skin_overlap = 15
-speed_equalize_flow_enabled = True
-speed_layer_0 = 18
-speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-speed_travel = 300
-speed_wall = =math.ceil(speed_print * 25 / 25)
-speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
-support_angle = 50
-support_bottom_distance = =support_z_distance / 2
-top_bottom_thickness = 0.7
-wall_line_width_x = =line_width
-wall_thickness = 0.76
-
+[general]
+version = 2
+name = Draft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_tpu_ultimaker3_AA_0.4
+weight = -2
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = brim
+brim_width = 8.75
+cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+cool_fan_speed = 20
+cool_fan_speed_max = 100
+cool_min_layer_time = 5
+cool_min_layer_time_fan_speed_max = 6
+cool_min_speed = 4
+gradual_infill_step_height = =5 * layer_height
+gradual_infill_steps = 4
+infill_line_width = =round(line_width * 0.38 / 0.38, 2)
+infill_overlap = 0
+infill_pattern = tetrahedral
+infill_sparse_density = 96
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.2
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.95
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 0
+material_final_print_temperature = =material_print_temperature - 10
+material_flow = 106
+material_initial_print_temperature = =material_print_temperature - 5
+material_print_temperature = =default_material_print_temperature + 2
+material_print_temperature_layer_0 = =default_material_print_temperature + 2
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+retraction_amount = 6.5
+retraction_count_max = 12
+retraction_extra_prime_amount = 0.8
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+retraction_speed = 35
+skin_overlap = 15
+speed_equalize_flow_enabled = True
+speed_infill = =speed_print
+speed_layer_0 = 18
+speed_prime_tower = =speed_topbottom
+speed_print = 25
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = =math.ceil(speed_print * 25 / 25)
+speed_travel = 300
+speed_wall = =math.ceil(speed_print * 25 / 25)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
+speed_wall_x = =speed_wall
+support_angle = 50
+support_bottom_distance = =support_z_distance / 2
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 0.7
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+wall_0_inset = 0
+wall_line_width_x = =line_width
+wall_thickness = 0.76
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 b29483a44f..46c6ec88d8 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
@@ -1,44 +1,106 @@
-[general]
-version = 2
-name = Fast Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = fast
-material = generic_tpu_ultimaker3_AA_0.4
-weight = -1
-
-[values]
-brim_width = 8.75
-cool_fan_speed_max = 100
-cool_min_layer_time_fan_speed_max = 6
-gradual_infill_step_height = =5 * layer_height
-gradual_infill_steps = 4
-infill_line_width = =round(line_width * 0.38 / 0.38, 2)
-infill_pattern = tetrahedral
-infill_sparse_density = 96
-layer_height = 0.15
-line_width = =machine_nozzle_size * 0.95
-material_final_print_temperature = =material_print_temperature - 10
-material_flow = 106
-material_initial_print_temperature = =material_print_temperature - 5
-material_print_temperature = =default_material_print_temperature + 2
-material_print_temperature_layer_0 = =material_print_temperature
-retraction_amount = 7
-retraction_count_max = 12
-retraction_extra_prime_amount = 0.8
-skin_overlap = 15
-speed_equalize_flow_enabled = True
-speed_layer_0 = 18
-speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-speed_travel = 300
-speed_wall = =math.ceil(speed_print * 25 / 25)
-speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
-support_angle = 50
-support_bottom_distance = =support_z_distance / 2
-top_bottom_thickness = 0.7
-wall_line_width_x = =line_width
-wall_thickness = 0.76
-
+[general]
+version = 2
+name = Fast Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = fast
+material = generic_tpu_ultimaker3_AA_0.4
+weight = -1
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = brim
+brim_width = 8.75
+cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+cool_fan_speed = 20
+cool_fan_speed_max = 100
+cool_min_layer_time = 5
+cool_min_layer_time_fan_speed_max = 6
+cool_min_speed = 4
+gradual_infill_step_height = =5 * layer_height
+gradual_infill_steps = 4
+infill_line_width = =round(line_width * 0.38 / 0.38, 2)
+infill_overlap = 0
+infill_pattern = tetrahedral
+infill_sparse_density = 96
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.15
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.95
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 0
+material_final_print_temperature = =material_print_temperature - 10
+material_flow = 106
+material_initial_print_temperature = =material_print_temperature - 5
+material_print_temperature = =default_material_print_temperature + 2
+material_print_temperature_layer_0 = =default_material_print_temperature + 2
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+retraction_amount = 7
+retraction_count_max = 12
+retraction_extra_prime_amount = 0.8
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+retraction_speed = 35
+skin_overlap = 15
+speed_equalize_flow_enabled = True
+speed_infill = =speed_print
+speed_layer_0 = 18
+speed_prime_tower = =speed_topbottom
+speed_print = 25
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = =math.ceil(speed_print * 25 / 25)
+speed_travel = 300
+speed_wall = =math.ceil(speed_print * 25 / 25)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
+speed_wall_x = =speed_wall
+support_angle = 50
+support_bottom_distance = =support_z_distance / 2
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 0.7
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+wall_0_inset = 0
+wall_line_width_x = =line_width
+wall_thickness = 0.76
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 99bd3a90da..ae91b6f19d 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
@@ -1,42 +1,106 @@
-[general]
-version = 2
-name = Normal Quality
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_tpu_ultimaker3_AA_0.4
-weight = 0
-
-[values]
-brim_width = 8.75
-cool_fan_speed_max = 100
-cool_min_layer_time_fan_speed_max = 6
-gradual_infill_step_height = =5 * layer_height
-gradual_infill_steps = 4
-infill_line_width = =round(line_width * 0.38 / 0.38, 2)
-infill_pattern = tetrahedral
-infill_sparse_density = 96
-line_width = =machine_nozzle_size * 0.95
-material_final_print_temperature = =material_print_temperature - 10
-material_flow = 106
-material_initial_print_temperature = =material_print_temperature - 10
-material_print_temperature = =default_material_print_temperature
-material_print_temperature_layer_0 = =material_print_temperature
-retraction_count_max = 12
-retraction_extra_prime_amount = 0.8
-skin_overlap = 15
-speed_equalize_flow_enabled = True
-speed_layer_0 = 18
-speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-speed_travel = 300
-speed_wall = =math.ceil(speed_print * 25 / 25)
-speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
-support_angle = 50
-support_bottom_distance = =support_z_distance / 2
-top_bottom_thickness = 0.7
-wall_line_width_x = =line_width
-wall_thickness = 0.76
-
+[general]
+version = 2
+name = Normal Quality
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_tpu_ultimaker3_AA_0.4
+weight = 0
+
+[values]
+acceleration_enabled = True
+acceleration_infill = =acceleration_print
+acceleration_layer_0 = =acceleration_topbottom
+acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_print = 4000
+acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
+acceleration_support_infill = =acceleration_support
+acceleration_support_interface = =acceleration_topbottom
+acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
+acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
+acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
+acceleration_wall_x = =acceleration_wall
+adhesion_type = brim
+brim_width = 8.75
+cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+cool_fan_speed = 20
+cool_fan_speed_max = 100
+cool_min_layer_time = 5
+cool_min_layer_time_fan_speed_max = 6
+cool_min_speed = 4
+gradual_infill_step_height = =5 * layer_height
+gradual_infill_steps = 4
+infill_line_width = =round(line_width * 0.38 / 0.38, 2)
+infill_overlap = 0
+infill_pattern = tetrahedral
+infill_sparse_density = 96
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_infill = =jerk_print
+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_infill = =jerk_support
+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)
+jerk_wall_x = =jerk_wall
+layer_height = 0.1
+layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size * 0.95
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 0
+material_final_print_temperature = =material_print_temperature - 10
+material_flow = 106
+material_initial_print_temperature = =material_print_temperature - 10
+material_print_temperature = =default_material_print_temperature
+material_print_temperature_layer_0 = =default_material_print_temperature
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+retraction_amount = 6.5
+retraction_count_max = 12
+retraction_extra_prime_amount = 0.8
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_enabled = True
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+retraction_speed = 35
+skin_overlap = 15
+speed_equalize_flow_enabled = True
+speed_infill = =speed_print
+speed_layer_0 = 18
+speed_prime_tower = =speed_topbottom
+speed_print = 25
+speed_support = =speed_wall_0
+speed_support_interface = =speed_topbottom
+speed_topbottom = =math.ceil(speed_print * 25 / 25)
+speed_travel = 300
+speed_wall = =math.ceil(speed_print * 25 / 25)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
+speed_wall_x = =speed_wall
+support_angle = 50
+support_bottom_distance = =support_z_distance / 2
+support_top_distance = =support_z_distance
+support_xy_distance = =wall_line_width_0 * 2.5
+support_xy_distance_overhang = =wall_line_width_0
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 0.7
+travel_avoid_distance = 3
+travel_compensate_overlapping_walls_enabled = True
+wall_0_inset = 0
+wall_line_width_x = =line_width
+wall_thickness = 0.76