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 9d67e2fadd..ee03b6dbcf 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,95 +1,50 @@
-[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
+[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_print = 4000
+cool_fan_speed_max = 80
+cool_min_speed = 5
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = triangles
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_print = 25
+layer_height = 0.2
+machine_min_cool_heat_time_window = 15
+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
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 17
+prime_tower_wipe_enabled = True
+retraction_combing = off
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_layer_0 = 20
+speed_print = 50
+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)
+support_bottom_distance = =support_z_distance
+support_z_distance = =layer_height
+travel_avoid_distance = 3
+wall_0_inset = 0
+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 bf6f3bcb55..b61a7ee9de 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,95 +1,49 @@
-[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
+[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_print = 4000
+cool_fan_speed_max = 80
+cool_min_speed = 6
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = triangles
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_print = 25
+layer_height = 0.15
+machine_min_cool_heat_time_window = 15
+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
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+prime_tower_enable = True
+prime_tower_size = 17
+prime_tower_wipe_enabled = True
+retraction_combing = off
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_layer_0 = 20
+speed_print = 45
+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)
+support_bottom_distance = =support_z_distance
+support_z_distance = =layer_height
+travel_avoid_distance = 3
+wall_0_inset = 0
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 3a90954640..1507de5a6b 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,95 +1,51 @@
-[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
+[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_print = 4000
+cool_fan_speed_max = 50
+cool_min_speed = 5
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = triangles
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_print = 25
+layer_height = 0.06
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_final_print_temperature = =material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 5
+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_combing = off
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_layer_0 = 20
+speed_print = 40
+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)
+support_bottom_distance = =support_z_distance
+support_z_distance = =layer_height
+travel_avoid_distance = 3
+wall_0_inset = 0
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 b78e1aa3de..88090b12cd 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,95 +1,50 @@
-[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
+[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_print = 4000
+cool_fan_speed_max = 50
+cool_min_speed = 7
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_pattern = 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
+machine_nozzle_heat_up_speed = 1.5
+material_final_print_temperature = =material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 5
+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_combing = off
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_layer_0 = 20
+speed_print = 40
+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)
+support_bottom_distance = =support_z_distance
+support_z_distance = =layer_height
+travel_avoid_distance = 3
+wall_0_inset = 0
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 4046279f19..11dad72e08 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,113 +1,66 @@
-[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
+[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_print = 4000
+adhesion_type = raft
+brim_width = 20
+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 = 0
+infill_overlap_mm = 0.05
+infill_pattern = triangles
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_print = 25
+layer_height = 0.2
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+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_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+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
+skin_overlap = 30
+speed_layer_0 = 25
+speed_print = 50
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+support_bottom_distance = =support_z_distance
+support_interface_line_distance = 0.4
+support_interface_pattern = lines
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+travel_avoid_distance = 3
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
+xy_offset = -0.15
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 aa5d2448c3..39b02f392d 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,112 +1,65 @@
-[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
+[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_print = 4000
+adhesion_type = raft
+brim_width = 20
+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_mm = 0.05
+infill_pattern = triangles
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_print = 25
+layer_height = 0.15
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+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_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+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
+skin_overlap = 30
+speed_layer_0 = 25
+speed_print = 50
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+support_bottom_distance = =support_z_distance
+support_interface_line_distance = 0.4
+support_interface_pattern = lines
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+travel_avoid_distance = 3
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
+xy_offset = -0.15
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 f770e06c2f..ab8a520b5b 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,114 +1,66 @@
-[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
-
+[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_print = 4000
+adhesion_type = raft
+brim_width = 20
+cool_fan_full_at_height = =layer_height_0 + layer_height
+cool_fan_speed_max = 50
+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_wipe_dist = 0.1
+jerk_enabled = True
+jerk_print = 25
+layer_height = 0.06
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+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_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+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
+skin_overlap = 30
+speed_layer_0 = 25
+speed_print = 50
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+support_bottom_distance = =support_z_distance
+support_interface_line_distance = 0.4
+support_interface_pattern = lines
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+travel_avoid_distance = 3
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
+xy_offset = -0.15
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 2b66d22ab5..6d92720ae4 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,113 +1,64 @@
-[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
+[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_print = 4000
+adhesion_type = raft
+brim_width = 20
+cool_fan_full_at_height = =layer_height_0 + layer_height
+cool_fan_speed_max = 50
+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_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
+material_final_print_temperature = =material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+prime_tower_enable = True
+prime_tower_size = 16
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+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
+skin_overlap = 30
+speed_layer_0 = 25
+speed_print = 50
+speed_topbottom = 25
+speed_travel = 250
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+support_bottom_distance = =support_z_distance
+support_interface_line_distance = 0.4
+support_interface_pattern = lines
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+travel_avoid_distance = 3
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
+xy_offset = -0.15
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 8f9c1c5af1..1787b266e2 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,106 +1,66 @@
-[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
+[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_print = 4000
+brim_width = 8.75
+cool_fan_speed_max = 100
+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_print = 25
+layer_height = 0.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_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_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
+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
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 0.7
+travel_avoid_distance = 3
+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 46c6ec88d8..f53d3fd285 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,106 +1,67 @@
-[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
+[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_print = 4000
+brim_width = 8.75
+cool_fan_speed_max = 100
+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_print = 25
+layer_height = 0.15
+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_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
+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
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 0.7
+travel_avoid_distance = 3
+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 ae91b6f19d..0b475eda92 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,106 +1,64 @@
-[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
+[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_print = 4000
+brim_width = 8.75
+cool_fan_speed_max = 100
+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_print = 25
+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_final_print_temperature = =material_print_temperature - 10
+material_flow = 106
+material_initial_print_temperature = =material_print_temperature - 10
+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_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
+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
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+top_bottom_thickness = 0.7
+travel_avoid_distance = 3
+wall_0_inset = 0
+wall_line_width_x = =line_width
+wall_thickness = 0.76
diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg
index 1cb122147f..7fb96d0cea 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg
@@ -1,96 +1,19 @@
-[general]
-version = 2
-name = Draft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = draft
-material = generic_abs_ultimaker3_AA_0.8
-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 = 7
-cool_fan_speed_max = 100
-cool_min_layer_time = 5
-cool_min_speed = 5
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 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 * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
-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 = 90
-material_print_temperature = =default_material_print_temperature + 25
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_standby_temperature = 100
-multiple_mesh_overlap = 0
-prime_tower_enable = False
-prime_tower_size = 16
-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_enabled = True
-retraction_hop_only_when_collides = True
-skin_overlap = 5
-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 * 30 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
-speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-speed_wall_x = =speed_wall
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-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_retraction_amount = 16.5
-top_bottom_thickness = 1.4
-travel_avoid_distance = 3
-travel_compensate_overlapping_walls_enabled = True
-wall_0_inset = 0
-wall_line_width_x = =wall_line_width
-wall_thickness = 2
+[general]
+version = 2
+name = Draft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_abs_ultimaker3_AA_0.8
+weight = -2
+
+[values]
+line_width = =machine_nozzle_size * 0.875
+material_print_temperature = =default_material_print_temperature + 25
+material_standby_temperature = 100
+speed_print = 50
+speed_topbottom = =math.ceil(speed_print * 30 / 50)
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
index b87cfde214..63f27c180d 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -1,96 +1,20 @@
-[general]
-version = 2
-name = Superdraft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_abs_ultimaker3_AA_0.8
-weight = -4
-
-[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 = 7
-cool_fan_speed_max = 100
-cool_min_layer_time = 5
-cool_min_speed = 5
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 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 * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
-jerk_wall_x = =jerk_wall
-layer_height = 0.4
-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 = 90
-material_print_temperature = =default_material_print_temperature + 30
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_standby_temperature = 100
-multiple_mesh_overlap = 0
-prime_tower_enable = False
-prime_tower_size = 16
-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_enabled = True
-retraction_hop_only_when_collides = True
-skin_overlap = 5
-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 * 30 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
-speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-speed_wall_x = =speed_wall
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-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_retraction_amount = 16.5
-top_bottom_thickness = 1.4
-travel_avoid_distance = 3
-travel_compensate_overlapping_walls_enabled = True
-wall_0_inset = 0
-wall_line_width_x = =wall_line_width
-wall_thickness = 2
+[general]
+version = 2
+name = Superdraft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = superdraft
+material = generic_abs_ultimaker3_AA_0.8
+weight = -4
+
+[values]
+layer_height = 0.4
+line_width = =machine_nozzle_size * 0.875
+material_print_temperature = =default_material_print_temperature + 30
+material_standby_temperature = 100
+speed_print = 50
+speed_topbottom = =math.ceil(speed_print * 30 / 50)
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg
index d0f16f784e..1eeb95fcd2 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg
@@ -1,96 +1,20 @@
-[general]
-version = 2
-name = Verydraft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = verydraft
-material = generic_abs_ultimaker3_AA_0.8
-weight = -3
-
-[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 = 7
-cool_fan_speed_max = 100
-cool_min_layer_time = 5
-cool_min_speed = 5
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 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 * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
-jerk_wall_x = =jerk_wall
-layer_height = 0.3
-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 = 90
-material_print_temperature = =default_material_print_temperature + 27
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_standby_temperature = 100
-multiple_mesh_overlap = 0
-prime_tower_enable = False
-prime_tower_size = 16
-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_enabled = True
-retraction_hop_only_when_collides = True
-skin_overlap = 5
-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 * 30 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
-speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-speed_wall_x = =speed_wall
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-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_retraction_amount = 16.5
-top_bottom_thickness = 1.4
-travel_avoid_distance = 3
-travel_compensate_overlapping_walls_enabled = True
-wall_0_inset = 0
-wall_line_width_x = =wall_line_width
-wall_thickness = 2
+[general]
+version = 2
+name = Verydraft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = verydraft
+material = generic_abs_ultimaker3_AA_0.8
+weight = -3
+
+[values]
+layer_height = 0.3
+line_width = =machine_nozzle_size * 0.875
+material_print_temperature = =default_material_print_temperature + 27
+material_standby_temperature = 100
+speed_print = 50
+speed_topbottom = =math.ceil(speed_print * 30 / 50)
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
index 5f46b97486..dbee576a94 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
@@ -1,96 +1,19 @@
-[general]
-version = 2
-name = Draft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = draft
-material = generic_cpe_ultimaker3_AA_0.8
-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 = 15
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
-cool_fan_speed = 7
-cool_fan_speed_max = 100
-cool_min_layer_time = 5
-cool_min_speed = 5
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 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 * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
-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 = 80
-material_print_temperature = =default_material_print_temperature + 15
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_standby_temperature = 100
-multiple_mesh_overlap = 0
-prime_tower_enable = False
-prime_tower_size = 16
-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_enabled = True
-retraction_hop_only_when_collides = True
-skin_overlap = 5
-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 * 25 / 40)
-speed_wall = =math.ceil(speed_print * 30 / 40)
-speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
-speed_wall_x = =speed_wall
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-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_retraction_amount = 16.5
-top_bottom_thickness = 1.4
-travel_avoid_distance = 3
-travel_compensate_overlapping_walls_enabled = True
-wall_0_inset = 0
-wall_line_width_x = =wall_line_width
-wall_thickness = 2
\ No newline at end of file
+[general]
+version = 2
+name = Draft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_cpe_ultimaker3_AA_0.8
+weight = -2
+
+[values]
+brim_width = 15
+line_width = =machine_nozzle_size * 0.875
+material_print_temperature = =default_material_print_temperature + 15
+material_standby_temperature = 100
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 25 / 40)
+speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
index fbb091c651..9aa8b69381 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -1,96 +1,21 @@
-[general]
-version = 2
-name = Superdraft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_cpe_ultimaker3_AA_0.8
-weight = -4
-
-[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 = 15
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
-cool_fan_speed = 7
-cool_fan_speed_max = 100
-cool_min_layer_time = 5
-cool_min_speed = 5
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 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 * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
-jerk_wall_x = =jerk_wall
-layer_height = 0.4
-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 = 80
-material_print_temperature = =default_material_print_temperature + 20
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_standby_temperature = 100
-multiple_mesh_overlap = 0
-prime_tower_enable = False
-prime_tower_size = 16
-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_enabled = True
-retraction_hop_only_when_collides = True
-skin_overlap = 5
-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 * 30 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-speed_wall_x = =speed_wall
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-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_retraction_amount = 16.5
-top_bottom_thickness = 1.4
-travel_avoid_distance = 3
-travel_compensate_overlapping_walls_enabled = True
-wall_0_inset = 0
-wall_line_width_x = =wall_line_width
-wall_thickness = 2
\ No newline at end of file
+[general]
+version = 2
+name = Superdraft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = superdraft
+material = generic_cpe_ultimaker3_AA_0.8
+weight = -2
+
+[values]
+brim_width = 15
+layer_height = 0.4
+line_width = =machine_nozzle_size * 0.875
+material_print_temperature = =default_material_print_temperature + 20
+material_standby_temperature = 100
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 30 / 45)
+speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
index 75b164735d..3f897c91d3 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -1,96 +1,20 @@
-[general]
-version = 2
-name = Verydraft Print
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = verydraft
-material = generic_cpe_ultimaker3_AA_0.8
-weight = -3
-
-[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 = 15
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
-cool_fan_speed = 7
-cool_fan_speed_max = 100
-cool_min_layer_time = 5
-cool_min_speed = 5
-infill_before_walls = False
-infill_line_width = =round(line_width * 0.6 / 0.7, 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 * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
-jerk_wall_x = =jerk_wall
-layer_height = 0.3
-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 = 80
-material_print_temperature = =default_material_print_temperature + 17
-material_initial_print_temperature = =material_print_temperature - 5
-material_final_print_temperature = =material_print_temperature - 10
-material_standby_temperature = 100
-multiple_mesh_overlap = 0
-prime_tower_enable = False
-prime_tower_size = 16
-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_enabled = True
-retraction_hop_only_when_collides = True
-skin_overlap = 5
-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 * 25 / 40)
-speed_wall = =math.ceil(speed_print * 30 / 40)
-speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
-speed_wall_x = =speed_wall
-support_angle = 60
-support_bottom_distance = =support_z_distance / 2
-support_pattern = zigzag
-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_retraction_amount = 16.5
-top_bottom_thickness = 1.4
-travel_avoid_distance = 3
-travel_compensate_overlapping_walls_enabled = True
-wall_0_inset = 0
-wall_line_width_x = =wall_line_width
-wall_thickness = 2
\ No newline at end of file
+[general]
+version = 2
+name = Verydraft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = verydraft
+material = generic_cpe_ultimaker3_AA_0.8
+weight = -2
+
+[values]
+brim_width = 15
+layer_height = 0.3
+line_width = =machine_nozzle_size * 0.875
+material_print_temperature = =default_material_print_temperature + 17
+material_standby_temperature = 100
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 25 / 40)
+speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
index eb69e804c0..82bdcea44b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -10,17 +10,24 @@ material = generic_nylon_ultimaker3_AA_0.8
 weight = -2
 
 [values]
-brim_width = 8.0
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+brim_width = 3
 cool_min_layer_time_fan_speed_max = 20
+cool_min_speed = 10
 infill_before_walls = True
-infill_pattern = triangles
+infill_line_width = =line_width
 machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
+ooze_shield_angle = 40
+prime_tower_size = 15
+raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
+raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
+support_angle = 70
+support_line_width = =line_width * 0.75
+support_xy_distance = =wall_line_width_0 * 1.5
+switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
-
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 4a226996b3..99b433def1 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -7,21 +7,28 @@ definition = ultimaker3
 type = quality
 quality_type = superdraft
 material = generic_nylon_ultimaker3_AA_0.8
-weight = -2
+weight = -4
 
 [values]
-brim_width = 8.0
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+brim_width = 3
 cool_min_layer_time_fan_speed_max = 20
+cool_min_speed = 10
 infill_before_walls = True
-infill_pattern = triangles
+infill_line_width = =line_width
 layer_height = 0.4
 machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
+ooze_shield_angle = 40
+prime_tower_size = 15
+raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
+raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
+support_angle = 70
+support_line_width = =line_width * 0.75
+support_xy_distance = =wall_line_width_0 * 1.5
+switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
-
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 444aac8eda..6f41e231c5 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -7,21 +7,28 @@ definition = ultimaker3
 type = quality
 quality_type = verydraft
 material = generic_nylon_ultimaker3_AA_0.8
-weight = -2
+weight = -3
 
 [values]
-brim_width = 8.0
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
+brim_width = 3
 cool_min_layer_time_fan_speed_max = 20
+cool_min_speed = 10
 infill_before_walls = True
-infill_pattern = triangles
+infill_line_width = =line_width
 layer_height = 0.3
 machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
+ooze_shield_angle = 40
+prime_tower_size = 15
+raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
+raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
+support_angle = 70
+support_line_width = =line_width * 0.75
+support_xy_distance = =wall_line_width_0 * 1.5
+switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
-
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
index 74f7f47a4d..b9222d6350 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
@@ -7,28 +7,30 @@ definition = ultimaker3
 type = quality
 quality_type = draft
 material = generic_pla_ultimaker3_AA_0.8
-weight = 0
+weight = -2
 
 [values]
-brim_line_count = =math.ceil(brim_width / skirt_brim_line_width)
-cool_fan_speed_max = =cool_fan_speed
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
 gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.535 / 0.75, 2)
+infill_pattern = cubic
 infill_sparse_density = 80
 line_width = =machine_nozzle_size * 0.9375
+machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
-ooze_shield_angle = 60
-raft_acceleration = =acceleration_print
-raft_jerk = =jerk_print
-raft_margin = 15
-switch_extruder_prime_speed = =switch_extruder_retraction_speeds
+prime_tower_size = 15
+support_angle = 70
+support_line_width = =line_width * 0.75
+support_pattern = ='triangles'
+support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4
 wall_line_width = =round(line_width * 0.75 / 0.75, 2)
+wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
 wall_thickness = =wall_line_width_0 + wall_line_width_x
-
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
index 4702d382c7..852ff52f6d 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -7,29 +7,31 @@ definition = ultimaker3
 type = quality
 quality_type = superdraft
 material = generic_pla_ultimaker3_AA_0.8
-weight = 1
+weight = -4
 
 [values]
-brim_line_count = =math.ceil(brim_width / skirt_brim_line_width)
-cool_fan_speed_max = =cool_fan_speed
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
 gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.535 / 0.75, 2)
+infill_pattern = cubic
 infill_sparse_density = 80
 layer_height = 0.4
 line_width = =machine_nozzle_size * 0.9375
+machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 15
 material_standby_temperature = 100
-ooze_shield_angle = 60
-raft_acceleration = =acceleration_print
-raft_jerk = =jerk_print
-raft_margin = 15
-switch_extruder_prime_speed = =switch_extruder_retraction_speeds
+prime_tower_size = 15
+support_angle = 70
+support_line_width = =line_width * 0.75
+support_pattern = ='triangles'
+support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4
 wall_line_width = =round(line_width * 0.75 / 0.75, 2)
+wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
 wall_thickness = =wall_line_width_0 + wall_line_width_x
-
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
index 174882aa68..af18a87a20 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -7,29 +7,31 @@ definition = ultimaker3
 type = quality
 quality_type = verydraft
 material = generic_pla_ultimaker3_AA_0.8
-weight = 1
+weight = -3
 
 [values]
-brim_line_count = =math.ceil(brim_width / skirt_brim_line_width)
-cool_fan_speed_max = =cool_fan_speed
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
 gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.535 / 0.75, 2)
+infill_pattern = cubic
 infill_sparse_density = 80
 layer_height = 0.3
 line_width = =machine_nozzle_size * 0.9375
+machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
-ooze_shield_angle = 60
-raft_acceleration = =acceleration_print
-raft_jerk = =jerk_print
-raft_margin = 15
-switch_extruder_prime_speed = =switch_extruder_retraction_speeds
+prime_tower_size = 15
+support_angle = 70
+support_line_width = =line_width * 0.75
+support_pattern = ='triangles'
+support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4
 wall_line_width = =round(line_width * 0.75 / 0.75, 2)
+wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
 wall_thickness = =wall_line_width_0 + wall_line_width_x
-
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Normal_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Normal_Print.inst.cfg
new file mode 100644
index 0000000000..3f3eeb145e
--- /dev/null
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Normal_Print.inst.cfg
@@ -0,0 +1,62 @@
+[general]
+version = 2
+name = Draft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_tpu_ultimaker3_AA_0.8
+weight = -2
+
+[values]
+brim_width = 8.75
+cool_min_layer_time_fan_speed_max = 6
+expand_skins_expand_distance = =line_width * 2
+expand_skins_into_infill = True
+expand_upper_skins = True
+gradual_infill_step_height = =4 * layer_height
+gradual_infill_steps = 5
+infill_before_walls = True
+infill_line_width = =round(line_width * 0.7 / 0.8, 2)
+infill_pattern = tetrahedral
+infill_sparse_density = 80
+jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
+jerk_support = =math.ceil(jerk_print * 25 / 25)
+jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+material_bed_temperature_layer_0 = 0
+material_flow = 105
+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.2
+prime_tower_enable = True
+prime_tower_flow = 100
+prime_tower_wall_thickness = =prime_tower_line_width * 2
+retract_at_layer_change = False
+retraction_count_max = 12
+retraction_extra_prime_amount = 0.5
+retraction_hop = 0.5
+retraction_hop_only_when_collides = False
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+skin_line_width = =round(line_width * 0.78 / 0.8, 2)
+skin_overlap = 15
+speed_print = 30
+speed_topbottom = =math.ceil(speed_print * 25 / 30)
+speed_travel = 300
+speed_wall = =math.ceil(speed_print * 30 / 30)
+speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+support_angle = 50
+support_bottom_distance = =support_z_distance
+support_line_width = =round(line_width * 0.7 / 0.8, 2)
+support_offset = =line_width
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 45
+top_bottom_thickness = 1.2
+travel_compensate_overlapping_walls_0_enabled = False
+wall_0_wipe_dist = =line_width * 2
+wall_line_width_x = =round(line_width * 0.6 / 0.8, 2)
+wall_thickness = 1.3
+
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
new file mode 100644
index 0000000000..38930d1507
--- /dev/null
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -0,0 +1,63 @@
+[general]
+version = 2
+name = Superdraft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = superdraft
+material = generic_tpu_ultimaker3_AA_0.8
+weight = -4
+
+[values]
+brim_width = 8.75
+cool_min_layer_time_fan_speed_max = 6
+expand_skins_expand_distance = =line_width * 2
+expand_skins_into_infill = True
+expand_upper_skins = True
+gradual_infill_step_height = =4 * layer_height
+gradual_infill_steps = 5
+infill_before_walls = True
+infill_line_width = =round(line_width * 0.7 / 0.8, 2)
+infill_pattern = tetrahedral
+infill_sparse_density = 80
+jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
+jerk_support = =math.ceil(jerk_print * 25 / 25)
+jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+layer_height = 0.4
+material_bed_temperature_layer_0 = 0
+material_flow = 105
+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.2
+prime_tower_enable = True
+prime_tower_flow = 100
+prime_tower_wall_thickness = =prime_tower_line_width * 2
+retract_at_layer_change = False
+retraction_count_max = 12
+retraction_extra_prime_amount = 0.5
+retraction_hop = 0.5
+retraction_hop_only_when_collides = False
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+skin_line_width = =round(line_width * 0.78 / 0.8, 2)
+skin_overlap = 15
+speed_print = 30
+speed_topbottom = =math.ceil(speed_print * 20 / 30)
+speed_travel = 300
+speed_wall = =math.ceil(speed_print * 30 / 30)
+speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+support_angle = 50
+support_bottom_distance = =support_z_distance
+support_line_width = =round(line_width * 0.7 / 0.8, 2)
+support_offset = =line_width
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 45
+top_bottom_thickness = 1.2
+travel_compensate_overlapping_walls_0_enabled = False
+wall_0_wipe_dist = =line_width * 2
+wall_line_width_x = =round(line_width * 0.6 / 0.8, 2)
+wall_thickness = 1.3
+
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
new file mode 100644
index 0000000000..edc9f61f0e
--- /dev/null
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -0,0 +1,62 @@
+[general]
+version = 2
+name = Verydraft Print
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = verydraft
+material = generic_tpu_ultimaker3_AA_0.8
+weight = -3
+
+[values]
+brim_width = 8.75
+cool_min_layer_time_fan_speed_max = 6
+expand_skins_expand_distance = =line_width * 2
+expand_skins_into_infill = True
+expand_upper_skins = True
+gradual_infill_step_height = =4 * layer_height
+gradual_infill_steps = 5
+infill_before_walls = True
+infill_line_width = =round(line_width * 0.7 / 0.8, 2)
+infill_pattern = tetrahedral
+infill_sparse_density = 80
+jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
+jerk_support = =math.ceil(jerk_print * 25 / 25)
+jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+layer_height = 0.3
+material_bed_temperature_layer_0 = 0
+material_flow = 105
+material_print_temperature_layer_0 = =default_material_print_temperature + 2
+material_standby_temperature = 100
+multiple_mesh_overlap = 0.2
+prime_tower_enable = True
+prime_tower_flow = 100
+prime_tower_wall_thickness = =prime_tower_line_width * 2
+retract_at_layer_change = False
+retraction_count_max = 12
+retraction_extra_prime_amount = 0.5
+retraction_hop = 0.5
+retraction_hop_only_when_collides = False
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+skin_line_width = =round(line_width * 0.78 / 0.8, 2)
+skin_overlap = 15
+speed_print = 30
+speed_topbottom = =math.ceil(speed_print * 23 / 30)
+speed_travel = 300
+speed_wall = =math.ceil(speed_print * 30 / 30)
+speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+support_angle = 50
+support_bottom_distance = =support_z_distance
+support_line_width = =round(line_width * 0.7 / 0.8, 2)
+support_offset = =line_width
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 45
+top_bottom_thickness = 1.2
+travel_compensate_overlapping_walls_0_enabled = False
+wall_0_wipe_dist = =line_width * 2
+wall_line_width_x = =round(line_width * 0.6 / 0.8, 2)
+wall_thickness = 1.3
+
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 c02e307b47..17e406cdc8 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
@@ -11,4 +11,4 @@ material = generic_pva_ultimaker3_BB_0.8
 
 [values]
 material_print_temperature = =default_material_print_temperature + 5
-
+material_standby_temperature = 100
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 84075aa4b9..7e87761349 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
@@ -6,9 +6,9 @@ definition = ultimaker3
 [metadata]
 type = quality
 quality_type = superdraft
-weight = -2
+weight = -4
 material = generic_pva_ultimaker3_BB_0.8
 
 [values]
 layer_height = 0.4
-
+material_standby_temperature = 100
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 db10f3d848..d79f0c6848 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
@@ -6,9 +6,9 @@ definition = ultimaker3
 [metadata]
 type = quality
 quality_type = verydraft
-weight = -2
+weight = -3
 material = generic_pva_ultimaker3_BB_0.8
 
 [values]
 layer_height = 0.3
-
+material_standby_temperature = 100
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index c73e22db20..a938ea1a8f 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -10,15 +10,15 @@ type = variant
 [values]
 acceleration_enabled = True
 acceleration_print = 4000
-brim_line_count = 7
 brim_width = 7
-cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
-cool_fan_speed = 100
+cool_fan_speed = 7
 cool_fan_speed_max = 100
+cool_min_speed = 5
 default_material_print_temperature = 200
 infill_before_walls = False
+infill_line_width = =round(line_width * 0.6 / 0.7, 2)
 infill_overlap = 0
-infill_pattern = cubic
+infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
@@ -26,17 +26,20 @@ jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
 jerk_wall = =math.ceil(jerk_print * 25 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
 layer_height = 0.2
+line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
-machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_size = 0.8
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
-ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
-raft_margin = 10
+prime_tower_enable = False
+prime_tower_size = 16
+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
@@ -48,17 +51,14 @@ speed_layer_0 = 20
 speed_print = 35
 speed_topbottom = =math.ceil(speed_print * 25 / 35)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
-support_angle = 70
+support_angle = 60
 support_bottom_distance = =support_z_distance / 2
-support_line_width = =line_width * 0.75
+support_pattern = zigzag
 support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 1.5
 support_z_distance = =layer_height * 2
-switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 16.5
 top_bottom_thickness = 1.4
 travel_avoid_distance = 3
 wall_0_inset = 0
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
+wall_line_width_x = =wall_line_width
 wall_thickness = 2
-
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index a88c3ef6b7..104b4d09d1 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -28,6 +28,8 @@ machine_nozzle_size = 0.8
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
+prime_tower_enable = False
+prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
 raft_base_speed = 20
@@ -41,6 +43,7 @@ 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_enabled = True
 retraction_hop_only_when_collides = True
@@ -70,5 +73,5 @@ switch_extruder_retraction_amount = 12
 top_bottom_thickness = 1
 travel_avoid_distance = 3
 wall_0_inset = 0
+wall_line_width_x = =wall_line_width
 wall_thickness = 1
-