diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json
new file mode 100644
index 0000000000..eb33280401
--- /dev/null
+++ b/resources/definitions/fabtotum.def.json
@@ -0,0 +1,71 @@
+{
+  "id": "fabtotum",
+  "version": 2,
+  "name": "FABtotum Personal Fabricator",
+  "inherits": "fdmprinter",
+  "metadata": {
+    "visible": true,
+    "author": "FABtotum",
+    "manufacturer": "FABtotum",
+    "category": "Other",
+    "file_formats": "text/x-gcode",
+    "platform": "fabtotum_platform.stl",
+    "icon": "fabtotum_platform.png",
+    "has_machine_quality": true,
+    "has_variants": true,
+    "variants_name": "Head",
+    "preferred_variant": "*lite04*",
+    "preferred_material": "*fabtotum_pla*",
+    "supports_usb_connection": false
+ },
+
+  "overrides": {
+    "machine_name": { "default_value": "FABtotum Personal Fabricator" },
+    "machine_start_gcode": {
+      "default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM728 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35  ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \nG1 F{speed_travel} ;Set travel speed \n;print"
+    },
+    "machine_end_gcode": {
+      "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM728 ;FAB bep bep (end print)"
+    },
+    "gantry_height": { "default_value": 55 },
+    "machine_width": { "default_value": 214 },
+    "machine_height": { "default_value": 241.5 },
+    "machine_depth": { "default_value": 234 },
+    "machine_center_is_zero": { "default_value": false },
+    "machine_heated_bed": {	"default_value": true },
+    "machine_nozzle_size": { "default_value": 0.4 },
+    "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] },
+    "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+    "machine_max_feedrate_x": { "default_value": 250 },
+    "machine_max_feedrate_y": { "default_value": 250 },
+    "machine_max_feedrate_z": { "default_value": 15 },
+    "machine_max_acceleration_x": { "default_value": 10000 },
+    "machine_max_acceleration_y": { "default_value": 10000 },
+    "machine_max_acceleration_z": { "default_value": 50 },
+    "machine_max_acceleration_e": { "default_value": 100 },
+    "machine_acceleration": { "default_value": 4000 },
+    "machine_max_jerk_xy": { "default_value": 25.0 },
+    "machine_max_jerk_z": { "default_value": 0.4 },
+    "machine_max_jerk_e": { "default_value": 1.0 },
+    "retraction_hop_enabled": { "default_value": false },
+    "material_diameter": { "default_value": 1.75 },
+    "material_final_print_temperature": { "value": "material_print_temperature - 5" },
+    "material_initial_print_temperature": { "value": "material_print_temperature" },
+    "travel_avoid_distance": { "default_value": 1, "value": 1 },
+    "speed_travel": { "default_value": 200, "value": 200 },
+    "speed_infill": { "value": "round(speed_print * 1.05, 0)" },
+    "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" },
+    "speed_wall": { "value": "speed_print" },
+    "speed_wall_0": { "value": "round(speed_print * 0.9, 0)" },
+    "speed_wall_x": { "value": "speed_wall" },
+    "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" },
+    "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" },
+    "skirt_brim_speed": { "value": "speed_layer_0" },
+    "skirt_line_count": { "default_value": 3 },
+    "skirt_brim_minimal_length": { "default_value": 150 },
+    "infill_sparse_density": { "default_value": 24 },
+    "top_bottom_thickness": { "default_value": 0.6 },
+    "support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" },
+    "support_interface_enable": { "default_value": true }
+  }
+}
diff --git a/resources/images/fabtotum_platform.png b/resources/images/fabtotum_platform.png
new file mode 100644
index 0000000000..481bc75e43
Binary files /dev/null and b/resources/images/fabtotum_platform.png differ
diff --git a/resources/meshes/fabtotum_platform.stl b/resources/meshes/fabtotum_platform.stl
new file mode 100644
index 0000000000..a87a034acb
Binary files /dev/null and b/resources/meshes/fabtotum_platform.stl differ
diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg
new file mode 100644
index 0000000000..4ab47f7e83
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+version = 2
+definition = fabtotum
+name = Fast Quality
+
+[metadata]
+type = quality
+setting_version = 2
+material = generic_fabtotum_abs
+quality_type = fast
+weight = -1
+
+[values]
+adhesion_type = raft
+layer_height = 0.2
+layer_height_0 = 0.2
+cool_fan_enabled = True
+cool_fan_full_at_height = 0.4
+cool_fan_speed = 50
+cool_fan_speed_max = 50
+cool_fan_speed_min = 50
+cool_min_layer_time = 3
+cool_min_speed = 20
+
diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg
new file mode 100644
index 0000000000..f42dcc3e40
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+version = 2
+definition = fabtotum
+name = High Quality
+
+[metadata]
+type = quality
+setting_version = 2
+material = generic_fabtotum_abs
+quality_type = high
+weight = 1
+
+[values]
+adhesion_type = raft
+layer_height = 0.1
+layer_height_0 = 0.1
+cool_fan_enabled = True
+cool_fan_full_at_height = 0.2
+cool_fan_speed = 50
+cool_fan_speed_max = 50
+cool_fan_speed_min = 50
+cool_min_layer_time = 3
+cool_min_speed = 20
+
diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg
new file mode 100644
index 0000000000..7c29dec89c
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+version = 2
+definition = fabtotum
+name = Normal Quality
+
+[metadata]
+type = quality
+setting_version = 2
+material = generic_fabtotum_abs
+quality_type = normal
+weight = 0
+
+[values]
+adhesion_type = raft
+layer_height = 0.15
+layer_height_0 = 0.15
+cool_fan_enabled = True
+cool_fan_full_at_height = 0.3
+cool_fan_speed = 50
+cool_fan_speed_max = 50
+cool_fan_speed_min = 50
+cool_min_layer_time = 3
+cool_min_speed = 20
+
diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg
new file mode 100644
index 0000000000..c6e2d11dc7
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg
@@ -0,0 +1,57 @@
+[general]
+version = 2
+name = Fast Quality
+definition = fabtotum
+
+[metadata]
+type = quality
+material = generic_fabtotum_nylon
+quality_type = fast
+weight = -1
+setting_version = 2
+
+[values]
+adhesion_type = raft
+brim_width = 4
+cool_fan_enabled = False
+cool_fan_full_at_height = 0.45
+cool_fan_speed = 0
+cool_fan_speed_max = 0
+cool_fan_speed_min = 0
+cool_min_layer_time = 5
+cool_min_speed = 0
+infill_overlap = 15
+infill_sparse_density = 24
+layer_height = 0.20
+layer_height_0 = 0.15
+line_width = =machine_nozzle_size
+material_flow = 100
+raft_airgap = 0.22
+raft_base_line_width= =line_width * 2
+raft_base_thickness = =layer_height_0 * 2
+raft_interface_line_width  = =line_width
+raft_interface_thickness = =layer_height
+raft_margin = 5
+raft_surface_layers = 2
+raft_surface_line_width = =line_width
+raft_surface_thickness = =layer_height
+retraction_hop = 0.5
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 10
+skirt_brim_minimal_length = 75
+skirt_gap = 1.5
+skirt_line_count = 5
+speed_infill = =speed_print
+speed_layer_0 = 25
+speed_print = 50
+speed_topbottom = 40
+speed_travel = 200
+speed_wall_0 = 40
+speed_wall_x = =speed_print
+support_angle = 70
+support_type = buildplate
+support_z_distance = 0.15
+top_bottom_thickness = 0.8
+wall_thickness = 0.8
+z_seam_type = random
\ No newline at end of file
diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg
new file mode 100644
index 0000000000..9264dc6f71
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg
@@ -0,0 +1,57 @@
+[general]
+version = 2
+name = High Quality
+definition = fabtotum
+
+[metadata]
+type = quality
+material = generic_fabtotum_nylon
+quality_type = high
+weight = 1
+setting_version = 2
+
+[values]
+adhesion_type = raft
+brim_width = 4
+cool_fan_enabled = False
+cool_fan_full_at_height = 0.45
+cool_fan_speed = 0
+cool_fan_speed_max = 0
+cool_fan_speed_min = 0
+cool_min_layer_time = 5
+cool_min_speed = 0
+infill_overlap = 15
+infill_sparse_density = 24
+layer_height = 0.10
+layer_height_0 = 0.10
+line_width = =machine_nozzle_size
+material_flow = 100
+raft_airgap = 0.22
+raft_base_line_width= =line_width * 2
+raft_base_thickness = =layer_height_0 * 2
+raft_interface_line_width  = =line_width
+raft_interface_thickness = =layer_height
+raft_margin = 5
+raft_surface_layers = 2
+raft_surface_line_width = =line_width
+raft_surface_thickness = =layer_height
+retraction_hop = 0.5
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 10
+skirt_brim_minimal_length = 75
+skirt_gap = 1.5
+skirt_line_count = 5
+speed_infill = =speed_print
+speed_layer_0 = 25
+speed_print = 50
+speed_topbottom = 40
+speed_travel = 200
+speed_wall_0 = 40
+speed_wall_x = =speed_print
+support_angle = 70
+support_type = buildplate
+support_z_distance = 0.15
+top_bottom_thickness = 0.8
+wall_thickness = 0.8
+z_seam_type = random
\ No newline at end of file
diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg
new file mode 100644
index 0000000000..5f1e9b3a61
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg
@@ -0,0 +1,58 @@
+[general]
+version = 2
+name = Normal Quality
+definition = fabtotum
+
+[metadata]
+type = quality
+material = generic_fabtotum_nylon
+quality_type = normal
+weight = 0
+setting_version = 2
+
+[values]
+adhesion_type = raft
+brim_width = 4
+cool_fan_enabled = False
+cool_fan_full_at_height = 0.45
+cool_fan_speed = 0
+cool_fan_speed_max = 0
+cool_fan_speed_min = 0
+cool_min_layer_time = 5
+cool_min_speed = 0
+infill_overlap = 15
+infill_sparse_density = 24
+layer_height = 0.15
+layer_height_0 = 0.10
+line_width = =machine_nozzle_size
+material_flow = 100
+raft_airgap = 0.22
+raft_base_line_width= =line_width * 2
+raft_base_thickness = =layer_height_0 * 2
+raft_interface_line_width  = =line_width
+raft_interface_thickness = =layer_height
+raft_margin = 5
+raft_surface_layers = 2
+raft_surface_line_width = =line_width
+raft_surface_thickness = =layer_height
+retraction_hop = 0.5
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 10
+skirt_brim_minimal_length = 75
+skirt_gap = 1.5
+skirt_line_count = 5
+speed_infill = =speed_print
+speed_layer_0 = 25
+speed_print = 50
+speed_topbottom = 40
+speed_travel = 200
+speed_wall_0 = 40
+speed_wall_x = =speed_print
+support_angle = 70
+support_type = buildplate
+support_z_distance = 0.15
+top_bottom_thickness = 0.8
+wall_thickness = 0.8
+z_seam_type = random
+
diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg
new file mode 100644
index 0000000000..fd9b12e3f7
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+version = 2
+definition = fabtotum
+name = Fast Quality
+
+[metadata]
+type = quality
+setting_version = 2
+material = generic_fabtotum_pla
+quality_type = fast
+weight = -1
+
+[values]
+adhesion_type = skirt
+layer_height = 0.2
+layer_height_0 = 0.2
+cool_fan_enabled = True
+cool_fan_full_at_height = 0.4
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_fan_speed_min = 100
+cool_min_layer_time = 5
+cool_min_speed = 20
+
diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg
new file mode 100644
index 0000000000..31fb345f5e
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+version = 2
+definition = fabtotum
+name = High Quality
+
+[metadata]
+type = quality
+setting_version = 2
+material = generic_fabtotum_pla
+quality_type = high
+weight = 1
+
+[values]
+adhesion_type = skirt
+layer_height = 0.1
+layer_height_0 = 0.1
+cool_fan_enabled = True
+cool_fan_full_at_height = 0.2
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_fan_speed_min = 100
+cool_min_layer_time = 5
+cool_min_speed = 20
+
diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg
new file mode 100644
index 0000000000..194c1efd03
--- /dev/null
+++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+version = 2
+definition = fabtotum
+name = Normal Quality
+
+[metadata]
+type = quality
+setting_version = 2
+material = generic_fabtotum_pla
+quality_type = normal
+weight = 0
+
+[values]
+adhesion_type = skirt
+layer_height = 0.15
+layer_height_0 = 0.15
+cool_fan_enabled = True
+cool_fan_full_at_height = 0.3
+cool_fan_speed = 100
+cool_fan_speed_max = 100
+cool_fan_speed_min = 100
+cool_min_layer_time = 5
+cool_min_speed = 20
+
diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
index 1a7bbc79a9..d96af5a2db 100644
--- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
@@ -11,11 +11,12 @@ quality_type = high
 setting_version = 2
 
 [values]
-layer_height = 0.06
-wall_thickness = 0.88
-top_bottom_thickness = 0.72
-infill_sparse_density = 22
-speed_print = 30
-speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 5
 cool_min_speed = 10
+infill_sparse_density = 22
+layer_height = 0.06
+speed_layer_0 = =round(speed_print * 30 / 30)
+speed_print = 30
+top_bottom_thickness = 0.72
+wall_thickness = 0.88
+
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
index 4618a37d2f..67bb88d190 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
@@ -11,14 +11,15 @@ quality_type = fast
 setting_version = 2
 
 [values]
-layer_height = 0.15
-wall_thickness = 0.7
-top_bottom_thickness = 0.75
-infill_sparse_density = 18
-speed_print = 60
-speed_layer_0 = =round(speed_print * 30 / 60)
-speed_wall = 50
-speed_topbottom = 30
-speed_travel = 150
 cool_min_layer_time = 5
 cool_min_speed = 10
+infill_sparse_density = 18
+layer_height = 0.15
+speed_layer_0 = =round(speed_print * 30 / 60)
+speed_print = 60
+speed_topbottom = 30
+speed_travel = 150
+speed_wall = 50
+top_bottom_thickness = 0.75
+wall_thickness = 0.7
+
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
index e5239e9a46..78a4f8affd 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
@@ -11,12 +11,13 @@ quality_type = high
 setting_version = 2
 
 [values]
-layer_height = 0.06
-wall_thickness = 1.05
-top_bottom_thickness = 0.72
-infill_sparse_density = 22
-speed_print = 50
-speed_layer_0 = =round(speed_print * 30 / 50)
-speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10
+infill_sparse_density = 22
+layer_height = 0.06
+speed_layer_0 = =round(speed_print * 30 / 50)
+speed_print = 50
+speed_topbottom = 20
+top_bottom_thickness = 0.72
+wall_thickness = 1.05
+
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
index 2b4a47b99c..1489b60916 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
@@ -11,12 +11,13 @@ quality_type = normal
 setting_version = 2
 
 [values]
-layer_height = 0.1
-wall_thickness = 1.05
-top_bottom_thickness = 0.8
-infill_sparse_density = 20
-speed_print = 50
-speed_layer_0 = =round(speed_print * 30 / 50)
-speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10
+infill_sparse_density = 20
+layer_height = 0.1
+speed_layer_0 = =round(speed_print * 30 / 50)
+speed_print = 50
+speed_topbottom = 20
+top_bottom_thickness = 0.8
+wall_thickness = 1.05
+
diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
index b6b2f1392f..0bd094345d 100644
--- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
@@ -11,14 +11,15 @@ quality_type = normal
 setting_version = 2
 
 [values]
-layer_height = 0.15
-wall_thickness = 1.59
-top_bottom_thickness = 1.2
-infill_sparse_density = 20
-speed_print = 55
-speed_layer_0 = =round(speed_print * 30 / 55)
-speed_wall = 40
-speed_wall_0 = 25
-speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10
+infill_sparse_density = 20
+layer_height = 0.15
+speed_layer_0 = =round(speed_print * 30 / 55)
+speed_print = 55
+speed_topbottom = 20
+speed_wall = 40
+speed_wall_0 = 25
+top_bottom_thickness = 1.2
+wall_thickness = 1.59
+
diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
index 23616e6b39..1fb5e9e3ea 100644
--- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
@@ -11,12 +11,13 @@ quality_type = fast
 setting_version = 2
 
 [values]
-layer_height = 0.2
-wall_thickness = 2.1
-top_bottom_thickness = 1.2
-infill_sparse_density = 20
-speed_print = 40
-speed_layer_0 = =round(speed_print * 30 / 40)
-speed_wall_0 = 25
 cool_min_layer_time = 5
 cool_min_speed = 10
+infill_sparse_density = 20
+layer_height = 0.2
+speed_layer_0 = =round(speed_print * 30 / 40)
+speed_print = 40
+speed_wall_0 = 25
+top_bottom_thickness = 1.2
+wall_thickness = 2.1
+
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
index 20fa84d691..e9c50b6512 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
@@ -11,15 +11,14 @@ quality_type = high
 setting_version = 2
 
 [values]
-layer_height = 0.06
-wall_thickness = 0.88
-top_bottom_thickness = 0.72
-infill_sparse_density = 22
-speed_print = 30
-speed_layer_0 = =round(speed_print * 30 / 30)
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_speed = 10
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
-
+cool_min_speed = 10
+infill_sparse_density = 22
+layer_height = 0.06
+speed_layer_0 = =round(speed_print * 30 / 30)
+speed_print = 30
+top_bottom_thickness = 0.72
+wall_thickness = 0.88
 
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
index 88eed9f9e8..fa3dbaa7b7 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
@@ -11,17 +11,17 @@ quality_type = fast
 setting_version = 2
 
 [values]
-layer_height = 0.15
-wall_thickness = 0.7
-top_bottom_thickness = 0.75
+cool_fan_speed_min = =cool_fan_speed * 0.2
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
 infill_sparse_density = 18
-speed_print = 55
+layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 55)
-speed_wall = 40
+speed_print = 55
 speed_topbottom = 30
 speed_travel = 150
-cool_min_layer_time = 3
-cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_speed = 10
-cool_min_layer_time_fan_speed_max = 15
+speed_wall = 40
+top_bottom_thickness = 0.75
+wall_thickness = 0.7
 
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
index 3af57d6a09..c125eb7193 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
@@ -11,15 +11,15 @@ quality_type = high
 setting_version = 2
 
 [values]
-layer_height = 0.06
-wall_thickness = 1.05
-top_bottom_thickness = 0.72
-infill_sparse_density = 22
-speed_print = 45
-speed_layer_0 = =round(speed_print * 30 / 45)
-speed_wall = 30
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_speed = 10
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 22
+layer_height = 0.06
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_wall = 30
+top_bottom_thickness = 0.72
+wall_thickness = 1.05
 
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
index ca57521636..bac5e2ed6c 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
@@ -11,14 +11,15 @@ quality_type = normal
 setting_version = 2
 
 [values]
-layer_height = 0.1
-wall_thickness = 1.05
-top_bottom_thickness = 0.8
-infill_sparse_density = 20
-speed_print = 45
-speed_layer_0 = =round(speed_print * 30 / 45)
-speed_wall = 30
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_speed = 10
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+layer_height = 0.1
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_wall = 30
+top_bottom_thickness = 0.8
+wall_thickness = 1.05
+
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
index b9232c850c..0683e6c8dd 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
@@ -11,16 +11,15 @@ quality_type = normal
 setting_version = 2
 
 [values]
-layer_height = 0.15
-wall_thickness = 1.59
-top_bottom_thickness = 1.2
-infill_sparse_density = 20
-speed_print = 40
-speed_layer_0 = =round(speed_print * 30 / 40)
-speed_infill = 55
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.5
-cool_min_speed = 20
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 20
-
+cool_min_speed = 20
+infill_sparse_density = 20
+layer_height = 0.15
+speed_infill = 55
+speed_layer_0 = =round(speed_print * 30 / 40)
+speed_print = 40
+top_bottom_thickness = 1.2
+wall_thickness = 1.59
 
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
index b3c4ed84c1..072ea6e61f 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
@@ -11,14 +11,14 @@ quality_type = fast
 setting_version = 2
 
 [values]
-layer_height = 0.2
-wall_thickness = 2.1
-top_bottom_thickness = 1.2
-infill_sparse_density = 20
-speed_print = 40
-speed_layer_0 = =round(speed_print * 30 / 40)
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.5
-cool_min_speed = 15
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 25
+cool_min_speed = 15
+infill_sparse_density = 20
+layer_height = 0.2
+speed_layer_0 = =round(speed_print * 30 / 40)
+speed_print = 40
+top_bottom_thickness = 1.2
+wall_thickness = 2.1
 
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
index c8f82ea938..afc0d2f301 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
@@ -11,14 +11,14 @@ quality_type = high
 setting_version = 2
 
 [values]
-layer_height = 0.06
-wall_thickness = 0.88
-top_bottom_thickness = 0.72
-infill_sparse_density = 22
-speed_print = 30
-speed_layer_0 = =round(speed_print * 30 / 30)
-cool_min_layer_time = 2
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_speed = 15
+cool_min_layer_time = 2
 cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 15
+infill_sparse_density = 22
+layer_height = 0.06
+speed_layer_0 = =round(speed_print * 30 / 30)
+speed_print = 30
+top_bottom_thickness = 0.72
+wall_thickness = 0.88
 
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
index e3bb676205..d3fb7fabf5 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
@@ -11,17 +11,16 @@ quality_type = fast
 setting_version = 2
 
 [values]
-layer_height = 0.15
-wall_thickness = 0.7
-top_bottom_thickness = 0.75
-infill_sparse_density = 18
-speed_print = 45
-speed_layer_0 = =round(speed_print * 30 / 45)
-speed_wall = 40
-speed_travel = 150
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.8
-cool_min_speed = 10
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
-
+cool_min_speed = 10
+infill_sparse_density = 18
+layer_height = 0.15
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_travel = 150
+speed_wall = 40
+top_bottom_thickness = 0.75
+wall_thickness = 0.7
 
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
index 73c613fd85..7ff03a4f4e 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
@@ -11,14 +11,15 @@ quality_type = high
 setting_version = 2
 
 [values]
-layer_height = 0.06
-wall_thickness = 1.05
-top_bottom_thickness = 0.72
-infill_sparse_density = 22
-speed_print = 45
-speed_layer_0 = =round(speed_print * 30 / 45)
-speed_wall = 30
-cool_min_layer_time = 2
 cool_fan_speed_min = =cool_fan_speed * 0.8
-cool_min_speed = 15
+cool_min_layer_time = 2
 cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 15
+infill_sparse_density = 22
+layer_height = 0.06
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_wall = 30
+top_bottom_thickness = 0.72
+wall_thickness = 1.05
+
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
index fa708fea78..6773ea2ad4 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
@@ -11,15 +11,15 @@ quality_type = normal
 setting_version = 2
 
 [values]
-layer_height = 0.1
-wall_thickness = 1.05
-top_bottom_thickness = 0.8
-infill_sparse_density = 20
-speed_print = 45
-speed_layer_0 = =round(speed_print * 30 / 45)
-speed_wall = 30
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.8
-cool_min_speed = 10
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+layer_height = 0.1
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_wall = 30
+top_bottom_thickness = 0.8
+wall_thickness = 1.05
 
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
index 268fb9571f..bd118793bc 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
@@ -11,13 +11,14 @@ quality_type = normal
 setting_version = 2
 
 [values]
-layer_height = 0.15
-wall_thickness = 1.59
-top_bottom_thickness = 1.2
-infill_sparse_density = 20
-speed_print = 40
-speed_layer_0 = =round(speed_print * 30 / 40)
-cool_min_layer_time = 5
 cool_fan_speed_min = =cool_fan_speed * 0.8
-cool_min_speed = 8
+cool_min_layer_time = 5
 cool_min_layer_time_fan_speed_max = 20
+cool_min_speed = 8
+infill_sparse_density = 20
+layer_height = 0.15
+speed_layer_0 = =round(speed_print * 30 / 40)
+speed_print = 40
+top_bottom_thickness = 1.2
+wall_thickness = 1.59
+
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
index 585680b387..840876899e 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
@@ -11,13 +11,14 @@ quality_type = fast
 setting_version = 2
 
 [values]
-layer_height = 0.2
-wall_thickness = 2.1
-top_bottom_thickness = 1.2
-infill_sparse_density = 20
-speed_print = 40
-speed_layer_0 = =round(speed_print * 30 / 40)
-cool_min_layer_time = 3
 cool_fan_speed_min = =cool_fan_speed * 0.8
-cool_min_speed = 8
+cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 25
+cool_min_speed = 8
+infill_sparse_density = 20
+layer_height = 0.2
+speed_layer_0 = =round(speed_print * 30 / 40)
+speed_print = 40
+top_bottom_thickness = 1.2
+wall_thickness = 2.1
+
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 25e1190d16..63b65343a9 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
@@ -11,33 +11,33 @@ quality_type = draft
 setting_version = 2
 
 [values]
-speed_wall_x = 25
-support_z_distance = 0.26
-raft_interface_line_spacing = 1
-cool_min_speed = 8
-cool_fan_speed = 50
-wall_thickness = 1.14
-raft_margin = 15
-speed_layer_0 = 15
-raft_airgap = 0.37
-infill_overlap = 5
-layer_height = 0.2
-raft_interface_line_width = 0.8
-top_bottom_thickness = 1.5
-cool_fan_speed_min = =cool_fan_speed * 25 / 50
-raft_surface_line_width = 0.38
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-speed_wall_0 = 20
 adhesion_type = raft
+cool_fan_speed = 50
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
+cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-cool_min_layer_time = 3
-speed_print = 25
+layer_height = 0.2
 line_width = 0.38
-support_angle = 45
+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 = 15
+speed_print = 25
+speed_topbottom = 20
+speed_wall_0 = 20
+speed_wall_x = 25
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.26
+top_bottom_thickness = 1.5
+wall_thickness = 1.14
 
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 f0dab0b80b..b588b572c2 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
@@ -11,33 +11,33 @@ quality_type = normal
 setting_version = 2
 
 [values]
-speed_wall_x = 30
-support_z_distance = 0.26
-raft_interface_line_spacing = 1
-cool_min_speed = 8
-cool_fan_speed = 50
-wall_thickness = 1.14
-raft_margin = 15
-speed_layer_0 = 15
-raft_airgap = 0.37
-infill_overlap = 5
-layer_height = 0.15
-raft_interface_line_width = 0.8
-top_bottom_thickness = 1.5
-cool_fan_speed_min = =cool_fan_speed * 25 / 50
-raft_surface_line_width = 0.38
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-speed_wall_0 = 20
 adhesion_type = raft
+cool_fan_speed = 50
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
+cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-cool_min_layer_time = 3
-speed_print = 35
+layer_height = 0.15
 line_width = 0.38
-support_angle = 45
+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 = 15
+speed_print = 35
+speed_topbottom = 20
+speed_wall_0 = 20
+speed_wall_x = 30
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.26
+top_bottom_thickness = 1.5
+wall_thickness = 1.14
 
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 09f540395b..e901295acd 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
@@ -11,37 +11,37 @@ quality_type = draft
 setting_version = 2
 
 [values]
-support_xy_distance = 0.6
-speed_travel = 150
-support_z_distance = 0.22
-speed_wall_x = 25
-cool_min_speed = 8
-cool_fan_speed = 45
-raft_surface_thickness = 0.2
-raft_surface_line_width = 0.57
-raft_interface_line_spacing = 1.4
-raft_margin = 15
-raft_airgap = 0.37
-infill_overlap = 5
-layer_height = 0.3
-raft_base_line_spacing = 2.4
-raft_interface_line_width = 1.2
-speed_wall_0 = 20
-cool_fan_speed_min = =cool_fan_speed * 25 / 45
-wall_thickness = 1.14
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-infill_sparse_density = 35
-top_bottom_thickness = 0.75
 adhesion_type = raft
-line_width = 0.57
-layer_0_z_overlap = 0.22
-raft_base_line_width = 1.2
-speed_print = 25
-speed_layer_0 = =round(speed_print * 30 / 50)
-support_line_distance = 2.85
-support_angle = 45
+cool_fan_speed = 45
+cool_fan_speed_min = =cool_fan_speed * 25 / 45
 cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
+infill_sparse_density = 35
+layer_0_z_overlap = 0.22
+layer_height = 0.3
+line_width = 0.57
+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 = 20
+speed_travel = 150
+speed_wall_0 = 20
+speed_wall_x = 25
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_line_distance = 2.85
+support_pattern = lines
+support_xy_distance = 0.6
+support_z_distance = 0.22
+top_bottom_thickness = 0.75
+wall_thickness = 1.14
 
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 055177e14e..3120eec993 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
@@ -11,37 +11,37 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_xy_distance = 0.6
-speed_travel = 150
-support_z_distance = 0.22
-speed_wall_x = 35
-cool_min_speed = 8
-cool_fan_speed = 45
-raft_surface_thickness = 0.2
-raft_surface_line_width = 0.57
-raft_interface_line_spacing = 1.4
-raft_margin = 15
-speed_layer_0 = 30
-raft_airgap = 0.37
-infill_overlap = 5
-layer_height = 0.22
-raft_base_line_spacing = 2.4
-raft_interface_line_width = 1.2
-speed_wall_0 = 30
-cool_fan_speed_min = =cool_fan_speed * 25 / 45
-wall_thickness = 1.14
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-infill_sparse_density = 35
-top_bottom_thickness = 0.75
 adhesion_type = raft
-line_width = 0.57
-layer_0_z_overlap = 0.22
-raft_base_line_width = 1.2
-speed_print = 35
-support_line_distance = 2.85
-support_angle = 45
+cool_fan_speed = 45
+cool_fan_speed_min = =cool_fan_speed * 25 / 45
 cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
+infill_sparse_density = 35
+layer_0_z_overlap = 0.22
+layer_height = 0.22
+line_width = 0.57
+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 = 30
+speed_print = 35
+speed_topbottom = 20
+speed_travel = 150
+speed_wall_0 = 30
+speed_wall_x = 35
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_line_distance = 2.85
+support_pattern = lines
+support_xy_distance = 0.6
+support_z_distance = 0.22
+top_bottom_thickness = 0.75
+wall_thickness = 1.14
 
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 795867c59c..1f532ae167 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
@@ -11,32 +11,32 @@ quality_type = draft
 setting_version = 2
 
 [values]
-support_z_distance = 0.26
-speed_wall_x = 25
-cool_fan_speed = 50
-raft_surface_thickness = 0.2
-raft_surface_line_width = 0.7
-raft_interface_line_spacing = 1.8
-raft_airgap = 0.37
-infill_overlap = 5
-layer_height = 0.3
-raft_interface_line_width = 1.6
-top_bottom_thickness = 1.2
-cool_fan_speed_min = =cool_fan_speed * 25 / 50
-brim_line_count = 10
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 10
+cool_fan_speed = 50
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
+cool_min_layer_time = 3
+infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
+layer_height = 0.3
+raft_airgap = 0.37
 raft_base_line_width = 1.6
-speed_print = 25
+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 = 20
 speed_wall_0 = 20
+speed_wall_x = 25
 support_angle = 45
-cool_min_layer_time = 3
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.26
+top_bottom_thickness = 1.2
 wall_thickness = 2.1
 
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 a40b30730d..07f1c73544 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
@@ -11,32 +11,32 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_z_distance = 0.26
-speed_wall_x = 30
-cool_fan_speed = 50
-raft_surface_thickness = 0.2
-raft_surface_line_width = 0.7
-raft_interface_line_spacing = 1.8
-raft_airgap = 0.37
-infill_overlap = 5
-layer_height = 0.2
-raft_interface_line_width = 1.6
-top_bottom_thickness = 1.2
-cool_fan_speed_min = =cool_fan_speed * 25 / 50
-brim_line_count = 10
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 10
+cool_fan_speed = 50
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
+cool_min_layer_time = 3
+infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
+layer_height = 0.2
+raft_airgap = 0.37
 raft_base_line_width = 1.6
-speed_print = 30
+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 = 20
 speed_wall_0 = 20
+speed_wall_x = 30
 support_angle = 45
-cool_min_layer_time = 3
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.26
+top_bottom_thickness = 1.2
 wall_thickness = 2.1
 
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 569ddb69bf..3a59a51085 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
@@ -11,34 +11,34 @@ quality_type = high
 setting_version = 2
 
 [values]
-support_xy_distance = 0.6
-speed_travel = 150
-cool_fan_speed = 60
-support_z_distance = 0.45
-speed_wall_x = 40
-cool_min_speed = 15
-raft_surface_line_width = 0.2
-raft_interface_line_width = 0.5
-brim_line_count = 8
-raft_margin = 15
-speed_layer_0 = 30
-raft_airgap = 0.15
-infill_overlap = 5
-layer_height = 0.06
-raft_interface_line_spacing = 0.7
-speed_support = 40
-top_bottom_thickness = 1.2
-cool_fan_speed_min = =cool_fan_speed * 35 / 60
-wall_thickness = 1
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 35
-support_enable = True
-retraction_hop_enabled = 0.2
-speed_wall_0 = 20
 adhesion_type = raft
+brim_line_count = 8
+cool_fan_speed = 60
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.1
+layer_height = 0.06
+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 = 30
 speed_print = 40
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 20
+speed_wall_x = 40
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_xy_distance = 0.6
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 1
 
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 740205d102..e5bad30383 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
@@ -11,34 +11,34 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_xy_distance = 0.6
-speed_travel = 150
-cool_fan_speed = 60
-support_z_distance = 0.45
-speed_wall_x = 40
-cool_min_speed = 15
-raft_surface_line_width = 0.2
-raft_interface_line_width = 0.5
-brim_line_count = 8
-raft_margin = 15
-speed_layer_0 = 30
-raft_airgap = 0.15
-infill_overlap = 5
-layer_height = 0.1
-raft_interface_line_spacing = 0.7
-speed_support = 40
-top_bottom_thickness = 1.2
-cool_fan_speed_min = =cool_fan_speed * 35 / 60
-wall_thickness = 1
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 35
-support_enable = True
-retraction_hop_enabled = 0.2
-speed_wall_0 = 20
 adhesion_type = raft
+brim_line_count = 8
+cool_fan_speed = 60
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.1
+layer_height = 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 = 30
 speed_print = 40
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 20
+speed_wall_x = 40
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_xy_distance = 0.6
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 1
 
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 143f8c1a71..4fec2d54bd 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
@@ -11,33 +11,33 @@ quality_type = fast
 setting_version = 2
 
 [values]
-support_xy_distance = 0.6
-speed_travel = 150
-support_z_distance = 0.45
-raft_interface_line_spacing = 1
-cool_min_speed = 15
-raft_surface_thickness = 0.15
-raft_surface_line_width = 0.5
-speed_layer_0 = 30
-raft_airgap = 0.57
-infill_overlap = 5
-layer_height = 0.2
-raft_interface_line_width = 0.8
-top_bottom_thickness = 0.75
-cool_fan_speed_min = =cool_fan_speed * 0.35
-wall_thickness = 1.06
-support_pattern = lines
-support_infill_rate = 25
-speed_topbottom = 20
-support_enable = True
-speed_wall = 40
-raft_margin = 15
 adhesion_type = raft
+cool_fan_speed_min = =cool_fan_speed * 0.35
+cool_min_layer_time = 3
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
+layer_height = 0.2
+raft_airgap = 0.57
 raft_base_line_spacing = 1.6
-speed_print = 45
-support_angle = 45
-cool_min_layer_time = 3
 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 = 30
+speed_print = 45
+speed_topbottom = 20
+speed_travel = 150
+speed_wall = 40
+support_angle = 45
+support_enable = True
+support_infill_rate = 25
+support_pattern = lines
+support_xy_distance = 0.6
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 0.75
+wall_thickness = 1.06
 
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 d406a8fa7f..c8ade1ce20 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
@@ -11,32 +11,32 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_xy_distance = 0.6
-speed_travel = 150
-support_z_distance = 0.45
-raft_interface_line_spacing = 1
-cool_min_speed = 15
-raft_surface_thickness = 0.15
-raft_surface_line_width = 0.5
-speed_layer_0 = 30
-raft_airgap = 0.57
-infill_overlap = 5
-layer_height = 0.15
-raft_interface_line_width = 0.8
-top_bottom_thickness = 0.75
-cool_fan_speed_min = =cool_fan_speed * 0.35
-wall_thickness = 1.06
-support_pattern = lines
-support_infill_rate = 25
-support_enable = True
-speed_wall = 40
-raft_margin = 15
 adhesion_type = raft
+cool_fan_speed_min = =cool_fan_speed * 0.35
+cool_min_layer_time = 3
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
+layer_height = 0.15
+raft_airgap = 0.57
 raft_base_line_spacing = 1.6
-speed_print = 45
-support_angle = 45
-cool_min_layer_time = 3
 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 = 30
+speed_print = 45
+speed_travel = 150
+speed_wall = 40
+support_angle = 45
+support_enable = True
+support_infill_rate = 25
+support_pattern = lines
+support_xy_distance = 0.6
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 0.75
+wall_thickness = 1.06
 
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 f3f9fddfbe..8d804390b1 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
@@ -11,37 +11,38 @@ quality_type = fast
 setting_version = 2
 
 [values]
-support_xy_distance = 0.7
-speed_travel = 150
-speed_wall_x = 40
-cool_min_speed = 15
-support_top_distance = 0.55
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
-brim_line_count = 8
-speed_layer_0 = 30
-raft_interface_line_spacing = 1.4
-infill_overlap = 5
-layer_height = 0.3
-raft_interface_line_width = 1.2
-speed_support = 40
-speed_wall_0 = 15
-cool_fan_speed_min = =cool_fan_speed * 0.35
-wall_thickness = 1.2
-support_pattern = lines
-support_infill_rate = 25
-speed_topbottom = 35
-support_enable = True
-retraction_hop_enabled = 0.2
-support_bottom_distance = 0.55
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 8
+cool_fan_speed_min = =cool_fan_speed * 0.35
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-top_bottom_thickness = 1.2
-speed_print = 55
+layer_height = 0.3
 raft_airgap = 0.44
-support_angle = 45
 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 = 30
+speed_print = 55
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 15
+speed_wall_x = 40
+support_angle = 45
+support_bottom_distance = 0.55
+support_enable = True
+support_infill_rate = 25
+support_pattern = lines
+support_top_distance = 0.55
+support_xy_distance = 0.7
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 1.2
 
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 6810970eb5..4f16ed5962 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
@@ -11,36 +11,36 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_xy_distance = 0.7
-speed_travel = 150
-support_z_distance = 0.55
-speed_wall_x = 40
-cool_min_speed = 15
-raft_surface_line_width = 0.6
-raft_surface_thickness = 0.15
-brim_line_count = 8
-speed_layer_0 = 30
-raft_interface_line_spacing = 1.4
-infill_overlap = 5
-layer_height = 0.15
-raft_interface_line_width = 1.2
-speed_support = 40
-speed_wall_0 = 15
-cool_fan_speed_min = =cool_fan_speed * 0.35
-wall_thickness = 1.2
-support_pattern = lines
-support_infill_rate = 25
-speed_topbottom = 35
-support_enable = True
-retraction_hop_enabled = 0.2
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 8
+cool_fan_speed_min = =cool_fan_speed * 0.35
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-top_bottom_thickness = 1.2
-speed_print = 55
+layer_height = 0.15
 raft_airgap = 0.44
-support_angle = 45
 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 = 30
+speed_print = 55
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 15
+speed_wall_x = 40
+support_angle = 45
+support_enable = True
+support_infill_rate = 25
+support_pattern = lines
+support_xy_distance = 0.7
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 1.2
 
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 aaba4b8a50..bff383cfa3 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
@@ -11,37 +11,37 @@ quality_type = draft
 setting_version = 2
 
 [values]
-support_xy_distance = 0.75
-speed_travel = 150
-support_z_distance = 0.5
-speed_wall_x = 40
-cool_min_speed = 15
-brim_line_count = 8
-support_top_distance = 0.5
-raft_surface_thickness = 0.2
-wall_thickness = 2.4
-raft_margin = 15
-speed_layer_0 = 30
-raft_airgap = 0.44
-infill_overlap = 5
-layer_height = 0.3
-raft_interface_line_width = 1.6
-speed_support = 40
-speed_wall_0 = 15
-cool_fan_speed_min = =cool_fan_speed * 0.35
-raft_surface_line_width = 0.7
-support_pattern = lines
-support_infill_rate = 25
-speed_topbottom = 35
-support_enable = True
-retraction_hop_enabled = 0.2
-support_bottom_distance = 0.65
-top_bottom_thickness = 1.2
 adhesion_type = raft
+brim_line_count = 8
+cool_fan_speed_min = =cool_fan_speed * 0.35
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.25
+layer_height = 0.3
+raft_airgap = 0.44
 raft_base_line_width = 1.6
-speed_print = 55
-support_angle = 45
 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 = 30
+speed_print = 55
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 15
+speed_wall_x = 40
+support_angle = 45
+support_bottom_distance = 0.65
+support_enable = True
+support_infill_rate = 25
+support_pattern = lines
+support_top_distance = 0.5
+support_xy_distance = 0.75
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 2.4
 
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 fae14c8266..40f8895a39 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
@@ -11,37 +11,37 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_xy_distance = 0.75
-speed_travel = 150
-support_z_distance = 0.5
-speed_wall_x = 40
-cool_min_speed = 15
-brim_line_count = 8
-support_top_distance = 0.5
-raft_surface_thickness = 0.2
-wall_thickness = 2.4
-raft_margin = 15
-raft_airgap = 0.44
-infill_overlap = 5
-layer_height = 0.2
-raft_interface_line_width = 1.6
-speed_support = 40
-speed_wall_0 = 15
-cool_fan_speed_min = =cool_fan_speed * 0.35
-raft_surface_line_width = 0.7
-support_pattern = lines
-support_infill_rate = 25
-speed_topbottom = 35
-support_enable = True
-retraction_hop_enabled = 0.2
-support_bottom_distance = 0.65
-top_bottom_thickness = 1.2
 adhesion_type = raft
+brim_line_count = 8
+cool_fan_speed_min = =cool_fan_speed * 0.35
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.25
+layer_height = 0.2
+raft_airgap = 0.44
 raft_base_line_width = 1.6
-speed_print = 55
-speed_layer_0 = =round(speed_print * 30 / 55)
-support_angle = 45
 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
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 15
+speed_wall_x = 40
+support_angle = 45
+support_bottom_distance = 0.65
+support_enable = True
+support_infill_rate = 25
+support_pattern = lines
+support_top_distance = 0.5
+support_xy_distance = 0.75
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 2.4
 
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 97b5446d10..0ca3e8aedb 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
@@ -11,27 +11,28 @@ quality_type = high
 setting_version = 2
 
 [values]
-support_z_distance = 0.19
-raft_interface_line_spacing = 0.7
-cool_min_speed = 15
-cool_fan_speed = 50
-raft_surface_line_width = 0.2
-wall_thickness = 0.88
-raft_airgap = 0.25
-infill_overlap = 5
-layer_height = 0.06
-raft_interface_line_width = 0.5
-cool_fan_speed_min = 0
-brim_line_count = 32
-support_pattern = lines
-support_infill_rate = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 32
+cool_fan_speed = 50
+cool_fan_speed_min = 0
+cool_min_layer_time = 2
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.2
-cool_min_layer_time = 2
-speed_print = 30
-speed_layer_0 = =round(speed_print * 30 / 30)
+layer_height = 0.06
+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
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.19
+wall_thickness = 0.88
+
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 57101394b3..39044de32e 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
@@ -11,27 +11,28 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_z_distance = 0.19
-raft_interface_line_spacing = 0.7
-cool_min_speed = 15
-cool_fan_speed = 50
-raft_surface_line_width = 0.2
-wall_thickness = 0.88
-raft_airgap = 0.25
-infill_overlap = 5
-layer_height = 0.1
-raft_interface_line_width = 0.5
-cool_fan_speed_min = 0
-brim_line_count = 32
-support_pattern = lines
-support_infill_rate = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 32
+cool_fan_speed = 50
+cool_fan_speed_min = 0
+cool_min_layer_time = 2
+cool_min_speed = 15
+infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.2
-cool_min_layer_time = 2
-speed_print = 30
-speed_layer_0 = =round(speed_print * 30 / 30)
+layer_height = 0.1
+raft_airgap = 0.25
 raft_base_line_spacing = 1
-raft_base_line_width = 0.5
\ No newline at end of file
+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
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.19
+wall_thickness = 0.88
+
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 334ca6fde2..57374e0c56 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
@@ -11,28 +11,29 @@ quality_type = fast
 setting_version = 2
 
 [values]
-speed_wall_x = 30
-support_z_distance = 0.19
-raft_airgap = 0.35
-cool_min_speed = 8
-cool_fan_speed = 50
-raft_interface_line_spacing = 1
-infill_overlap = 5
-layer_height = 0.2
-raft_interface_line_width = 0.8
-speed_wall_0 = 20
-cool_fan_speed_min = 0
-wall_thickness = 1.2
-support_pattern = lines
-support_infill_rate = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+cool_fan_speed = 50
+cool_fan_speed_min = 0
+cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.3
-cool_min_layer_time = 3
-speed_print = 45
-speed_layer_0 = =round(speed_print * 30 / 45)
-support_angle = 45
+layer_height = 0.2
+raft_airgap = 0.35
 raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
\ No newline at end of file
+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 = 20
+speed_wall_x = 30
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.19
+wall_thickness = 1.2
+
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 0d815cfdc3..b2c4b7e2a3 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
@@ -11,28 +11,29 @@ quality_type = normal
 setting_version = 2
 
 [values]
-speed_wall_x = 30
-support_z_distance = 0.19
-raft_airgap = 0.35
-cool_min_speed = 8
-cool_fan_speed = 50
-raft_interface_line_spacing = 1
-infill_overlap = 5
-layer_height = 0.1
-raft_interface_line_width = 0.8
-speed_wall_0 = 20
-cool_fan_speed_min = 0
-wall_thickness = 1.2
-support_pattern = lines
-support_infill_rate = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+cool_fan_speed = 50
+cool_fan_speed_min = 0
+cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.3
-cool_min_layer_time = 3
-speed_print = 45
-speed_layer_0 = =round(speed_print * 30 / 45)
-support_angle = 45
+layer_height = 0.1
+raft_airgap = 0.35
 raft_base_line_spacing = 1.6
-raft_base_line_width = 0.8
\ No newline at end of file
+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 = 20
+speed_wall_x = 30
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.19
+wall_thickness = 1.2
+
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 0e5cacbeac..73a2324261 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
@@ -11,35 +11,35 @@ quality_type = fast
 setting_version = 2
 
 [values]
-speed_travel = 150
-support_z_distance = 0.21
-speed_wall_x = 40
-cool_min_speed = 8
-cool_fan_speed = 50
-raft_surface_thickness = 0.15
-raft_surface_line_width = 0.6
-raft_interface_line_spacing = 1.4
-speed_layer_0 = 30
-raft_airgap = 0.52
-infill_overlap = 5
-layer_height = 0.3
-raft_interface_line_width = 1.2
-raft_margin = 15
-cool_fan_speed_min = 0
-wall_thickness = 1.06
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-top_bottom_thickness = 0.75
 adhesion_type = raft
+cool_fan_speed = 50
+cool_fan_speed_min = 0
+cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
+layer_height = 0.3
+raft_airgap = 0.52
 raft_base_line_spacing = 2.4
-speed_print = 45
-support_line_distance = 3.5333
-speed_wall_0 = 30
-support_angle = 45
-cool_min_layer_time = 3
 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 = 30
+speed_print = 45
+speed_topbottom = 20
+speed_travel = 150
+speed_wall_0 = 30
+speed_wall_x = 40
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_line_distance = 3.5333
+support_pattern = lines
+support_z_distance = 0.21
+top_bottom_thickness = 0.75
+wall_thickness = 1.06
 
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 3c7f0ef212..c5183c1dde 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
@@ -11,35 +11,35 @@ quality_type = normal
 setting_version = 2
 
 [values]
-speed_travel = 150
-support_z_distance = 0.21
-speed_wall_x = 40
-cool_min_speed = 8
-cool_fan_speed = 50
-raft_surface_thickness = 0.15
-raft_surface_line_width = 0.6
-raft_interface_line_spacing = 1.4
-speed_layer_0 = 30
-raft_airgap = 0.52
-infill_overlap = 5
-layer_height = 0.15
-raft_interface_line_width = 1.2
-raft_margin = 15
-cool_fan_speed_min = 0
-wall_thickness = 1.06
-support_pattern = lines
-support_infill_rate = 20
-speed_topbottom = 20
-support_enable = True
-top_bottom_thickness = 0.75
 adhesion_type = raft
+cool_fan_speed = 50
+cool_fan_speed_min = 0
+cool_min_layer_time = 3
+cool_min_speed = 8
+infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
+layer_height = 0.15
+raft_airgap = 0.52
 raft_base_line_spacing = 2.4
-speed_print = 45
-support_line_distance = 3.5333
-speed_wall_0 = 30
-support_angle = 45
-cool_min_layer_time = 3
 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 = 30
+speed_print = 45
+speed_topbottom = 20
+speed_travel = 150
+speed_wall_0 = 30
+speed_wall_x = 40
+support_angle = 45
+support_enable = True
+support_infill_rate = 20
+support_line_distance = 3.5333
+support_pattern = lines
+support_z_distance = 0.21
+top_bottom_thickness = 0.75
+wall_thickness = 1.06
 
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 280dafa128..05fc16958f 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
@@ -11,29 +11,29 @@ quality_type = draft
 setting_version = 2
 
 [values]
-support_z_distance = 0.26
-raft_airgap = 0.47
-cool_fan_speed = 50
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
-brim_line_count = 10
-raft_interface_line_spacing = 1.8
-infill_overlap = 5
-layer_height = 0.5
-raft_interface_line_width = 1.6
-top_bottom_thickness = 2.0
-cool_fan_speed_min = =cool_fan_speed * 25 / 50
-wall_thickness = 2.1
-support_pattern = lines
-support_infill_rate = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 10
+cool_fan_speed = 50
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
+cool_min_layer_time = 3
+infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
+layer_height = 0.5
+raft_airgap = 0.47
 raft_base_line_width = 1.6
-speed_print = 40
+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
-cool_min_layer_time = 3
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.26
+top_bottom_thickness = 2.0
+wall_thickness = 2.1
 
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 e79d3339f2..b6283d4e71 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
@@ -11,29 +11,29 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_z_distance = 0.26
-raft_airgap = 0.47
-cool_fan_speed = 50
-raft_surface_line_width = 0.7
-raft_surface_thickness = 0.2
-brim_line_count = 10
-raft_interface_line_spacing = 1.8
-infill_overlap = 5
-layer_height = 0.2
-raft_interface_line_width = 1.6
-top_bottom_thickness = 1.2
-cool_fan_speed_min = =cool_fan_speed * 25 / 50
-wall_thickness = 2.1
-support_pattern = lines
-support_infill_rate = 20
-support_enable = True
-raft_margin = 15
 adhesion_type = raft
+brim_line_count = 10
+cool_fan_speed = 50
+cool_fan_speed_min = =cool_fan_speed * 25 / 50
+cool_min_layer_time = 3
+infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
+layer_height = 0.2
+raft_airgap = 0.47
 raft_base_line_width = 1.6
-speed_print = 40
+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
-cool_min_layer_time = 3
+support_enable = True
+support_infill_rate = 20
+support_pattern = lines
+support_z_distance = 0.26
+top_bottom_thickness = 1.2
+wall_thickness = 2.1
 
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.25_normal.inst.cfg
index 0aa08a65b8..4fc0e56abf 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.25_normal.inst.cfg
@@ -12,3 +12,4 @@ setting_version = 2
 supported = False
 
 [values]
+
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
index 558e314581..6b0cd0b200 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@@ -70,4 +70,5 @@ switch_extruder_retraction_speeds = 35
 travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =round(line_width * 0.38 / 0.38, 2)
-wall_thickness = 0.76
\ No newline at end of file
+wall_thickness = 0.76
+
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
index 668899184f..1c596ab98d 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
@@ -69,4 +69,5 @@ switch_extruder_retraction_speeds = 35
 travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =round(line_width * 0.38 / 0.38, 2)
-wall_thickness = 0.76
\ No newline at end of file
+wall_thickness = 0.76
+
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
index f3db281962..88814ba2a4 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@@ -72,4 +72,5 @@ top_bottom_thickness = 1.1
 travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =round(line_width * 0.57 / 0.57, 2)
-wall_thickness = 1.14
\ No newline at end of file
+wall_thickness = 1.14
+
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
index ffefbcf4c7..da1b928482 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@@ -72,4 +72,5 @@ top_bottom_thickness = 1.1
 travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =round(line_width * 0.57 / 0.57, 2)
-wall_thickness = 1.14
\ No newline at end of file
+wall_thickness = 1.14
+
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
index 380c54cbc4..b4e2ddfa96 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@@ -72,4 +72,5 @@ top_bottom_thickness = 1.5
 travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =round(line_width * 0.76 / 0.76, 2)
-wall_thickness = 1.52
\ No newline at end of file
+wall_thickness = 1.52
+
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
index 84a95eab17..f31e0dd192 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@@ -72,4 +72,5 @@ top_bottom_thickness = 1.5
 travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =round(line_width * 0.76 / 0.76, 2)
-wall_thickness = 1.52
\ No newline at end of file
+wall_thickness = 1.52
+
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 afa7c89fd5..d3e4ad515a 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
@@ -11,33 +11,33 @@ quality_type = high
 setting_version = 2
 
 [values]
-support_xy_distance = 0.6
-cool_min_speed = 15
-support_infill_rate = 25
-speed_wall_0 = 15
-layer_0_z_overlap = 0.1
+adhesion_type = brim
+brim_line_count = 8
+cool_fan_speed = 60
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
 cool_min_layer_time = 7
+cool_min_speed = 15
+infill_sparse_density = 10
+layer_0_z_overlap = 0.1
+layer_height = 0.06
+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_hop_enabled = 0.2
 speed_layer_0 = 30
 speed_print = 40
-wall_thickness = 0.88
-support_enable = True
-speed_topbottom = 35
-raft_surface_line_width = 0.2
-raft_base_line_spacing = 1
-top_bottom_thickness = 1.2
-layer_height = 0.06
-support_angle = 45
-infill_sparse_density = 10
-cool_fan_speed = 60
-speed_travel = 150
 speed_support = 40
-support_z_distance = =layer_height * 2
-cool_fan_speed_min = =cool_fan_speed * 35 / 60
-brim_line_count = 8
-retraction_hop_enabled = 0.2
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 15
 speed_wall_x = 38
-raft_airgap = 0.2
-raft_interface_line_spacing = 1
-adhesion_type = brim
-raft_interface_line_width = 0.2
+support_angle = 45
+support_enable = True
+support_infill_rate = 25
+support_xy_distance = 0.6
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 0.88
 
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 205cc25285..7955807721 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
@@ -11,29 +11,30 @@ quality_type = normal
 setting_version = 2
 
 [values]
-support_xy_distance = 0.65
-speed_travel = 150
-support_z_distance = =layer_height * 2
-speed_wall_x = 35
-cool_min_speed = 15
-cool_fan_speed = 60
-retraction_hop_enabled = 0.2
-brim_line_count = 8
-speed_layer_0 = 30
-raft_interface_line_spacing = 1
-raft_base_line_spacing = 2
-speed_support = 40
-raft_margin = 12
-cool_fan_speed_min = =cool_fan_speed * 35 / 60
-wall_thickness = 1.05
-support_infill_rate = 25
-speed_topbottom = 35
-support_enable = True
-speed_wall_0 = 20
 adhesion_type = brim
-infill_sparse_density = 10
-top_bottom_thickness = 1.2
-speed_print = 40
-support_angle = 45
+brim_line_count = 8
+cool_fan_speed = 60
+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_hop_enabled = 0.2
+speed_layer_0 = 30
+speed_print = 40
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 20
+speed_wall_x = 35
+support_angle = 45
+support_enable = True
+support_infill_rate = 25
+support_xy_distance = 0.65
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 1.05
+
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 ab696e84bb..5d0f84ecd8 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
@@ -11,35 +11,35 @@ quality_type = fast
 setting_version = 2
 
 [values]
-support_xy_distance = 0.7
-raft_base_line_width = 0.6
-cool_min_speed = 15
-line_width = 0.57
-support_infill_rate = 25
-speed_wall_0 = 15
-wall_thickness = 1.14
-raft_base_line_spacing = 1.2
-speed_layer_0 = 30
-raft_margin = 15
-speed_travel = 150
-raft_surface_line_width = 0.5
-layer_height = 0.12
-raft_interface_line_width = 0.57
-speed_print = 45
-top_bottom_thickness = 1.2
-speed_topbottom = 35
-layer_0_z_overlap = 0.12
-support_angle = 45
-infill_sparse_density = 10
-cool_fan_speed = 60
-speed_support = 40
-support_z_distance = =layer_height * 2
-cool_fan_speed_min = =cool_fan_speed * 35 / 60
-brim_line_count = 8
-retraction_hop_enabled = 0.2
-speed_wall_x = 40
-support_enable = True
-raft_interface_line_spacing = 1.2
 adhesion_type = brim
+brim_line_count = 8
+cool_fan_speed = 60
+cool_fan_speed_min = =cool_fan_speed * 35 / 60
+cool_min_speed = 15
+infill_sparse_density = 10
+layer_0_z_overlap = 0.12
+layer_height = 0.12
+line_width = 0.57
 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_hop_enabled = 0.2
+speed_layer_0 = 30
+speed_print = 45
+speed_support = 40
+speed_topbottom = 35
+speed_travel = 150
+speed_wall_0 = 15
+speed_wall_x = 40
+support_angle = 45
+support_enable = True
+support_infill_rate = 25
+support_xy_distance = 0.7
+support_z_distance = =layer_height * 2
+top_bottom_thickness = 1.2
+wall_thickness = 1.14
 
diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum_hyb35.inst.cfg
new file mode 100644
index 0000000000..572ece232b
--- /dev/null
+++ b/resources/variants/fabtotum_hyb35.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+name = Hybrid 0.35 mm
+version = 2
+definition = fabtotum
+
+[metadata]
+author = FABtotum
+type = variant
+setting_version = 2
+
+[values]
+machine_nozzle_size = 0.35
+retraction_speed = 23
+retraction_amount = 2.5
+retraction_count_max = 25
+retraction_min_travel = 0.1
diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum_lite04.inst.cfg
new file mode 100644
index 0000000000..11c35fa779
--- /dev/null
+++ b/resources/variants/fabtotum_lite04.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+name = Lite 0.4 mm
+version = 2
+definition = fabtotum
+
+[metadata]
+author = FABtotum
+type = variant
+setting_version = 2
+
+[values]
+machine_nozzle_size = 0.4
+retraction_speed = 23
+retraction_amount = 2.5
+retraction_count_max = 25
+retraction_min_travel = 0.1
diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum_lite06.inst.cfg
new file mode 100644
index 0000000000..1576aed8b3
--- /dev/null
+++ b/resources/variants/fabtotum_lite06.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+name = Lite 0.6 mm
+version = 2
+definition = fabtotum
+
+[metadata]
+author = FABtotum
+type = variant
+setting_version = 2
+
+[values]
+machine_nozzle_size = 0.6
+retraction_speed = 23
+retraction_amount = 2.5
+retraction_count_max = 25
+retraction_min_travel = 0.1
diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum_pro02.inst.cfg
new file mode 100644
index 0000000000..b5f44d1965
--- /dev/null
+++ b/resources/variants/fabtotum_pro02.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+name = Pro 0.2 mm
+version = 2
+definition = fabtotum
+
+[metadata]
+author = FABtotum
+type = variant
+setting_version = 2
+
+[values]
+machine_nozzle_size = 0.2
+retraction_speed = 48
+retraction_amount = 1.0
+retraction_count_max = 50
+retraction_min_travel = 0.1
diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum_pro04.inst.cfg
new file mode 100644
index 0000000000..8358accaaf
--- /dev/null
+++ b/resources/variants/fabtotum_pro04.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+name = Pro 0.4 mm
+version = 2
+definition = fabtotum
+
+[metadata]
+author = FABtotum
+type = variant
+setting_version = 2
+
+[values]
+machine_nozzle_size = 0.4
+retraction_speed = 48
+retraction_amount = 1.0
+retraction_count_max = 50
+retraction_min_travel = 0.1
diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum_pro06.inst.cfg
new file mode 100644
index 0000000000..304e1ea7a6
--- /dev/null
+++ b/resources/variants/fabtotum_pro06.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+name = Pro 0.6 mm
+version = 2
+definition = fabtotum
+
+[metadata]
+author = FABtotum
+type = variant
+setting_version = 2
+
+[values]
+machine_nozzle_size = 0.6
+retraction_speed = 48
+retraction_amount = 1.0
+retraction_count_max = 50
+retraction_min_travel = 0.1
diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum_pro08.inst.cfg
new file mode 100644
index 0000000000..dd1dd69e18
--- /dev/null
+++ b/resources/variants/fabtotum_pro08.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+name = Pro 0.8 mm
+version = 2
+definition = fabtotum
+
+[metadata]
+author = FABtotum
+type = variant
+setting_version = 2
+
+[values]
+machine_nozzle_size = 0.8
+retraction_speed = 48
+retraction_amount = 1.0
+retraction_count_max = 50
+retraction_min_travel = 0.1