diff --git a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py
index c84ff268b0..f3a8314769 100644
--- a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py
+++ b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py
@@ -33,6 +33,44 @@ _REMOVED_SETTINGS = {
     "wireframe_nozzle_clearance",
 }
 
+_RENAMED_PROFILES = {
+    "abs_040012": "elegoo_abs_nozzle_0.40_layer_0.10",
+    "abs_040016": "elegoo_abs_nozzle_0.40_layer_0.15",
+    "abs_040020": "elegoo_abs_nozzle_0.40_layer_0.20",
+    "abs_040024": "elegoo_abs_nozzle_0.40_layer_0.20",
+    "abs_040028": "elegoo_abs_nozzle_0.40_layer_0.30",
+
+    "asa_040012": "elegoo_asa_nozzle_0.40_layer_0.10",
+    "asa_040016": "elegoo_asa_nozzle_0.40_layer_0.15",
+    "asa_040020": "elegoo_asa_nozzle_0.40_layer_0.20",
+    "asa_040024": "elegoo_asa_nozzle_0.40_layer_0.20",
+    "asa_040028": "elegoo_asa_nozzle_0.40_layer_0.30",
+
+    "petg_040012": "elegoo_petg_nozzle_0.40_layer_0.10",
+    "petg_040016": "elegoo_petg_nozzle_0.40_layer_0.15",
+    "petg_040020": "elegoo_petg_nozzle_0.40_layer_0.20",
+    "petg_040024": "elegoo_petg_nozzle_0.40_layer_0.20",
+    "petg_040028": "elegoo_petg_nozzle_0.40_layer_0.30",
+
+    "pla_040012": "elegoo_pla_nozzle_0.40_layer_0.10",
+    "pla_040016": "elegoo_pla_nozzle_0.40_layer_0.15",
+    "pla_040020": "elegoo_pla_nozzle_0.40_layer_0.20",
+    "pla_040024": "elegoo_pla_nozzle_0.40_layer_0.20",
+    "pla_040028": "elegoo_pla_nozzle_0.40_layer_0.30",
+
+    "tpu_040012": "elegoo_tpu_nozzle_0.40_layer_0.10",
+    "tpu_040016": "elegoo_tpu_nozzle_0.40_layer_0.15",
+    "tpu_040020": "elegoo_tpu_nozzle_0.40_layer_0.20",
+    "tpu_040024": "elegoo_tpu_nozzle_0.40_layer_0.20",
+    "tpu_040028": "elegoo_tpu_nozzle_0.40_layer_0.30",
+
+    "elegoo_global_012_high": "elegoo_layer_0.10",
+    "elegoo_global_016_normal": "elegoo_layer_0.15",
+    "elegoo_global_020_fine": "elegoo_layer_0.20",
+    "elegoo_global_024_medium": "elegoo_layer_0.20",
+    "elegoo_global_028_draft": "elegoo_layer_0.30",
+}
+
 
 class VersionUpgrade53to54(VersionUpgrade):
     def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
@@ -112,6 +150,9 @@ class VersionUpgrade53to54(VersionUpgrade):
 
         parser["metadata"]["setting_version"] = "22"
 
+        for container in parser['containers']:
+            parser['containers'][container] = _RENAMED_PROFILES.get(parser['containers'][container], parser['containers'][container])
+
         result = io.StringIO()
         parser.write(result)
         return [filename], [result.getvalue()]
diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json
index 2de07271fe..cd145a165a 100644
--- a/resources/definitions/elegoo_base.def.json
+++ b/resources/definitions/elegoo_base.def.json
@@ -31,6 +31,8 @@
             "generic_pp"
         ],
         "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
         "machine_extruder_trains": { "0": "elegoo_extruder_0" },
         "platform_offset": [
             -2.2,
@@ -38,7 +40,9 @@
             -31
         ],
         "preferred_material": "generic_pla_175",
-        "preferred_quality_type": "fine"
+        "preferred_quality_type": "Elegoo_layer_020",
+        "preferred_variant_name": "0.40mm_Elegoo_Nozzle",
+        "variants_name": "Nozzle Size"
     },
     "overrides":
     {
@@ -130,6 +134,6 @@
         "z_seam_corner": { "default_value": "z_seam_corner_weighted" },
         "z_seam_position": { "default_value": "left" },
         "z_seam_type": { "default_value": "back" },
-        "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_sparse_density < 30 " }
+        "zig_zaggify_infill": { "value": "resolveOrValue('infill_pattern') == 'cross' or resolveOrValue('infill_pattern') == 'cross_3d' or resolveOrValue('infill_sparse_density') < 30 " }
     }
-}
\ No newline at end of file
+}
diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg
new file mode 100644
index 0000000000..e82884e3fb
--- /dev/null
+++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+definition = elegoo_base
+name = Visual
+version = 4
+
+[metadata]
+intent_category = visual
+material = generic_pla
+quality_type = Elegoo_layer_005
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+speed_infill = 50
+top_bottom_thickness = 1.05
+
diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg
new file mode 100644
index 0000000000..bdbeef66b4
--- /dev/null
+++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+definition = elegoo_base
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_pla
+quality_type = Elegoo_layer_015
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+jerk_print = 30
+speed_infill = =speed_print
+speed_print = 30
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg
new file mode 100644
index 0000000000..9d8758f605
--- /dev/null
+++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+definition = elegoo_base
+name = Visual
+version = 4
+
+[metadata]
+intent_category = visual
+material = generic_pla
+quality_type = Elegoo_layer_015
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+speed_infill = 50
+top_bottom_thickness = 1.05
+
diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg
new file mode 100644
index 0000000000..de7bdc5730
--- /dev/null
+++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+definition = elegoo_base
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_pla
+quality_type = Elegoo_layer_010
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+jerk_print = 30
+speed_infill = =speed_print
+speed_print = 30
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg
new file mode 100644
index 0000000000..d89f8510ec
--- /dev/null
+++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+definition = elegoo_base
+name = Visual
+version = 4
+
+[metadata]
+intent_category = visual
+material = generic_pla
+quality_type = Elegoo_layer_010
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+speed_infill = 50
+top_bottom_thickness = 1.05
+
diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg
new file mode 100644
index 0000000000..c1fd50eab3
--- /dev/null
+++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg
@@ -0,0 +1,23 @@
+[general]
+definition = elegoo_base
+name = Quick
+version = 4
+
+[metadata]
+intent_category = quick
+material = generic_pla
+quality_type = Elegoo_layer_020
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+infill_sparse_density = 15
+jerk_print = 30
+speed_infill = =speed_print
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = 0.8
+
diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg
new file mode 100644
index 0000000000..9dc2c50697
--- /dev/null
+++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg
@@ -0,0 +1,28 @@
+[general]
+definition = elegoo_base
+name = Quick
+version = 4
+
+[metadata]
+intent_category = quick
+is_experimental = True
+material = generic_pla
+quality_type = Elegoo_layer_030
+setting_version = 22
+type = intent
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+acceleration_print = 4000
+acceleration_wall = 2000
+acceleration_wall_0 = 2000
+infill_sparse_density = 10
+jerk_print = 30
+speed_infill = =speed_print
+speed_print = 50
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = 0.8
+
diff --git a/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg
similarity index 86%
rename from resources/quality/elegoo/base/abs040/abs_040012.inst.cfg
rename to resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg
index ed4ff399f4..09f740f263 100644
--- a/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg
+++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = abs_040012
+name = abs_noz0.40_lay0.10
 version = 4
 
 [metadata]
-material = generic_abs_175
-quality_type = high
+material = generic_abs
+quality_type = Elegoo_layer_010
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
@@ -27,4 +28,3 @@ support_xy_distance_overhang = =machine_nozzle_size*0.8
 support_z_distance = =layer_height/2
 top_bottom_thickness = 0.72
 wall_thickness = =line_width*2
-
diff --git a/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg
similarity index 86%
rename from resources/quality/elegoo/base/abs040/abs_040016.inst.cfg
rename to resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg
index b494fc76a1..c77f46068f 100644
--- a/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg
+++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = abs_040016
+name = abs_noz0.40_lay0.15
 version = 4
 
 [metadata]
-material = generic_abs_175
-quality_type = normal
+material = generic_abs
+quality_type = Elegoo_layer_015
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
@@ -28,3 +29,6 @@ support_z_distance = =layer_height/2
 top_bottom_thickness = 0.64
 wall_thickness = =line_width*2
 
+
+
+
diff --git a/resources/quality/elegoo/base/abs040/abs_040020.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg
similarity index 86%
rename from resources/quality/elegoo/base/abs040/abs_040020.inst.cfg
rename to resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg
index 9cda08aeba..149d17021e 100644
--- a/resources/quality/elegoo/base/abs040/abs_040020.inst.cfg
+++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = abs_040020
+name = abs_noz0.40_lay0.20
 version = 4
 
 [metadata]
-material = generic_abs_175
-quality_type = fine
+material = generic_abs
+quality_type = Elegoo_layer_020
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
diff --git a/resources/quality/elegoo/base/abs040/abs_040028.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg
similarity index 86%
rename from resources/quality/elegoo/base/abs040/abs_040028.inst.cfg
rename to resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg
index 329de538c0..9c58ee7fc9 100644
--- a/resources/quality/elegoo/base/abs040/abs_040028.inst.cfg
+++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = abs_040028
+name = abs_noz0.40_lay0.30
 version = 4
 
 [metadata]
-material = generic_abs_175
-quality_type = draft
+material = generic_abs
+quality_type = Elegoo_layer_030
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
diff --git a/resources/quality/elegoo/base/abs040/abs_040024.inst.cfg b/resources/quality/elegoo/base/abs040/abs_040024.inst.cfg
deleted file mode 100644
index 540c7a5d50..0000000000
--- a/resources/quality/elegoo/base/abs040/abs_040024.inst.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-[general]
-definition = elegoo_base
-name = abs_040024
-version = 4
-
-[metadata]
-material = generic_abs_175
-quality_type = medium
-setting_version = 22
-type = quality
-
-[values]
-brim_gap = 0
-brim_width = 10
-cool_fan_enabled = False
-cool_fan_speed = 0
-cool_fan_speed_0 = 0
-default_material_bed_temperature = 80
-default_material_print_temperature = 240
-layer_0_z_overlap = =raft_airgap*0.8
-material_shrinkage_percentage_xy = 100.3
-raft_airgap = =0.15
-raft_margin = 10
-retraction_speed = 25
-support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
-support_xy_distance_overhang = =machine_nozzle_size*0.8
-support_z_distance = =layer_height/2
-top_bottom_thickness = 0.75
-wall_thickness = =line_width*2
-
diff --git a/resources/quality/elegoo/base/asa040/asa_040012.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg
similarity index 89%
rename from resources/quality/elegoo/base/asa040/asa_040012.inst.cfg
rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg
index 7dedc2c91e..3543bf211e 100644
--- a/resources/quality/elegoo/base/asa040/asa_040012.inst.cfg
+++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = asa_040012
+name = asa_noz0.40_lay0.10
 version = 4
 
 [metadata]
 material = generic_asa_175
-quality_type = high
+quality_type = Elegoo_layer_010
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
diff --git a/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg
similarity index 89%
rename from resources/quality/elegoo/base/asa040/asa_040016.inst.cfg
rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg
index 7f7ef16fb1..e2a1347e99 100644
--- a/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg
+++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = asa_040016
+name = asa_noz0.40_lay0.15
 version = 4
 
 [metadata]
 material = generic_asa_175
-quality_type = normal
+quality_type = Elegoo_layer_015
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
@@ -28,3 +29,5 @@ support_z_distance = =layer_height/2
 top_bottom_thickness = 0.64
 wall_thickness = =line_width*2
 
+
+
diff --git a/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg
similarity index 89%
rename from resources/quality/elegoo/base/asa040/asa_040020.inst.cfg
rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg
index e86d9b8747..c457e2a5b5 100644
--- a/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg
+++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = asa_040020
+name = asa_noz0.40_lay0.20
 version = 4
 
 [metadata]
 material = generic_asa_175
-quality_type = fine
+quality_type = Elegoo_layer_020
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
@@ -28,3 +29,5 @@ support_z_distance = =layer_height/2
 top_bottom_thickness = 0.8
 wall_thickness = =line_width*2
 
+
+
diff --git a/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg
similarity index 89%
rename from resources/quality/elegoo/base/asa040/asa_040028.inst.cfg
rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg
index 462b2d0e61..e992206e6b 100644
--- a/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg
+++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = asa_040028
+name = asa_noz0.40_lay0.30
 version = 4
 
 [metadata]
 material = generic_asa_175
-quality_type = draft
+quality_type = Elegoo_layer_030
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_gap = 0
diff --git a/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg b/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg
deleted file mode 100644
index 8f3c93cad4..0000000000
--- a/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-[general]
-definition = elegoo_base
-name = asa_040024
-version = 4
-
-[metadata]
-material = generic_asa_175
-quality_type = medium
-setting_version = 22
-type = quality
-
-[values]
-brim_gap = 0
-brim_width = 10
-cool_fan_enabled = False
-cool_fan_speed = 0
-cool_fan_speed_0 = 0
-default_material_bed_temperature = 80
-default_material_print_temperature = 240
-layer_0_z_overlap = =raft_airgap*0.8
-material_shrinkage_percentage_xy = 100.3
-raft_airgap = =0.15
-raft_margin = 15
-retraction_speed = 25
-support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
-support_xy_distance_overhang = =machine_nozzle_size*0.8
-support_z_distance = =layer_height/2
-top_bottom_thickness = 0.75
-wall_thickness = =line_width*2
-
diff --git a/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg b/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg
deleted file mode 100644
index 24f2f51a78..0000000000
--- a/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-[general]
-definition = elegoo_base
-name = High Quality
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = high
-setting_version = 22
-type = quality
-weight = -1
-
-[values]
-layer_height = 0.12
-layer_height_0 = 0.2
-material_print_temperature = =default_material_print_temperature
-prime_tower_size = 40
-speed_print = 70
-top_bottom_thickness = 0.7
-
diff --git a/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg b/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg
deleted file mode 100644
index 81e22f679c..0000000000
--- a/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-[general]
-definition = elegoo_base
-name = Normal Quality
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = normal
-setting_version = 22
-type = quality
-weight = -2
-
-[values]
-layer_height = 0.16
-layer_height_0 = 0.25
-material_print_temperature = =default_material_print_temperature
-prime_tower_size = 35
-speed_print = 60
-top_bottom_thickness = 0.8
-
diff --git a/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg b/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg
deleted file mode 100644
index 87079ab369..0000000000
--- a/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-[general]
-definition = elegoo_base
-name = Fine Quality
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = fine
-setting_version = 22
-type = quality
-weight = -3
-
-[values]
-layer_height = 0.20
-layer_height_0 = 0.25
-material_print_temperature = =default_material_print_temperature
-prime_tower_size = 31
-top_bottom_thickness = 0.8
-
diff --git a/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg b/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg
deleted file mode 100644
index 08ca3bdd7a..0000000000
--- a/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-[general]
-definition = elegoo_base
-name = Medium Quality
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = medium
-setting_version = 22
-type = quality
-weight = -4
-
-[values]
-layer_height = 0.24
-layer_height_0 = 0.25
-material_print_temperature = =default_material_print_temperature
-prime_tower_size = 28
-top_bottom_thickness = 1.0
-
diff --git a/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg b/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg
deleted file mode 100644
index d98f053254..0000000000
--- a/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-[general]
-definition = elegoo_base
-name = Draft Quality
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = draft
-setting_version = 22
-type = quality
-weight = -5
-
-[values]
-layer_height = 0.28
-layer_height_0 = 0.30
-material_print_temperature = =default_material_print_temperature + 5
-prime_tower_size = 27
-top_bottom_thickness = 1.0
-
diff --git a/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg
new file mode 100644
index 0000000000..0175d5dbfa
--- /dev/null
+++ b/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = elegoo_base
+name = Extra Fine
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = Elegoo_layer_005
+setting_version = 22
+type = quality
+weight = -1
+
+[values]
+layer_height = 0.05
+layer_height_0 = 0.12
+
diff --git a/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg
new file mode 100644
index 0000000000..d4fa921e7b
--- /dev/null
+++ b/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = elegoo_base
+name = Fine
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = Elegoo_layer_010
+setting_version = 22
+type = quality
+weight = -2
+
+[values]
+layer_height = 0.10
+layer_height_0 = 0.12
+
diff --git a/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg
new file mode 100644
index 0000000000..572a4a7c52
--- /dev/null
+++ b/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = elegoo_base
+name = Normal
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = Elegoo_layer_015
+setting_version = 22
+type = quality
+weight = -3
+
+[values]
+layer_height = 0.15
+layer_height_0 = 0.15
+
diff --git a/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg
new file mode 100644
index 0000000000..ee4226a6a8
--- /dev/null
+++ b/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = elegoo_base
+name = Fast
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = Elegoo_layer_020
+setting_version = 22
+type = quality
+weight = -4
+
+[values]
+layer_height = 0.20
+layer_height_0 = 0.20
+
diff --git a/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg
new file mode 100644
index 0000000000..dea809b063
--- /dev/null
+++ b/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = elegoo_base
+name = Extra Fast
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = Elegoo_layer_030
+setting_version = 22
+type = quality
+weight = -6
+
+[values]
+layer_height = 0.30
+layer_height_0 = 0.30
+
diff --git a/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg
new file mode 100644
index 0000000000..cca7b701aa
--- /dev/null
+++ b/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = elegoo_base
+name = Turbo
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = Elegoo_layer_040
+setting_version = 22
+type = quality
+weight = -6
+
+[values]
+layer_height = 0.40
+layer_height_0 = 0.40
+
diff --git a/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg
new file mode 100644
index 0000000000..a7ff7a2610
--- /dev/null
+++ b/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg
@@ -0,0 +1,16 @@
+[general]
+definition = elegoo_base
+name = Extra Turbo
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = Elegoo_layer_060
+setting_version = 22
+type = quality
+weight = -6
+
+[values]
+layer_height = 0.60
+layer_height_0 = 0.60
+
diff --git a/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg
similarity index 80%
rename from resources/quality/elegoo/base/petg040/petg_040012.inst.cfg
rename to resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg
index df9119b5f3..9080be34e6 100644
--- a/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg
+++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = petg_040012
+name = petg_noz0.40_lay0.10
 version = 4
 
 [metadata]
-material = generic_petg_175
-quality_type = high
+material = generic_petg
+quality_type = Elegoo_layer_010
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 6
diff --git a/resources/quality/elegoo/base/petg040/petg_040016.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg
similarity index 80%
rename from resources/quality/elegoo/base/petg040/petg_040016.inst.cfg
rename to resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg
index b1244d99a4..20ddba557b 100644
--- a/resources/quality/elegoo/base/petg040/petg_040016.inst.cfg
+++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = petg_040016
+name = petg_noz0.40_lay0.15
 version = 4
 
 [metadata]
-material = generic_petg_175
-quality_type = normal
+material = generic_petg
+quality_type = Elegoo_layer_015
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 6
@@ -23,3 +24,4 @@ raft_margin = 10
 retraction_speed = 25
 speed_support = =speed_wall_x
 
+
diff --git a/resources/quality/elegoo/base/petg040/petg_040020.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg
similarity index 80%
rename from resources/quality/elegoo/base/petg040/petg_040020.inst.cfg
rename to resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg
index c244d9f3a9..6a03b46b12 100644
--- a/resources/quality/elegoo/base/petg040/petg_040020.inst.cfg
+++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = petg_040020
+name = petg_noz0.40_lay0.20
 version = 4
 
 [metadata]
-material = generic_petg_175
-quality_type = fine
+material = generic_petg
+quality_type = Elegoo_layer_020
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 6
@@ -23,3 +24,4 @@ raft_margin = 10
 retraction_speed = 25
 speed_support = =speed_wall_x
 
+
diff --git a/resources/quality/elegoo/base/petg040/petg_040024.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg
similarity index 80%
rename from resources/quality/elegoo/base/petg040/petg_040024.inst.cfg
rename to resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg
index 963aa9e9be..35487d81e4 100644
--- a/resources/quality/elegoo/base/petg040/petg_040024.inst.cfg
+++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = petg_040024
+name = petg_noz0.40_lay0.30
 version = 4
 
 [metadata]
-material = generic_petg_175
-quality_type = medium
+material = generic_petg
+quality_type = Elegoo_layer_030
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 6
@@ -23,3 +24,4 @@ raft_margin = 10
 retraction_speed = 25
 speed_support = =speed_wall_x
 
+
diff --git a/resources/quality/elegoo/base/petg040/petg_040028.inst.cfg b/resources/quality/elegoo/base/petg040/petg_040028.inst.cfg
deleted file mode 100644
index ef521a3752..0000000000
--- a/resources/quality/elegoo/base/petg040/petg_040028.inst.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[general]
-definition = elegoo_base
-name = petg_040028
-version = 4
-
-[metadata]
-material = generic_petg_175
-quality_type = draft
-setting_version = 22
-type = quality
-
-[values]
-brim_width = 6
-cool_fan_speed_min = =cool_fan_speed*0.5
-cool_min_layer_time = 10
-cool_min_layer_time_fan_speed_max = 30
-default_material_bed_temperature = 70
-default_material_print_temperature = 235
-layer_0_z_overlap = =raft_airgap*0.6
-material_shrinkage_percentage_xy = 100.2
-raft_airgap = =0.38
-raft_margin = 10
-retraction_speed = 25
-speed_support = =speed_wall_x
-
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg
new file mode 100644
index 0000000000..c5ed8f40f8
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg
@@ -0,0 +1,29 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.20_lay0.05
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_005
+setting_version = 22
+type = quality
+variant = 0.20mm_Elegoo_Nozzle
+
+[values]
+brim_width = 8
+infill_overlap = =0 if resolveOrValue('infill_sparse_density') > 80 else 10
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
+material_print_temperature = 190
+retraction_hop = 0.2
+skin_overlap = 5
+speed_print = 30
+speed_wall = =math.ceil(speed_print * 25 / 30)
+speed_wall_0 = =math.ceil(speed_print * 20 / 30)
+top_bottom_thickness = 0.72
+travel_avoid_distance = 0.4
+wall_0_inset = 0.015
+wall_0_wipe_dist = 0.25
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg
new file mode 100644
index 0000000000..f98dd73c40
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg
@@ -0,0 +1,28 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.20_lay0.10
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_010
+setting_version = 22
+type = quality
+variant = 0.20mm_Elegoo_Nozzle
+
+[values]
+brim_width = 8
+infill_overlap = =0 if resolveOrValue('infill_sparse_density') > 80 else 10
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
+material_print_temperature = 190
+retraction_hop = 0.2
+skin_overlap = 5
+speed_print = 30
+speed_wall = =math.ceil(speed_print * 25 / 30)
+speed_wall_0 = =math.ceil(speed_print * 20 / 30)
+top_bottom_thickness = 0.72
+travel_avoid_distance = 0.4
+wall_0_inset = 0.015
+wall_0_wipe_dist = 0.25
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg
new file mode 100644
index 0000000000..d5a2f73729
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg
@@ -0,0 +1,21 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.40_lay0.10
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_010
+setting_version = 22
+type = quality
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+prime_tower_enable = False
+raft_airgap = 0.25
+retraction_prime_speed = =retraction_speed
+skin_overlap = 10
+top_bottom_thickness = 1
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg
new file mode 100644
index 0000000000..e86f454664
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.40_lay0.15
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_015
+setting_version = 22
+type = quality
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+prime_tower_enable = False
+raft_airgap = 0.25
+retraction_prime_speed = =retraction_speed
+speed_print = 70
+speed_topbottom = =math.ceil(speed_print * 35 / 70)
+speed_wall = =math.ceil(speed_print * 45 / 70)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 70)
+top_bottom_thickness = 1
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg
new file mode 100644
index 0000000000..db7e5a43c7
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg
@@ -0,0 +1,28 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.40_lay0.20
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_020
+setting_version = 22
+type = quality
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+acceleration_wall = 2000
+acceleration_wall_0 = 2000
+infill_sparse_density = 15
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature + 5
+prime_tower_enable = False
+raft_airgap = 0.25
+retraction_prime_speed = =retraction_speed
+skin_overlap = 20
+speed_topbottom = =math.ceil(speed_print * 40 / 70)
+speed_wall = =math.ceil(speed_print * 55 / 70)
+speed_wall_0 = =math.ceil(speed_wall * 45 / 50)
+top_bottom_thickness = 0.8
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg
new file mode 100644
index 0000000000..d84cc9e656
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg
@@ -0,0 +1,31 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.40_lay0.30
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_030
+setting_version = 22
+type = quality
+variant = 0.40mm_Elegoo_Nozzle
+
+[values]
+acceleration_print = 2000
+acceleration_topbottom = 1000
+acceleration_wall = 1500
+acceleration_wall_0 = 1000
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+infill_sparse_density = 15
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature + 10
+prime_tower_enable = False
+raft_airgap = 0.25
+retraction_prime_speed = =retraction_speed
+skin_overlap = 20
+speed_print = 50
+speed_wall = 50
+top_bottom_thickness = 0.9
+wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg
new file mode 100644
index 0000000000..043662209b
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.60_lay0.15
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_015
+setting_version = 22
+type = quality
+variant = 0.60mm_Elegoo_Nozzle
+
+[values]
+wall_thickness = =line_width*2
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg
new file mode 100644
index 0000000000..b47c51abeb
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.60_lay0.20
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_020
+setting_version = 22
+type = quality
+variant = 0.60mm_Elegoo_Nozzle
+
+[values]
+wall_thickness = =line_width*2
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg
new file mode 100644
index 0000000000..38de41d075
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.60_lay0.30
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_030
+setting_version = 22
+type = quality
+variant = 0.60mm_Elegoo_Nozzle
+
+[values]
+wall_thickness = =line_width*2
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg
new file mode 100644
index 0000000000..efb1ababd0
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg
@@ -0,0 +1,15 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.60_lay0.40
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_040
+setting_version = 22
+type = quality
+variant = 0.60mm_Elegoo_Nozzle
+
+[values]
+wall_thickness = =line_width*2
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg
new file mode 100644
index 0000000000..b6c63fad0f
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg
@@ -0,0 +1,26 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.80_lay0.30
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_030
+setting_version = 22
+type = quality
+variant = 0.80mm_Elegoo_Nozzle
+
+[values]
+gradual_infill_step_height = =3 * layer_height
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature + 10
+prime_tower_enable = True
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_wall_x = =speed_wall
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg
new file mode 100644
index 0000000000..1e3eec080a
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg
@@ -0,0 +1,27 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.80_lay0.40
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_040
+setting_version = 22
+type = quality
+variant = 0.80mm_Elegoo_Nozzle
+
+[values]
+gradual_infill_step_height = =3 * layer_height
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature + 15
+prime_tower_enable = True
+speed_infill = =math.ceil(speed_print * 35 / 45)
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 35 / 45)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_wall_x = =speed_wall
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
+
diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg
new file mode 100644
index 0000000000..089c501484
--- /dev/null
+++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg
@@ -0,0 +1,28 @@
+[general]
+definition = elegoo_base
+name = pla_noz0.80_lay0.60
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = Elegoo_layer_060
+setting_version = 22
+type = quality
+variant = 0.80mm_Elegoo_Nozzle
+
+[values]
+gradual_infill_step_height = =3 * layer_height
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =default_material_print_temperature + 15
+prime_tower_enable = True
+speed_infill = =math.ceil(speed_print * 35 / 45)
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 35 / 45)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_wall_x = =speed_wall
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
+
+
diff --git a/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg
deleted file mode 100644
index f7b053bdcb..0000000000
--- a/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[general]
-definition = elegoo_base
-name = pla_040012
-version = 4
-
-[metadata]
-material = generic_pla_175
-quality_type = high
-setting_version = 22
-type = quality
-
-[values]
-brim_width = 3.5
-default_material_bed_temperature = 50
-layer_0_z_overlap = =raft_airgap*0.7
-raft_airgap = =0.3
-retraction_speed = 45
-
diff --git a/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg
deleted file mode 100644
index edfa7bce40..0000000000
--- a/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[general]
-definition = elegoo_base
-name = pla_040016
-version = 4
-
-[metadata]
-material = generic_pla_175
-quality_type = normal
-setting_version = 22
-type = quality
-
-[values]
-brim_width = 3.5
-default_material_bed_temperature = 50
-layer_0_z_overlap = =raft_airgap*0.7
-raft_airgap = =0.3
-retraction_speed = 45
-
diff --git a/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg
deleted file mode 100644
index 1ef410c7d9..0000000000
--- a/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[general]
-definition = elegoo_base
-name = pla_040020
-version = 4
-
-[metadata]
-material = generic_pla_175
-quality_type = fine
-setting_version = 22
-type = quality
-
-[values]
-brim_width = 3.5
-default_material_bed_temperature = 50
-layer_0_z_overlap = =raft_airgap*0.7
-raft_airgap = =0.3
-retraction_speed = 45
-
diff --git a/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg
deleted file mode 100644
index e4d262d072..0000000000
--- a/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[general]
-definition = elegoo_base
-name = pla_040024
-version = 4
-
-[metadata]
-material = generic_pla_175
-quality_type = medium
-setting_version = 22
-type = quality
-
-[values]
-brim_width = 3.5
-default_material_bed_temperature = 50
-layer_0_z_overlap = =raft_airgap*0.6
-raft_airgap = =0.3
-retraction_speed = 45
-
diff --git a/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg
deleted file mode 100644
index fcbaf32f5c..0000000000
--- a/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[general]
-definition = elegoo_base
-name = pla_040028
-version = 4
-
-[metadata]
-material = generic_pla_175
-quality_type = draft
-setting_version = 22
-type = quality
-
-[values]
-brim_width = 3.5
-default_material_bed_temperature = 50
-layer_0_z_overlap = =raft_airgap*0.6
-raft_airgap = =0.35
-retraction_speed = 45
-
diff --git a/resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg
similarity index 79%
rename from resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg
rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg
index 0c3def3b89..32e2de589d 100644
--- a/resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg
+++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = tpu_040012
+name = tpu_noz0.40_lay0.10
 version = 4
 
 [metadata]
-material = generic_tpu_175
-quality_type = high
+material = generic_tpu
+quality_type = Elegoo_layer_010
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 5
diff --git a/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg
similarity index 79%
rename from resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg
rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg
index 6896a66e58..d2cd594cb7 100644
--- a/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg
+++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = tpu_040016
+name = tpu_noz0.40_lay0.15
 version = 4
 
 [metadata]
-material = generic_tpu_175
-quality_type = normal
+material = generic_tpu
+quality_type = Elegoo_layer_015
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 5
diff --git a/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg
similarity index 79%
rename from resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg
rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg
index 5ed6b7eb90..31e3b9a1ff 100644
--- a/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg
+++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = tpu_040020
+name = tpu_noz0.40_lay0.20
 version = 4
 
 [metadata]
-material = generic_tpu_175
-quality_type = fine
+material = generic_tpu
+quality_type = Elegoo_layer_020
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 5
@@ -22,4 +23,3 @@ speed_support_interface = =speed_wall_x
 speed_topbottom = =speed_wall
 speed_wall_x = =speed_wall
 support_angle = 35
-
diff --git a/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg
similarity index 79%
rename from resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg
rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg
index 43ddf35629..4c63fc0cff 100644
--- a/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg
+++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg
@@ -1,13 +1,14 @@
 [general]
 definition = elegoo_base
-name = tpu_040024
+name = tpu_noz0.40_lay0.30
 version = 4
 
 [metadata]
-material = generic_tpu_175
-quality_type = medium
+material = generic_tpu
+quality_type = Elegoo_layer_030
 setting_version = 22
 type = quality
+variant = 0.40mm_Elegoo_Nozzle
 
 [values]
 brim_width = 5
@@ -22,4 +23,3 @@ speed_support_interface = =speed_wall_x
 speed_topbottom = =speed_wall
 speed_wall_x = =speed_wall
 support_angle = 35
-
diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg
new file mode 100644
index 0000000000..ff14878f69
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_1
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg
new file mode 100644
index 0000000000..30ee88ddd3
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_1
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg
new file mode 100644
index 0000000000..8a5d31cca2
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_1
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg
new file mode 100644
index 0000000000..558d8fbdad
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_1
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg
new file mode 100644
index 0000000000..4c1180e555
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg
new file mode 100644
index 0000000000..a38d2db989
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg
new file mode 100644
index 0000000000..13cd15ad7d
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg
new file mode 100644
index 0000000000..785396f64a
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg
new file mode 100644
index 0000000000..eded48e16d
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2D
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg
new file mode 100644
index 0000000000..68655ba6f6
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2D
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg
new file mode 100644
index 0000000000..93094eced6
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2D
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg
new file mode 100644
index 0000000000..cc5430a687
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2D
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg
new file mode 100644
index 0000000000..dba8f4835c
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2s
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg
new file mode 100644
index 0000000000..c289d4595f
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2s
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg
new file mode 100644
index 0000000000..23a9449b56
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2s
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg
new file mode 100644
index 0000000000..a4ec2af878
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_2s
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg
new file mode 100644
index 0000000000..253e434aaa
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg
new file mode 100644
index 0000000000..1a638c6f36
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg
new file mode 100644
index 0000000000..4ae27b83f3
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg
new file mode 100644
index 0000000000..bd4be2b2dc
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg
new file mode 100644
index 0000000000..502b18c49a
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg
new file mode 100644
index 0000000000..8e5aa468d8
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg
new file mode 100644
index 0000000000..58dd28cbc1
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg
new file mode 100644
index 0000000000..b63632a71e
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
\ No newline at end of file
diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg
new file mode 100644
index 0000000000..502b18c49a
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg
new file mode 100644
index 0000000000..8e5aa468d8
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg
new file mode 100644
index 0000000000..58dd28cbc1
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg
new file mode 100644
index 0000000000..b63632a71e
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+definition = elegoo_neptune_3max
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
\ No newline at end of file
diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg
new file mode 100644
index 0000000000..54301e7ad8
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3pro
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg
new file mode 100644
index 0000000000..0e49ef7d51
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3pro
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg
new file mode 100644
index 0000000000..9e60d5aaa5
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3pro
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg
new file mode 100644
index 0000000000..c69d81dab8
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_3pro
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg
new file mode 100644
index 0000000000..c06a52f29b
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_x
+name = 0.20mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg
new file mode 100644
index 0000000000..2d3802546f
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_x
+name = 0.40mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg
new file mode 100644
index 0000000000..e0a715a717
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_x
+name = 0.60mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg
new file mode 100644
index 0000000000..196a9f8ce0
--- /dev/null
+++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = elegoo_neptune_x
+name = 0.80mm_Elegoo_Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 22
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+