Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2022-09-15 14:57:39 +0300
committerJaime van Kessel <nallath@gmail.com>2022-09-15 14:57:39 +0300
commit0dea6d7cca44d1b9e6f3eb9dce160215aca17c47 (patch)
treea6658c21e3581120687425666a815e35c15fd3c5 /resources
parente7c58c49dc59adcf55ae378284706e01a6efad2d (diff)
parent4712c6abc3791eb239116ccfe96cf9f729043378 (diff)
Merge branch 'PP-243-cleanup-raft-settings' of github.com:Ultimaker/Cura
Diffstat (limited to 'resources')
-rw-r--r--resources/definitions/ultimaker.def.json27
-rw-r--r--resources/definitions/ultimaker3.def.json7
-rw-r--r--resources/definitions/ultimaker_s3.def.json10
-rw-r--r--resources/definitions/ultimaker_s5.def.json10
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg4
-rw-r--r--resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg4
-rw-r--r--resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg5
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg7
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg6
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg4
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg4
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_aa0.25.inst.cfg7
-rw-r--r--resources/variants/ultimaker3_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_aa04.inst.cfg8
-rw-r--r--resources/variants/ultimaker3_bb0.8.inst.cfg10
-rw-r--r--resources/variants/ultimaker3_bb04.inst.cfg3
-rw-r--r--resources/variants/ultimaker3_extended_aa0.25.inst.cfg7
-rw-r--r--resources/variants/ultimaker3_extended_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_extended_aa04.inst.cfg8
-rw-r--r--resources/variants/ultimaker3_extended_bb0.8.inst.cfg10
-rw-r--r--resources/variants/ultimaker3_extended_bb04.inst.cfg3
-rw-r--r--resources/variants/ultimaker_s3_aa0.25.inst.cfg8
-rw-r--r--resources/variants/ultimaker_s3_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s3_aa04.inst.cfg8
-rw-r--r--resources/variants/ultimaker_s3_bb0.8.inst.cfg10
-rw-r--r--resources/variants/ultimaker_s3_bb04.inst.cfg3
-rw-r--r--resources/variants/ultimaker_s3_cc04.inst.cfg8
-rw-r--r--resources/variants/ultimaker_s3_cc06.inst.cfg8
-rw-r--r--resources/variants/ultimaker_s5_aa0.25.inst.cfg7
-rw-r--r--resources/variants/ultimaker_s5_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s5_aa04.inst.cfg8
-rw-r--r--resources/variants/ultimaker_s5_bb0.8.inst.cfg10
-rw-r--r--resources/variants/ultimaker_s5_bb04.inst.cfg3
-rw-r--r--resources/variants/ultimaker_s5_cc04.inst.cfg8
-rw-r--r--resources/variants/ultimaker_s5_cc06.inst.cfg8
135 files changed, 55 insertions, 626 deletions
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 1546a268de..06e3cd00d0 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -239,6 +239,33 @@
"gradual_support_infill_step_height": {
"value": "4*layer_height"
},
+ "raft_base_speed": {
+ "value": "raft_speed"
+ },
+ "raft_base_thickness": {
+ "value": "min(machine_nozzle_size * 0.75, 0.3)"
+ },
+ "raft_interface_fan_speed": {
+ "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2"
+ },
+ "raft_interface_line_width": {
+ "value": "(raft_base_line_width + raft_surface_line_width) / 2"
+ },
+ "raft_interface_speed": {
+ "value": "(raft_surface_speed + raft_base_speed) /2"
+ },
+ "raft_interface_thickness": {
+ "value": "(raft_base_thickness + raft_surface_thickness) / 2"
+ },
+ "raft_speed": {
+ "value": 15
+ },
+ "raft_surface_fan_speed": {
+ "value": "cool_fan_speed"
+ },
+ "raft_surface_speed": {
+ "value": "speed_topbottom"
+ },
"support_interface_height": {
"value": "2*layer_height"
},
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 13835d2b72..fad1eaf2ea 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -111,13 +111,6 @@
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "default_value": true },
- "raft_airgap": { "value": "0" },
- "raft_base_thickness": { "value": "0.3" },
- "raft_interface_line_spacing": { "value": "0.5" },
- "raft_interface_line_width": { "value": "0.5" },
- "raft_interface_thickness": { "value": "0.2" },
- "raft_margin": { "value": "10" },
- "raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "6.5" },
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index f9ae7a14a9..78986133a7 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -100,16 +100,6 @@
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "value": "True" },
- "raft_airgap": { "value": "0" },
- "raft_base_speed": { "value": "20" },
- "raft_base_thickness": { "value": "0.3" },
- "raft_interface_line_spacing": { "value": "0.5" },
- "raft_interface_line_width": { "value": "0.5" },
- "raft_interface_speed": { "value": "20" },
- "raft_interface_thickness": { "value": "0.2" },
- "raft_margin": { "value": "10" },
- "raft_speed": { "value": "25" },
- "raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "6.5" },
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index d1ae61d4fe..33b3f926e5 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -101,16 +101,6 @@
"default_material_print_temperature": { "value": "200" },
"multiple_mesh_overlap": { "value": "0" },
"prime_tower_enable": { "value": "True" },
- "raft_airgap": { "value": "0" },
- "raft_base_speed": { "value": "20" },
- "raft_base_thickness": { "value": "0.3" },
- "raft_interface_line_spacing": { "value": "0.5" },
- "raft_interface_line_width": { "value": "0.5" },
- "raft_interface_speed": { "value": "20" },
- "raft_interface_thickness": { "value": "0.2" },
- "raft_margin": { "value": "10" },
- "raft_speed": { "value": "25" },
- "raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "6.5" },
"retraction_combing": { "value": "'no_outer_surfaces'"},
"retraction_hop": { "value": "2" },
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
index 881571c5a3..49703c592d 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 30
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.38
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 20 / 25)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
index 627eb26587..6503460702 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 30
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.38
speed_layer_0 = =math.ceil(speed_print * 15 / 35)
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 20 / 35)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
index afb26d0ddb..9dec35e4a5 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
@@ -22,13 +22,6 @@ infill_sparse_density = 35
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.57
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 50)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 20 / 25)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
index cb9ade1813..b3751e0bbc 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
@@ -22,13 +22,6 @@ infill_sparse_density = 35
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.57
-raft_surface_thickness = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 35)
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 20 / 35)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
index 431e39c85f..492d54f63c 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 40
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 20 / 25)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
index f0a60e8af3..79cd4cb0b2 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 40
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
index 404023db87..21ed3ff9ee 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
@@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 25
layer_0_z_overlap = 0.1
raft_airgap = 0.15
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
speed_print = 40
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
index 2f77288341..4746d98537 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
@@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 25
layer_0_z_overlap = 0.1
raft_airgap = 0.15
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
speed_print = 40
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
index 71f03adfd9..19d0dd03aa 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 30
layer_0_z_overlap = 0.22
raft_airgap = 0.57
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.5
-raft_surface_thickness = 0.15
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
index bd2372dc16..4e7e6981a5 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 30
layer_0_z_overlap = 0.22
raft_airgap = 0.57
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.5
-raft_surface_thickness = 0.15
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
speed_travel = 150
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
index cd5a66151d..7e9be134b7 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 35
layer_0_z_overlap = 0.22
raft_airgap = 0.44
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 55)
speed_print = 55
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
index 7c03a0faeb..c8bd8b8055 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 35
layer_0_z_overlap = 0.22
raft_airgap = 0.44
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 55)
speed_print = 55
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
index 9f4c534c86..c3eeef66a6 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
@@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 40
layer_0_z_overlap = 0.25
raft_airgap = 0.44
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 55)
speed_print = 55
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
index 1239c43800..243169012a 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
@@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 40
layer_0_z_overlap = 0.25
raft_airgap = 0.44
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =round(speed_print * 30 / 55)
speed_print = 55
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
index a3e95a3a88..6a15d8959d 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
@@ -22,12 +22,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 25
layer_0_z_overlap = 0.2
raft_airgap = 0.25
-raft_base_line_spacing = 1
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
support_enable = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
index e81cece3d1..2c498c3e5b 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
@@ -22,12 +22,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 25
layer_0_z_overlap = 0.2
raft_airgap = 0.25
-raft_base_line_spacing = 1
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
support_enable = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
index bca94eb325..4bc50328e8 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
@@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 30
layer_0_z_overlap = 0.3
raft_airgap = 0.35
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall_0 = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
index 7d8f4f7f74..f26d676a04 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
@@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 30
layer_0_z_overlap = 0.3
raft_airgap = 0.35
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall_0 = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
index 2c3c3172ac..7adbef71a2 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
@@ -21,13 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 35
layer_0_z_overlap = 0.22
raft_airgap = 0.52
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
index 80967c9543..8c627e7507 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
@@ -21,13 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 35
layer_0_z_overlap = 0.22
raft_airgap = 0.52
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
index 952265384c..a0422892c3 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 40
layer_0_z_overlap = 0.22
raft_airgap = 0.47
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
support_angle = 45
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
index c082f75d52..3fa7cd089f 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 40
layer_0_z_overlap = 0.22
raft_airgap = 0.47
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
support_angle = 45
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
index e8fcf8b392..0c0e9e8913 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@@ -21,10 +21,6 @@ cool_min_speed = 15
infill_sparse_density = 10
layer_0_z_overlap = 0.1
raft_airgap = 0.2
-raft_base_line_spacing = 1
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.2
-raft_surface_line_width = 0.2
retraction_count_max = 15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
index 3a4c443011..48d88baa8d 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
@@ -19,10 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60
cool_min_layer_time = 10
cool_min_speed = 15
infill_sparse_density = 10
-raft_base_line_spacing = 2
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_margin = 12
retraction_count_max = 15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
index 7381cddcfc..7d32b1e6c4 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@@ -20,12 +20,6 @@ cool_min_speed = 15
infill_sparse_density = 10
layer_0_z_overlap = 0.12
raft_airgap = 0.24
-raft_base_line_spacing = 1.2
-raft_base_line_width = 0.6
-raft_interface_line_spacing = 1.2
-raft_interface_line_width = 0.57
-raft_margin = 15
-raft_surface_line_width = 0.5
retraction_count_max = 15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
index 076caebf21..a496c9b024 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
@@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.38
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
index eb2eb45552..67c5c16e65 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
@@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.38
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
speed_layer_0 = =math.ceil(speed_print * 15 / 35)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
index 255979e3a6..90396b40a7 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.57
-raft_surface_thickness = 0.2
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
speed_layer_0 = =round(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
index 88eda6c8ec..7df3ca1322 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.57
-raft_surface_thickness = 0.2
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
speed_layer_0 = =math.ceil(speed_print * 30 / 35)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
index 9d7a3851d8..5ad74de77b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
@@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 20 / 25)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
index 4801f03a05..dec0f67c1e 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
@@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.37
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
index f08257d7d6..bd76fb2c17 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
@@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.1
raft_airgap = 0.15
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
speed_print = 40
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
index ab17f0589d..2e3e72b354 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
@@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.1
raft_airgap = 0.15
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
speed_print = 40
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
index d23859a47f..ecababf038 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
@@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.57
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.5
-raft_surface_thickness = 0.15
retraction_prime_speed = =retraction_speed
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
index e5d05294f2..3bc6cdd0de 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
@@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.57
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
-raft_surface_line_width = 0.5
-raft_surface_thickness = 0.15
retraction_prime_speed = =retraction_speed
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
index 59834b551d..5b71703b7f 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
@@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.44
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
retraction_hop_enabled = 0.2
retraction_prime_speed = =retraction_speed
speed_layer_0 = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
index 25480e1e7d..f439ac8971 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
@@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.44
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
retraction_hop_enabled = 0.2
retraction_prime_speed = =retraction_speed
speed_layer_0 = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
index ee0a2bd2a5..9fc2a85950 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
@@ -19,12 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.25
raft_airgap = 0.44
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 55)
speed_print = 55
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
index 9ac5d56bd7..560acf1335 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
@@ -19,12 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.25
raft_airgap = 0.44
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
retraction_hop_enabled = 0.2
speed_layer_0 = =round(speed_print * 30 / 55)
speed_print = 55
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
index 4898c72327..8366aea6c2 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.2
raft_airgap = 0.25
-raft_base_line_spacing = 1
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
support_enable = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
index 2d159792c9..2979294168 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
@@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.2
raft_airgap = 0.25
-raft_base_line_spacing = 1
-raft_base_line_width = 0.5
-raft_interface_line_spacing = 0.7
-raft_interface_line_width = 0.5
-raft_margin = 15
-raft_surface_line_width = 0.2
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
support_enable = True
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
index 86a965d441..f32a6969ad 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
@@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.3
raft_airgap = 0.35
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall_0 = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
index b782ea63d4..0e52da4cca 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
@@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.3
raft_airgap = 0.35
-raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.8
-raft_margin = 15
speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall_0 = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
index 739d72072f..b8c0c431d4 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.52
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
index d95596953e..7668a9c941 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
@@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.52
-raft_base_line_spacing = 2.4
-raft_base_line_width = 1.2
-raft_interface_line_spacing = 1.4
-raft_interface_line_width = 1.2
-raft_margin = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 20 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
index 751696ca93..c170588b34 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
@@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
raft_airgap = 0.47
-raft_base_line_width = 1.6
-raft_interface_line_spacing = 1.8
-raft_interface_line_width = 1.6
-raft_margin = 15
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
support_angle = 45
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
index 42c185a769..c9cc3bb528 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
@@ -21,10 +21,6 @@ cool_min_speed = 15
infill_sparse_density = 10
layer_0_z_overlap = 0.1
raft_airgap = 0.2
-raft_base_line_spacing = 1
-raft_interface_line_spacing = 1
-raft_interface_line_width = 0.2
-raft_surface_line_width = 0.2
retraction_count_max = 15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
index acf28f2ad3..752dcaadd2 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
@@ -19,10 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60
cool_min_layer_time = 10
cool_min_speed = 15
infill_sparse_density = 10
-raft_base_line_spacing = 2
-raft_base_line_width = 0.8
-raft_interface_line_spacing = 1
-raft_margin = 12
retraction_count_max = 15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
index db3a812f97..4a8a99ce10 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
@@ -20,12 +20,6 @@ cool_min_speed = 15
infill_sparse_density = 10
layer_0_z_overlap = 0.12
raft_airgap = 0.24
-raft_base_line_spacing = 1.2
-raft_base_line_width = 0.6
-raft_interface_line_spacing = 1.2
-raft_interface_line_width = 0.57
-raft_margin = 15
-raft_surface_line_width = 0.5
retraction_count_max = 15
retraction_hop_enabled = 0.2
speed_layer_0 = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
index faceaf67a1..7cb72ef3e0 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -17,11 +17,7 @@ cool_min_speed = 12
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
-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, 3)
-raft_margin = 10
-raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
+raft_airgap = 0.15
retraction_min_travel = 5
skin_overlap = 50
speed_print = 70
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
index b5a4c80051..6e23de0aa7 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -27,7 +27,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
index ab002594f4..babf6f1306 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -19,11 +19,7 @@ material_print_temperature = =default_material_print_temperature + 10
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-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)
+raft_airgap = 0.25
skin_overlap = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
switch_extruder_prime_speed = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
index 289f90587e..cbf61a838f 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -19,11 +19,7 @@ material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-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)
+raft_airgap = 0.25
skin_overlap = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
switch_extruder_prime_speed = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
index b3598f8851..31e1d559f3 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
@@ -18,11 +18,7 @@ cool_min_speed = 15
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-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)
+raft_airgap = 0.25
skin_overlap = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
switch_extruder_prime_speed = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
index f6dcbe9b2c..761ab7d56d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -18,11 +18,7 @@ cool_min_speed = 12
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-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)
+raft_airgap = 0.25
skin_overlap = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
switch_extruder_prime_speed = 30
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 3864b870a8..8627ccd4a3 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
@@ -35,7 +35,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
index 1d7c0a6bba..1119e3e7ac 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
@@ -33,7 +33,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
index df9575fdc4..5cfe7b7d62 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
@@ -35,7 +35,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
index 4f1ce35e5a..8f471a9507 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
@@ -32,7 +32,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
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 5013bcb3f8..a171427548 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
@@ -19,11 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
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 fb59a2aa76..e80a6c73fd 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
@@ -20,11 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
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 23587d6a81..a2ca3a769f 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
@@ -20,11 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg
index df89b2769b..4480855c43 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg
@@ -18,7 +18,6 @@ cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
index 0532884c0e..757c716dad 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -19,7 +19,6 @@ cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
layer_height = 0.4
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
index 91f11ad52a..a8e3d3a957 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -20,7 +20,6 @@ layer_height = 0.3
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
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 ec31d9bd7f..137e93d019 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
@@ -24,7 +24,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
prime_tower_enable = True
-raft_margin = 10
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 35 / 45)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
index c155549106..7595124338 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -24,7 +24,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 + 5
prime_tower_enable = False
-raft_margin = 10
speed_infill = =math.ceil(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
index d43a422dac..4e2114909a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -17,11 +17,7 @@ cool_min_speed = 12
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 3)
-raft_margin = 10
-raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
retraction_min_travel = 5
skin_overlap = 50
speed_print = 70
@@ -30,6 +26,4 @@ speed_wall = =math.ceil(speed_print * 30 / 70)
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-
-raft_surface_speed = 45
speed_layer_0 = 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
index a4c6e356d1..705b63ad02 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -26,7 +26,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
index c8927b8ab0..a0c909af75 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -18,15 +18,10 @@ material_print_temperature = =default_material_print_temperature + 10
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
index 1d05299c40..58b6f80f5d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -18,15 +18,10 @@ material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
index 139bb7095a..0dd7ec5a0d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
@@ -17,15 +17,10 @@ cool_min_speed = 15
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
index 2b0c07adaf..8f17f79616 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -17,15 +17,10 @@ cool_min_speed = 12
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
index 4a598829bb..c34bf1bfde 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
@@ -32,7 +32,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
index 89c557e52f..6e115a9c37 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
@@ -31,7 +31,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
index 3662eaa22c..b3f3aa6cd0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
@@ -33,7 +33,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
index 17f5f6c4e5..eaf031fe52 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -31,7 +31,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
index 2b12e3380b..d20c1303b8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -34,5 +34,5 @@ top_bottom_thickness = 0.9
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-raft_airgap = =0.25
+raft_airgap = 0.25
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index 1b508e3a23..2d05a15f3c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -34,5 +34,5 @@ top_bottom_thickness = 1.2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-raft_airgap = =0.25
+raft_airgap = 0.25
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
index 0f436de811..09de59ba20 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -21,11 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
index b7a36e6c71..d6e11ca953 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -21,11 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 15d2fc250f..599789f528 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -21,11 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
index 27c05bc0c6..61d0cc5109 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
@@ -20,7 +20,6 @@ cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
index 8182ee03e2..f441c0acac 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -19,7 +19,6 @@ cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
index 0bbc14ae81..a044987670 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -20,7 +20,6 @@ cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
index 6abb19ad5f..a2e863cb8d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -22,7 +22,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
prime_tower_enable = True
-raft_margin = 10
support_angle = 70
top_bottom_thickness = =layer_height * 4
speed_print = 45
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
index 1dc6c7c64b..3b47b687ab 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -24,7 +24,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 + 5
prime_tower_enable = False
-raft_margin = 10
speed_infill = =math.ceil(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
index 3a096ba06c..b06a514334 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -18,11 +18,7 @@ cool_min_speed = 12
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
-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, 3)
-raft_margin = 10
-raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
+raft_airgap = 0.15
retraction_min_travel = 5
skin_overlap = 50
speed_print = 70
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
index 26eb1342ab..abb891489e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
@@ -26,7 +26,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
index 8ac7ded1f8..f0ced52d33 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -18,15 +18,10 @@ material_print_temperature = =default_material_print_temperature + 10
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
index fcfc47a3d9..90fd37a5fb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -18,15 +18,10 @@ material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
index f993cb0483..c6a9e2b017 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
@@ -17,15 +17,10 @@ cool_min_speed = 15
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
index 6f96a284f3..0b0ea1fb9f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -17,15 +17,10 @@ cool_min_speed = 12
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
-raft_acceleration = =acceleration_layer_0
raft_airgap = 0.4
-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)
retraction_prime_speed = =retraction_speed
skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
index dfccfecf19..d2926843a6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
@@ -32,7 +32,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
index c0f36fce86..3fa9480c24 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
@@ -31,7 +31,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
index ecc60d1d31..e574b8cca5 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
@@ -32,7 +32,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
index 6a49d75a60..4103986e65 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
@@ -30,7 +30,6 @@ ooze_shield_angle = 40
prime_tower_enable = True
prime_tower_wipe_enabled = True
raft_airgap = 0.25
-raft_interface_thickness = =max(layer_height * 1.5, 0.225)
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
index 3b20559564..962f906e74 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -35,5 +35,5 @@ top_bottom_thickness = 0.9
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-raft_airgap = =0.25
+raft_airgap = 0.25
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index bfb76f20c8..5150537256 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -34,5 +34,5 @@ top_bottom_thickness = 1.2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-raft_airgap = =0.25
+raft_airgap = 0.25
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
index b7d767a40b..addfe52641 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -19,11 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 23b93082f6..aec980aa48 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -19,11 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
index a12ef5caf3..fc9d586503 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -21,11 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
prime_tower_enable = True
-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)
+raft_airgap = 0.45
support_angle = 70
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
index 8c762a2286..30877bf726 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
@@ -20,7 +20,6 @@ cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
index b5b54af8ea..fd3ae94a9e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -19,7 +19,6 @@ cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
index 87f2af5e8f..6fe4bd5999 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -18,7 +18,6 @@ cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
-raft_margin = 15
skin_overlap = 0
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
index 5fd1ac1591..7f1cf80f12 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -22,7 +22,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
prime_tower_enable = True
-raft_margin = 10
support_angle = 70
top_bottom_thickness = =layer_height * 4
speed_print = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
index 876136d914..b298611623 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -24,7 +24,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 + 5
prime_tower_enable = False
-raft_margin = 10
speed_infill = =math.ceil(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg
index 57db85f405..15fc789f66 100644
--- a/resources/variants/ultimaker3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.25.inst.cfg
@@ -18,13 +18,6 @@ machine_nozzle_size = 0.25
machine_nozzle_tip_outer_diameter = 0.65
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_min_travel = 0.7
retraction_prime_speed = =retraction_speed
skin_overlap = 15
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index 748ed78eb7..4adec1540b 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
+raft_surface_layers = 1
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index 79e00a03d8..c81caf4164 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_amount = 6.5
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index fb09362b67..fd516c48b2 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -31,16 +31,6 @@ material_print_temperature = =default_material_print_temperature + 10
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
-raft_base_thickness = 0.3
-raft_interface_line_spacing = 0.5
-raft_interface_line_width = 0.5
-raft_interface_speed = 20
-raft_interface_thickness = 0.2
-raft_margin = 10
-raft_speed = 25
raft_surface_layers = 1
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 49837e24ea..05e91d0752 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
retraction_min_travel = =3 * line_width
speed_layer_0 = 20
speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
index ae232b2209..e6a9abfe1e 100644
--- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
@@ -18,13 +18,6 @@ machine_nozzle_size = 0.25
machine_nozzle_tip_outer_diameter = 0.65
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_min_travel = 0.7
retraction_prime_speed = =retraction_speed
skin_overlap = 15
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index 96a34c059e..a215c4f455 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
+raft_surface_layers = 1
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index 5a3994a4f0..be07b56cdc 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_amount = 6.5
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index b1317d77f5..e052df63eb 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -31,16 +31,6 @@ material_print_temperature = =default_material_print_temperature + 10
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
-raft_base_thickness = 0.3
-raft_interface_line_spacing = 0.5
-raft_interface_line_width = 0.5
-raft_interface_speed = 20
-raft_interface_thickness = 0.2
-raft_margin = 10
-raft_speed = 25
raft_surface_layers = 1
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index 94a687c951..69968e721e 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
retraction_min_travel = =3 * line_width
speed_layer_0 = 20
speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
index c781037a09..059f3ece2f 100644
--- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
@@ -18,14 +18,6 @@ machine_nozzle_size = 0.25
machine_nozzle_tip_outer_diameter = 0.65
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
-
retraction_min_travel = 0.7
retraction_prime_speed = =retraction_speed
skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index 3e4f3156af..6e477f15e6 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
+raft_surface_layers = 1
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg
index 4fe8c7d66f..fb995635ff 100644
--- a/resources/variants/ultimaker_s3_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa04.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_amount = 6.5
retraction_min_travel = =line_width * 2
skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 123386d1b3..0305245e08 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -30,16 +30,6 @@ material_print_temperature = =default_material_print_temperature + 10
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
-raft_base_thickness = 0.3
-raft_interface_line_spacing = 0.5
-raft_interface_line_width = 0.5
-raft_interface_speed = 20
-raft_interface_thickness = 0.2
-raft_margin = 10
-raft_speed = 25
raft_surface_layers = 1
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg
index 526f724eea..9c18713818 100644
--- a/resources/variants/ultimaker_s3_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
retraction_min_travel = =3 * line_width
speed_layer_0 = 20
speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg
index 4930152e81..0c22958955 100644
--- a/resources/variants/ultimaker_s3_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc04.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC 0.4
machine_nozzle_size = 0.4
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg
index 08bfd09353..caa1616d4d 100644
--- a/resources/variants/ultimaker_s3_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc06.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC 0.6
machine_nozzle_size = 0.6
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
index c423779b1e..3b9d08b278 100644
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@@ -18,13 +18,6 @@ machine_nozzle_size = 0.25
machine_nozzle_tip_outer_diameter = 0.65
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_min_travel = 0.7
retraction_prime_speed = =retraction_speed
skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index 78e6f55104..4433739430 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -30,6 +30,7 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
+raft_surface_layers = 1
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 781f63d517..4d361e51c8 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_amount = 6.5
retraction_min_travel = =line_width * 2
skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index acab25be4e..3c2e9d14cb 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -30,16 +30,6 @@ material_print_temperature = =default_material_print_temperature + 10
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
-raft_base_thickness = 0.3
-raft_interface_line_spacing = 0.5
-raft_interface_line_width = 0.5
-raft_interface_speed = 20
-raft_interface_thickness = 0.2
-raft_margin = 10
-raft_speed = 25
raft_surface_layers = 1
retraction_hop = 2
retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 18770b1c4d..6e378bbb82 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
retraction_min_travel = =3 * line_width
speed_layer_0 = 20
speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg
index 35fbf4f174..174a4f7c62 100644
--- a/resources/variants/ultimaker_s5_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc04.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC 0.4
machine_nozzle_size = 0.4
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg
index 9263ad6cc9..e8934377a1 100644
--- a/resources/variants/ultimaker_s5_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc06.inst.cfg
@@ -13,14 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC 0.6
machine_nozzle_size = 0.6
-raft_acceleration = =acceleration_print
-raft_airgap = 0.3
-raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
-raft_interface_line_spacing = =raft_interface_line_width + 0.2
-raft_interface_line_width = =line_width * 2
-raft_interface_thickness = =layer_height * 1.5
-raft_margin = 15
-raft_surface_layers = 2
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
speed_infill = =speed_print