diff --git a/resources/definitions/stream20dual_mk2.def.json b/resources/definitions/stream20dual_mk2.def.json
index ccec6b4024..ad9f50f06a 100644
--- a/resources/definitions/stream20dual_mk2.def.json
+++ b/resources/definitions/stream20dual_mk2.def.json
@@ -22,17 +22,13 @@
         "machine_depth": { "default_value": 200 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_bed_temperature": { "default_value": 50 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "layer_height": { "default_value": 0.1 },
         "layer_height_0": { "default_value": 0.1 },
         "retraction_amount": { "default_value": 2 },
         "retraction_speed": { "default_value": 25 },
-        "retraction_retract_speed": { "default_value": 25 },
-        "retraction_prime_speed": { "default_value": 25 },
         "adhesion_type": { "default_value": "none" },
         "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
-        "gantry_height": { "default_value": 20 },
         "machine_max_feedrate_z": { "default_value": 50 },
         "machine_max_feedrate_e": { "default_value": 60 },
         "machine_max_acceleration_z": { "default_value": 500 },
@@ -42,8 +38,6 @@
         "machine_max_jerk_e": { "default_value": 5 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_extruder_count": {"default_value": 2},
-        "prime_tower_position_x": {"default_value": 195},
-        "prime_tower_position_y": {"default_value": 195},
         "machine_start_gcode": {
             "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression"
         },
diff --git a/resources/definitions/stream20pro_mk2.def.json b/resources/definitions/stream20pro_mk2.def.json
index 0417eecf87..81fdc7d4e2 100644
--- a/resources/definitions/stream20pro_mk2.def.json
+++ b/resources/definitions/stream20pro_mk2.def.json
@@ -22,17 +22,13 @@
         "machine_depth": { "default_value": 200 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_bed_temperature": { "default_value": 50 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "layer_height": { "default_value": 0.1 },
         "layer_height_0": { "default_value": 0.1 },
         "retraction_amount": { "default_value": 2 },
         "retraction_speed": { "default_value": 25 },
-        "retraction_retract_speed": { "default_value": 25 },
-        "retraction_prime_speed": { "default_value": 25 },
         "adhesion_type": { "default_value": "none" },
         "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
-        "gantry_height": { "default_value": 20 },
         "machine_max_feedrate_z": { "default_value": 50 },
         "machine_max_feedrate_e": { "default_value": 60 },
         "machine_max_acceleration_z": { "default_value": 500 },
diff --git a/resources/definitions/stream30dual_mk2.def.json b/resources/definitions/stream30dual_mk2.def.json
index 84822bbf0a..31c7d8c3cc 100644
--- a/resources/definitions/stream30dual_mk2.def.json
+++ b/resources/definitions/stream30dual_mk2.def.json
@@ -22,17 +22,13 @@
         "machine_depth": { "default_value": 200 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_bed_temperature": { "default_value": 50 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "layer_height": { "default_value": 0.1 },
         "layer_height_0": { "default_value": 0.1 },
         "retraction_amount": { "default_value": 2 },
         "retraction_speed": { "default_value": 25 },
-        "retraction_retract_speed": { "default_value": 25 },
-        "retraction_prime_speed": { "default_value": 25 },
         "adhesion_type": { "default_value": "none" },
         "machine_head_with_fans_polygon": { "default_value": [[0,0],[0,0],[0,0],[0,0]] },
-        "gantry_height": { "default_value": 0 },
         "machine_max_feedrate_z": { "default_value": 50 },
         "machine_max_feedrate_e": { "default_value": 60 },
         "machine_max_acceleration_z": { "default_value": 500 },
@@ -42,8 +38,6 @@
         "machine_max_jerk_e": { "default_value": 5 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_extruder_count": {"default_value": 2},
-        "prime_tower_position_x": {"default_value": 195},
-        "prime_tower_position_y": {"default_value": 195},
         "machine_start_gcode": {
             "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression"
         },
diff --git a/resources/definitions/stream30pro_mk2.def.json b/resources/definitions/stream30pro_mk2.def.json
index 028b554487..bbc6fda70b 100644
--- a/resources/definitions/stream30pro_mk2.def.json
+++ b/resources/definitions/stream30pro_mk2.def.json
@@ -22,17 +22,13 @@
         "machine_depth": { "default_value": 200 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_bed_temperature": { "default_value": 50 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "layer_height": { "default_value": 0.1 },
         "layer_height_0": { "default_value": 0.1 },
         "retraction_amount": { "default_value": 2 },
         "retraction_speed": { "default_value": 25 },
-        "retraction_retract_speed": { "default_value": 25 },
-        "retraction_prime_speed": { "default_value": 25 },
         "adhesion_type": { "default_value": "none" },
         "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
-        "gantry_height": { "default_value": 20 },
         "machine_max_feedrate_z": { "default_value": 50 },
         "machine_max_feedrate_e": { "default_value": 60 },
         "machine_max_acceleration_z": { "default_value": 500 },
diff --git a/resources/definitions/stream30ultra.def.json b/resources/definitions/stream30ultra.def.json
index 443e4fca00..7f27bc69aa 100644
--- a/resources/definitions/stream30ultra.def.json
+++ b/resources/definitions/stream30ultra.def.json
@@ -22,17 +22,13 @@
         "machine_depth": { "default_value": 200 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_bed_temperature": { "default_value": 50 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "layer_height": { "default_value": 0.1 },
         "layer_height_0": { "default_value": 0.1 },
         "retraction_amount": { "default_value": 2 },
         "retraction_speed": { "default_value": 25 },
-        "retraction_retract_speed": { "default_value": 25 },
-        "retraction_prime_speed": { "default_value": 25 },
         "adhesion_type": { "default_value": "none" },
         "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
-        "gantry_height": { "default_value": 20 },
         "machine_max_feedrate_z": { "default_value": 30 },
         "machine_max_feedrate_e": { "default_value": 60 },
         "machine_max_acceleration_z": { "default_value": 500 },
diff --git a/resources/definitions/stream30ultrasc.def.json b/resources/definitions/stream30ultrasc.def.json
index 48c65a0479..3492a10d13 100644
--- a/resources/definitions/stream30ultrasc.def.json
+++ b/resources/definitions/stream30ultrasc.def.json
@@ -22,17 +22,13 @@
         "machine_depth": { "default_value": 200 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_bed_temperature": { "default_value": 50 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "layer_height": { "default_value": 0.1 },
         "layer_height_0": { "default_value": 0.1 },
         "retraction_amount": { "default_value": 2.40 },
         "retraction_speed": { "default_value": 30 },
-        "retraction_retract_speed": { "default_value": 30 },
-        "retraction_prime_speed": { "default_value": 30 },
         "adhesion_type": { "default_value": "none" },
         "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
-        "gantry_height": { "default_value": 20 },
         "machine_max_feedrate_z": { "default_value": 30 },
         "machine_max_feedrate_e": { "default_value": 60 },
         "machine_max_acceleration_z": { "default_value": 500 },
diff --git a/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg b/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg
index e585798f5d..c88b5e7916 100644
--- a/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg
+++ b/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg
@@ -4,7 +4,7 @@ name = Bas
 definition = stream20dual_mk2
 
 [metadata]
-setting_version = 12
+setting_version = 16
 type = quality
 quality_type = coarse
 weight = -1
diff --git a/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg b/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg
index 649a395f52..9eb6dcc940 100644
--- a/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg
+++ b/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg
@@ -4,7 +4,7 @@ name = Standard
 definition = stream20dual_mk2
 
 [metadata]
-setting_version = 12
+setting_version = 16
 type = quality
 quality_type = draft
 weight = -2
diff --git a/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg
index aa0f1e873f..199b05c644 100644
--- a/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg
+++ b/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg
@@ -4,7 +4,7 @@ name = Très bas
 definition = stream20dual_mk2
 
 [metadata]
-setting_version = 12
+setting_version = 16
 type = quality
 quality_type = extra coarse
 weight = 0
diff --git a/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg b/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg
index 037363a092..dfaaa3994f 100644
--- a/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg
+++ b/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg
@@ -4,7 +4,7 @@ name = Moyen
 definition = stream20dual_mk2
 
 [metadata]
-setting_version = 12
+setting_version = 16
 type = quality
 quality_type = fast
 weight = -3
diff --git a/resources/quality/volumic/stream20dual_mk2_high.inst.cfg b/resources/quality/volumic/stream20dual_mk2_high.inst.cfg
index 91234ded6e..bccc1e3c9c 100644
--- a/resources/quality/volumic/stream20dual_mk2_high.inst.cfg
+++ b/resources/quality/volumic/stream20dual_mk2_high.inst.cfg
@@ -4,7 +4,7 @@ name = Très fin
 definition = stream20dual_mk2
 
 [metadata]
-setting_version = 12
+setting_version = 16
 type = quality
 quality_type = high
 weight = -5
diff --git a/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg b/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg
index 19a69617d6..607b89fcd7 100644
--- a/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg
+++ b/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg
@@ -4,7 +4,7 @@ name = Fin
 definition = stream20dual_mk2
 
 [metadata]
-setting_version = 12
+setting_version = 16
 type = quality
 quality_type = normal
 weight = -4