diff --git a/resources/definitions/flsun_qq_s.def.json b/resources/definitions/flsun_qq_s.def.json
index a0c424d768..70be206f8b 100644
--- a/resources/definitions/flsun_qq_s.def.json
+++ b/resources/definitions/flsun_qq_s.def.json
@@ -4,8 +4,9 @@
     "inherits": "fdmprinter",
     "metadata": {
         "visible": true,
-        "author": "Cataldo URSO",
+        "author": "Cataldo URSO & Eddy Emck ",
         "manufacturer": "FLSUN",
+        "platform": "FLSUN-QQ-S.stl",
         "file_formats": "text/x-gcode",
         "has_materials": true,
         "preferred_quality_type": "draft",
diff --git a/resources/definitions/predator.def.json b/resources/definitions/predator.def.json
new file mode 100644
index 0000000000..a8f4e56fe1
--- /dev/null
+++ b/resources/definitions/predator.def.json
@@ -0,0 +1,72 @@
+{
+    "version": 2,
+    "name": "Anycubic Predator",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "author": "ksihota",
+        "manufacturer": "Anycubic",
+        "file_formats": "text/x-gcode",
+        "platform": "predator_platform.stl",
+        "platform_texture": "anycubic_predator.png",
+        "supports_usb_connection": true,
+        "visible": true,
+        "platform_offset": [0, 0, 0],
+        "has_materials": true,
+        "has_variants": false,
+        "has_machine_materials": false,
+        "has_variant_materials": false,
+        "has_machine_quality": true,
+        "quality_definition": "predator",
+        "preferred_quality_type": "normal",
+        "machine_extruder_trains":
+        {
+            "0": "predator_extruder_0"
+        }
+    },
+
+    "overrides": {
+        "machine_start_gcode":
+        {
+            "default_value": "G21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nG28 ;Home \nG1 Z15.0 F1000;short move \nG92 E0 ;zero the extruded length \nG1 F200 E3 ;extrude 3mm of feed stock adjust so I don't have to remove any filament \nG92 E0 ;zero the extruded length again \nG1 F4000 ;move to bed \n;Put printing message on LCD screen \nM117 Printing... \n;G5; this is in order to resume on Power failure (only works on SD prints)"
+        },
+        "machine_end_gcode":
+        {
+            "default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off \nG91 ;relative positioning \nG92 E0 ;zero the extruded length \nG1 E-2 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure \nG92 E0 ;zero the extruded length \n;M107 ;fan off \nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more \n;G1 X0.0 Y0.0 Z455.0 F4500 \nG28 ;Home all axes (max endstops) \nG90 ;absolute positioning \n;M109 S60 ; wait for extruder temp to drop to 60 \n;M84 ;steppers off \n;M81 ;turn off printer"
+        },
+        "gantry_height": {
+            "value": 455
+        },
+        "machine_width": { "default_value": 370 },
+        "machine_depth": { "default_value": 370 },
+        "machine_height": { "default_value": 455 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_nozzle_size": {
+            "default_value": 0.4,
+            "minimum_value": 0.15,
+            "maximum_value": 0.80
+        },
+        "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
+        "material_bed_temperature_layer_0": { "value": "material_bed_temperature + 5" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_max_feedrate_x": { "default_value": 150 },
+        "machine_max_feedrate_y": { "default_value": 150 },
+        "machine_max_feedrate_z": { "default_value": 150 },
+        "machine_max_feedrate_e": { "default_value": 50 },
+        "machine_max_acceleration_x": { "default_value": 800 },
+        "machine_max_acceleration_y": { "default_value": 800 },
+        "machine_max_acceleration_z": { "default_value": 800 },
+        "machine_max_acceleration_e": { "default_value": 10000 },
+        "machine_acceleration": { "default_value": 3000 },
+        "machine_max_jerk_xy": { "default_value": 20 },
+        "machine_max_jerk_z": { "default_value": 20 },
+        "machine_max_jerk_e": { "default_value": 5},
+        "retraction_amount": { "default_value": 4 },
+        "retraction_speed": { "default_value": 50 },
+        "retraction_hop_enabled": { "default_value": false },
+        "retract_at_layer_change": { "default_value": true },
+        "coasting_enable": { "default_value": true }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/predator_extruder_0.def.json b/resources/extruders/predator_extruder_0.def.json
new file mode 100644
index 0000000000..59574ae69f
--- /dev/null
+++ b/resources/extruders/predator_extruder_0.def.json
@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 0",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "predator",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/images/anycubic_predator.png b/resources/images/anycubic_predator.png
new file mode 100644
index 0000000000..2ab214826a
Binary files /dev/null and b/resources/images/anycubic_predator.png differ
diff --git a/resources/meshes/FLSUN-QQ-S.stl b/resources/meshes/FLSUN-QQ-S.stl
new file mode 100644
index 0000000000..d4fe2fbfbe
Binary files /dev/null and b/resources/meshes/FLSUN-QQ-S.stl differ
diff --git a/resources/meshes/predator_platform.stl b/resources/meshes/predator_platform.stl
new file mode 100644
index 0000000000..ae65da7c52
Binary files /dev/null and b/resources/meshes/predator_platform.stl differ
diff --git a/resources/quality/anycubic_predator/predator_coarse.inst.cfg b/resources/quality/anycubic_predator/predator_coarse.inst.cfg
new file mode 100644
index 0000000000..e8c6f72e8e
--- /dev/null
+++ b/resources/quality/anycubic_predator/predator_coarse.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Coarse
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = coarse
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.4
+layer_height_0 = 0.45
\ No newline at end of file
diff --git a/resources/quality/anycubic_predator/predator_draft.inst.cfg b/resources/quality/anycubic_predator/predator_draft.inst.cfg
new file mode 100644
index 0000000000..d94920785d
--- /dev/null
+++ b/resources/quality/anycubic_predator/predator_draft.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Draft
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = draft
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.30
+layer_height_0 = 0.35
\ No newline at end of file
diff --git a/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg b/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg
new file mode 100644
index 0000000000..bad550ee1f
--- /dev/null
+++ b/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Extra Coarse
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = Xcoarse
+weight = -4
+global_quality = True
+
+[values]
+layer_height = 0.5
+layer_height_0 = 0.55
diff --git a/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg b/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg
new file mode 100644
index 0000000000..7e745c5454
--- /dev/null
+++ b/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Extra Fine
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = Xfine
+weight = 1
+global_quality = True
+
+[values]
+layer_height = 0.05
+layer_height_0 = 0.10
diff --git a/resources/quality/anycubic_predator/predator_fine.inst.cfg b/resources/quality/anycubic_predator/predator_fine.inst.cfg
new file mode 100644
index 0000000000..1c6d3555c9
--- /dev/null
+++ b/resources/quality/anycubic_predator/predator_fine.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Fine
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = fine
+weight = 1
+global_quality = True
+
+[values]
+layer_height = 0.1
+layer_height_0 = 0.15
diff --git a/resources/quality/anycubic_predator/predator_normal.inst.cfg b/resources/quality/anycubic_predator/predator_normal.inst.cfg
new file mode 100644
index 0000000000..6f5db85938
--- /dev/null
+++ b/resources/quality/anycubic_predator/predator_normal.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+version = 4
+name = Normal
+definition = predator
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.2
+layer_height_0 = 0.25
\ No newline at end of file
diff --git a/resources/quality/beamup_s/beamup_s_coarse.inst.cfg b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg
index 9f82b7b138..20decc8ded 100644
--- a/resources/quality/beamup_s/beamup_s_coarse.inst.cfg
+++ b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg
@@ -1,18 +1,18 @@
-[general]
-version = 4
-name = BeamUp S Coarse
-definition = beamup_s
-
-[metadata]
-setting_version = 10
-type = quality
-quality_type = coarse
-weight = -3
-material = generic_pla
-
-[values]
-layer_height = 0.30
-adhesion_type = brim
+[general]
+version = 4
+name = BeamUp S Coarse
+definition = beamup_s
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = coarse
+weight = -3
+material = generic_pla
+
+[values]
+layer_height = 0.30
+adhesion_type = brim
 brim_line_count = 5
 infill_before_walls = False
 initial_layer_line_width_factor = 120.0
@@ -37,4 +37,4 @@ support_interface_skip_height = 0.30
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8
-zig_zaggify_infill = True
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_draft.inst.cfg b/resources/quality/beamup_s/beamup_s_draft.inst.cfg
index a696fafd2b..d172ea3925 100644
--- a/resources/quality/beamup_s/beamup_s_draft.inst.cfg
+++ b/resources/quality/beamup_s/beamup_s_draft.inst.cfg
@@ -1,18 +1,18 @@
-[general]
-version = 4
-name = BeamUp S Draft
-definition = beamup_s
-
-[metadata]
-setting_version = 10
-type = quality
-quality_type = draft
-weight = -2
-material = generic_pla
-
-[values]
-layer_height = 0.2
-adhesion_type = brim
+[general]
+version = 4
+name = BeamUp S Draft
+definition = beamup_s
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = draft
+weight = -2
+material = generic_pla
+
+[values]
+layer_height = 0.2
+adhesion_type = brim
 brim_line_count = 5
 infill_before_walls = False
 initial_layer_line_width_factor = 120.0
@@ -37,4 +37,4 @@ support_interface_skip_height = 0.20
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8
-zig_zaggify_infill = True
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg
index ee1a1cb6a7..b6783bf8e8 100644
--- a/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg
+++ b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg
@@ -1,18 +1,18 @@
-[general]
-version = 4
-name = BeamUp S Extra Fine
-definition = beamup_s
-
-[metadata]
-setting_version = 10
-type = quality
-quality_type = high
-weight = 1
-material = generic_pla
-
-[values]
-layer_height = 0.06
-adhesion_type = brim
+[general]
+version = 4
+name = BeamUp S Extra Fine
+definition = beamup_s
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = high
+weight = 1
+material = generic_pla
+
+[values]
+layer_height = 0.06
+adhesion_type = brim
 brim_line_count = 5
 infill_before_walls = False
 initial_layer_line_width_factor = 120.0
@@ -37,4 +37,4 @@ support_interface_skip_height = 0.06
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8
-zig_zaggify_infill = True
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_fine.inst.cfg
index c68f854536..9f6686487e 100644
--- a/resources/quality/beamup_s/beamup_s_fine.inst.cfg
+++ b/resources/quality/beamup_s/beamup_s_fine.inst.cfg
@@ -1,18 +1,18 @@
-[general]
-version = 4
-name = BeamUp S Fine
-definition = beamup_s
-
-[metadata]
-setting_version = 10
-type = quality
-quality_type = normal
-weight = 0
-material = generic_pla
-
-[values]
-layer_height = 0.1
-adhesion_type = brim
+[general]
+version = 4
+name = BeamUp S Fine
+definition = beamup_s
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = normal
+weight = 0
+material = generic_pla
+
+[values]
+layer_height = 0.1
+adhesion_type = brim
 brim_line_count = 5
 infill_before_walls = False
 initial_layer_line_width_factor = 120.0
@@ -37,4 +37,4 @@ support_interface_skip_height = 0.10
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8
-zig_zaggify_infill = True
+zig_zaggify_infill = True
diff --git a/resources/quality/beamup_s/beamup_s_normal.inst.cfg b/resources/quality/beamup_s/beamup_s_normal.inst.cfg
index 7b692d2cb3..f926cb11a8 100644
--- a/resources/quality/beamup_s/beamup_s_normal.inst.cfg
+++ b/resources/quality/beamup_s/beamup_s_normal.inst.cfg
@@ -1,18 +1,18 @@
-[general]
-version = 4
-name = BeamUp S Normal
-definition = beamup_s
-
-[metadata]
-setting_version = 10
-type = quality
-quality_type = fast
-weight = -1
-material = generic_pla
-
-[values]
-layer_height = 0.15
-adhesion_type = brim
+[general]
+version = 4
+name = BeamUp S Normal
+definition = beamup_s
+
+[metadata]
+setting_version = 13
+type = quality
+quality_type = fast
+weight = -1
+material = generic_pla
+
+[values]
+layer_height = 0.15
+adhesion_type = brim
 brim_line_count = 5
 infill_before_walls = False
 initial_layer_line_width_factor = 120.0
@@ -37,4 +37,4 @@ support_interface_skip_height = 0.15
 support_offset = 0.8
 support_z_distance = 0.2
 wall_thickness = 0.8
-zig_zaggify_infill = True
+zig_zaggify_infill = True
diff --git a/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg
index 4c79a3ac78..009f6c89bc 100644
--- a/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg
+++ b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg
@@ -4,7 +4,7 @@ definition = alyanx3dp
 name = Normal
 
 [metadata]
-setting_version = 6
+setting_version = 13
 type = quality
 quality_type = alyanx_normal
 weight = 2
diff --git a/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg
index 661695cca0..7f3384a29f 100644
--- a/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg
+++ b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg
@@ -4,7 +4,7 @@ name = Fine
 definition = makeblock_mcreate
 
 [metadata]
-setting_version = 6
+setting_version = 13
 type = quality
 quality_type = normal
 weight = 0
diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg
index de5c97f913..2428d5c64d 100644
--- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg
+++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg
@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_abs
diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg
index 9a49399734..acccc5190b 100644
--- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg
+++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg
@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_abs
diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg
index 2515cc32eb..2971e89ce2 100644
--- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg
+++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg
@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_abs
diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg
index 9b140cbb75..95e19fb800 100644
--- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg
+++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg
@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_abs
diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg
index 55dd8755fb..525a1dca8b 100644
--- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg
+++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg
@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_abs
diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg
index 748b4d6c50..bb9ac9f1af 100644
--- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg
+++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg
@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_abs
diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg
index cd2e5804cd..e1b98bdacf 100644
--- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg
+++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg
@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_nylon
diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg
index 11ecdbf8d7..597f954879 100644
--- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg
+++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg
@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_nylon
diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg
index d512935d05..d4f71ce09a 100644
--- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg
+++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg
@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_nylon
diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg
index e936714f2c..cf2c326bde 100644
--- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg
+++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg
@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_nylon
diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg
index b634af5a7f..76b0e03252 100644
--- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg
+++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg
@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_nylon
diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg
index 583d8660f8..ea28a18bf6 100644
--- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg
+++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg
@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_nylon
diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg
index ae8de691b7..4cbbac976c 100644
--- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg
+++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg
@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_petg
diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg
index 7a97e15b90..085f63fd29 100644
--- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg
+++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg
@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_petg
diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg
index c3153454b8..441223b259 100644
--- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg
+++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg
@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_petg
diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg
index d583ab6514..6eb60cbe30 100644
--- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg
+++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg
@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_petg
diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg
index cb77ab35d8..ab284f19bd 100644
--- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg
+++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg
@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_petg
diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg
index 6ab237d97b..d4b0c58c70 100644
--- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg
+++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg
@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_petg
diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg
index 67ece9b983..f88063ebd1 100644
--- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg
+++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg
@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_pla
diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg
index ebc48e1e47..2eeed8c565 100644
--- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg
+++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg
@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_pla
diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg
index a2cc3d8ada..6e62844cf4 100644
--- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg
+++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg
@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_pla
diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg
index 6f30e132f4..4ffd5305c4 100644
--- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg
+++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg
@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_pla
diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg
index 075aaa18e4..8487f78f55 100644
--- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg
+++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg
@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_pla
diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg
index 7460b92cb3..e9886bf1b5 100644
--- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg
+++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg
@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_pla
diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg
index 2ca4e97ba9..9aa132a769 100644
--- a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg
+++ b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg
@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 weight = -6
diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg
index 1e5da51f73..8bc628eeec 100644
--- a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg
+++ b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg
@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 weight = -2
diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg
index f93f3c83df..7de29f815d 100644
--- a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg
+++ b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg
@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 weight = -4
diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg
index 0fce643397..6cb9e65c33 100644
--- a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg
+++ b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg
@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 weight = -3
diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg
index 5ff420ea23..b160a086b9 100644
--- a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg
+++ b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg
@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 weight = -1
diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg
index 6f96648312..9bc40461ee 100644
--- a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg
+++ b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg
@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 weight = 0
diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg
index bc93daa751..e4dda56ce2 100644
--- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg
+++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg
@@ -4,7 +4,7 @@ name = Dynamic Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = adaptive
 material = generic_tpu
diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg
index 0f0b3fad82..8cb55d02de 100644
--- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg
+++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg
@@ -4,7 +4,7 @@ name = Good Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = good
 material = generic_tpu
diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg
index c0653ede27..3a7bfbf138 100644
--- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg
+++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg
@@ -4,7 +4,7 @@ name = Low Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = low
 material = generic_tpu
diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg
index a0aa088d5b..392c3aa303 100644
--- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg
+++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg
@@ -4,7 +4,7 @@ name = Standard Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = standard
 material = generic_tpu
diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg
index 23a6e77aca..29e1565547 100644
--- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg
+++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg
@@ -4,7 +4,7 @@ name = Super Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = super
 material = generic_tpu
diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg
index 206a8c7c01..92f49140bd 100644
--- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg
+++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg
@@ -4,7 +4,7 @@ name = Ultra Quality
 definition = rigid3d_base
 
 [metadata]
-setting_version = 9
+setting_version = 13
 type = quality
 quality_type = ultra
 material = generic_tpu