diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg
similarity index 86%
rename from resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg
index 0cddd3d311..d2d25c4be3 100644
--- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg
@@ -1,11 +1,9 @@
 [general]
 definition = zyyx_pro_ii
-name = Fast PLA
+name = Fast
 version = 4
 
 [metadata]
-material = generic_tpu_175
-global_quality = True
 material = generic_pla
 quality_type = fast
 setting_version = 3
diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg
similarity index 86%
rename from resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg
index b1af10df7c..241518d357 100644
--- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg
@@ -1,11 +1,9 @@
 [general]
 definition = zyyx_pro_ii
-name = Fine PLA
+name = Fine
 version = 4
 
 [metadata]
-material = generic_tpu_175
-global_quality = True
 material = generic_pla
 quality_type = fine
 setting_version = 3
diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg
similarity index 88%
rename from resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg
index 396b57860c..33628f653e 100644
--- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg
@@ -1,15 +1,15 @@
 [general]
-version = 4
-name = Normal
 definition = zyyx_pro_ii
+name = Normal
+version = 4
 
 [metadata]
-material = generic_tpu_175
+material = generic_pla
+quality_type = normal
 setting_version = 3
 type = quality
-quality_type = normal
+variant = Carbon0.4
 weight = 0
-global_quality = True
 
 [values]
 material_print_temperature_layer_0 = =material_print_temperature + 5
diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg
deleted file mode 100644
index cb135cfa84..0000000000
--- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-[general]
-definition = zyyx_pro_ii
-name = Normal PLA
-version = 4
-
-[metadata]
-material = generic_tpu_175
-global_quality = True
-material = generic_pla
-quality_type = normal
-setting_version = 3
-type = quality
-variant = Carbon0.4
-weight = 0
-
-[values]
-material_print_temperature_layer_0 = =material_print_temperature + 5
-retraction_hop = 0.2
-retraction_hop_enabled = True # Flexible material might curl/be in the way
-retraction_speed = 15
-speed_print = 20
-speed_travel = 80
diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg
new file mode 100644
index 0000000000..a400589b2e
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Fast
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = fast
+setting_version = 3
+type = quality
+variant = Carbon0.4
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.3
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.5
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg
new file mode 100644
index 0000000000..6226c9d713
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Fine
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = fine
+setting_version = 3
+type = quality
+variant = Carbon0.4
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.15
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.5
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 30
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg
new file mode 100644
index 0000000000..858976aa56
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Normal
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = normal
+setting_version = 3
+type = quality
+variant = Carbon0.4
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.2
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.5
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg
index 85a4b9c391..692ca452cc 100644
--- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Fast PLA
+name = Fast
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = fast
 setting_version = 3
 type = quality
diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg
index ec6a840d0a..23b136f5d6 100644
--- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Fine PLA
+name = Fine
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = fine
 setting_version = 3
 type = quality
diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg
index 331b3f8066..12a68f99b2 100644
--- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Normal PLA
+name = Normal
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = normal
 setting_version = 3
 type = quality
diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg
similarity index 86%
rename from resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg
index 7e317d0473..820a505027 100644
--- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg
@@ -1,11 +1,9 @@
 [general]
 definition = zyyx_pro_ii
-name = Fast PLA
+name = Fast
 version = 4
 
 [metadata]
-material = generic_tpu_175
-global_quality = True
 material = generic_pla
 quality_type = fast
 setting_version = 3
diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg
similarity index 86%
rename from resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg
index f5830897fc..e3e991ef10 100644
--- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg
@@ -1,11 +1,9 @@
 [general]
 definition = zyyx_pro_ii
-name = Fine PLA
+name = Fine
 version = 4
 
 [metadata]
-material = generic_tpu_175
-global_quality = True
 material = generic_pla
 quality_type = fine
 setting_version = 3
diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg
similarity index 85%
rename from resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg
index 8762b221f7..997c9a22e0 100644
--- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg
@@ -1,11 +1,9 @@
 [general]
 definition = zyyx_pro_ii
-name = Normal PLA
+name = Normal
 version = 4
 
 [metadata]
-material = generic_tpu_175
-global_quality = True
 material = generic_pla
 quality_type = normal
 setting_version = 3
diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg
new file mode 100644
index 0000000000..3a33d6fd21
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Fast
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = fast
+setting_version = 3
+type = quality
+variant = Carbon0.6
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.3
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.2
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 70
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg
new file mode 100644
index 0000000000..0a5e062ef3
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Fine
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = fine
+setting_version = 3
+type = quality
+variant = Carbon0.6
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.15
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.2
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 30
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 50
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg
new file mode 100644
index 0000000000..97af9eaab2
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Normal
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = normal
+setting_version = 3
+type = quality
+variant = Carbon0.6
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.2
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.2
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg
index 996a4f716d..1fc1ee210c 100644
--- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Fast PLA
+name = Fast
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = fast
 setting_version = 3
 type = quality
diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg
index a2efae59ee..ef82fa7337 100644
--- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Fine PLA
+name = Fine
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = fine
 setting_version = 3
 type = quality
diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg
index dfec51d1a9..57b4a1276a 100644
--- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Normal PLA
+name = Normal
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = normal
 setting_version = 3
 type = quality
diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg
similarity index 85%
rename from resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg
index fac9fd730d..e02ee4df77 100644
--- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg
@@ -1,11 +1,9 @@
 [general]
 definition = zyyx_pro_ii
-name = Normal PLA
+name = Normal
 version = 4
 
 [metadata]
-material = generic_tpu_175
-global_quality = True
 material = generic_pla
 quality_type = normal
 setting_version = 3
diff --git a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg
new file mode 100644
index 0000000000..227b4205b5
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Normal
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = normal
+setting_version = 3
+type = quality
+variant = Carbon1.2
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.4
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.2
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg
index f07917d33d..370c366246 100644
--- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Normal PLA
+name = Normal
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = normal
 setting_version = 3
 type = quality
diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg
deleted file mode 100644
index f7587a3ede..0000000000
--- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 4
-name = Normal
-definition = zyyx_pro_ii
-
-[metadata]
-setting_version = 3
-type = quality
-quality_type = normal
-weight = 0
-global_quality = True
-
-[values]
-layer_height = 0.2
diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg
similarity index 85%
rename from resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg
index 0e613c6124..13e0ee879a 100644
--- a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg
@@ -1,11 +1,9 @@
 [general]
 definition = zyyx_pro_ii
-name = Normal PLA
+name = Normal
 version = 4
 
 [metadata]
-material = generic_tpu_175
-global_quality = True
 material = generic_pla
 quality_type = normal
 setting_version = 3
diff --git a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg
new file mode 100644
index 0000000000..82337ec660
--- /dev/null
+++ b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = zyyx_pro_ii
+name = Normal
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = normal
+setting_version = 3
+type = quality
+variant = Multi0.2
+weight = 0
+
+[values]
+adhesion_type = skirt
+brim_width = 7
+infill_overlap = -2
+infill_pattern = quarter_cubic
+layer_height = 0.2
+material_bed_temperature = 35
+material_flow = 420.0
+material_flow_layer_0 = 150.0
+material_print_temperature_layer_0 = 235
+retraction_amount = 1.5
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+retraction_speed = 20
+skin_overlap = 15
+skirt_line_count = 2
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+top_bottom_thickness = =layer_height*3
+wall_thickness = =line_width *2
diff --git a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg
similarity index 96%
rename from resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg
rename to resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg
index c01db64e32..36688b5135 100644
--- a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg
+++ b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg
@@ -1,11 +1,10 @@
 [general]
 definition = zyyx_pro_ii
-name = Normal PLA
+name = Normal
 version = 4
 
 [metadata]
 global_quality = True
-material = generic_pla
 quality_type = normal
 setting_version = 3
 type = quality