diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json
index 3e4101fd07..e2edeb7e5b 100644
--- a/resources/definitions/creality_ender3s1plus.def.json
+++ b/resources/definitions/creality_ender3s1plus.def.json
@@ -1,34 +1,32 @@
 {
-    "name": "Creality Ender-3 S1 Plus",
     "version": 2,
+    "name": "Creality Ender-3 S1 Plus",
     "inherits": "creality_base",
-    "metadata": {
-        "quality_definition": "creality_base",
-        "visible": true
+    "metadata":
+    {
+        "visible": true,
+        "quality_definition": "creality_base"
     },
-    "overrides": {
-        "machine_name": { "default_value": "Creality Ender-3 S1 Plus" },
-        "machine_width": { "default_value": 300 },
+    "overrides":
+    {
+        "gantry_height": { "value": 25 },
         "machine_depth": { "default_value": 300 },
-        "machine_height": { "default_value": 300 },
-        "machine_head_with_fans_polygon": { "default_value": [
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
                 [-26, 34],
                 [-26, -32],
                 [32, -32],
                 [32, 34]
             ]
         },
-        "machine_start_gcode": {
-            "default_value": "; Ender 3 S1 Plus Start G-code\nG28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"
-        },
-
-        "gantry_height": { "value": 25 },
-        
-        
+        "machine_height": { "default_value": 300 },
+        "machine_name": { "default_value": "Creality Ender-3 S1 Plus" },
+        "machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\nG28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
+        "machine_width": { "default_value": 300 },
+        "retraction_amount": { "value": 0.8 },
+        "retraction_speed": { "default_value": 40 },
         "speed_layer_0": { "value": 25 },
-        "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
-        
-        "retraction_amount": { "value":  0.8 },
-        "retraction_speed": { "default_value": 40 }
+        "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json
index ab638820cd..5e616edfb0 100644
--- a/resources/definitions/creality_ender3s1pro.def.json
+++ b/resources/definitions/creality_ender3s1pro.def.json
@@ -1,34 +1,31 @@
 {
-    "name": "Creality Ender-3 S1 Pro",
     "version": 2,
+    "name": "Creality Ender-3 S1 Pro",
     "inherits": "creality_base",
-    "metadata": {
-        "quality_definition": "creality_base",
-        "visible": true
+    "metadata":
+    {
+        "visible": true,
+        "quality_definition": "creality_base"
     },
-    "overrides": {
-        "machine_name": { "default_value": "Creality Ender-3 S1 Pro" },
-        "machine_width": { "default_value": 220 },
+    "overrides":
+    {
+        "gantry_height": { "value": 25 },
         "machine_depth": { "default_value": 220 },
-        "machine_height": { "default_value": 270 },
-        "machine_head_with_fans_polygon": { "default_value": [
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
                 [-26, 34],
                 [-26, -32],
                 [32, -32],
                 [32, 34]
             ]
         },
-        "machine_start_gcode": {
-            "default_value": "; Ender 3 S1 Pro Start G-code\nG28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"
-        },
-
-        "gantry_height": { "value": 25 },
-        
-        
-        
-        "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
-        
-        "retraction_amount": { "value":  0.8 },
-        "retraction_speed": { "default_value": 40 }
+        "machine_height": { "default_value": 270 },
+        "machine_name": { "default_value": "Creality Ender-3 S1 Pro" },
+        "machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\nG28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
+        "machine_width": { "default_value": 220 },
+        "retraction_amount": { "value": 0.8 },
+        "retraction_speed": { "default_value": 40 },
+        "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/variants/creality_ender3s1plus_0.2.inst.cfg b/resources/variants/creality_ender3s1plus_0.2.inst.cfg
index 7cfd154ab6..06d8221c8b 100644
--- a/resources/variants/creality_ender3s1plus_0.2.inst.cfg
+++ b/resources/variants/creality_ender3s1plus_0.2.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1plus
 name = 0.2mm Nozzle
 version = 4
-definition = creality_ender3s1plus
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.2
+
diff --git a/resources/variants/creality_ender3s1plus_0.3.inst.cfg b/resources/variants/creality_ender3s1plus_0.3.inst.cfg
index a531f6ee33..90c4cd8008 100644
--- a/resources/variants/creality_ender3s1plus_0.3.inst.cfg
+++ b/resources/variants/creality_ender3s1plus_0.3.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1plus
 name = 0.3mm Nozzle
 version = 4
-definition = creality_ender3s1plus
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.3
+
diff --git a/resources/variants/creality_ender3s1plus_0.4.inst.cfg b/resources/variants/creality_ender3s1plus_0.4.inst.cfg
index 6f675550fc..d163c7f9ab 100644
--- a/resources/variants/creality_ender3s1plus_0.4.inst.cfg
+++ b/resources/variants/creality_ender3s1plus_0.4.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1plus
 name = 0.4mm Nozzle
 version = 4
-definition = creality_ender3s1plus
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.4
+
diff --git a/resources/variants/creality_ender3s1plus_0.5.inst.cfg b/resources/variants/creality_ender3s1plus_0.5.inst.cfg
index 2ebba008f7..eb58aca648 100644
--- a/resources/variants/creality_ender3s1plus_0.5.inst.cfg
+++ b/resources/variants/creality_ender3s1plus_0.5.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1plus
 name = 0.5mm Nozzle
 version = 4
-definition = creality_ender3s1plus
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.5
+
diff --git a/resources/variants/creality_ender3s1plus_0.6.inst.cfg b/resources/variants/creality_ender3s1plus_0.6.inst.cfg
index 41bbdf774a..76dfbb3512 100644
--- a/resources/variants/creality_ender3s1plus_0.6.inst.cfg
+++ b/resources/variants/creality_ender3s1plus_0.6.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1plus
 name = 0.6mm Nozzle
 version = 4
-definition = creality_ender3s1plus
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.6
+
diff --git a/resources/variants/creality_ender3s1plus_0.8.inst.cfg b/resources/variants/creality_ender3s1plus_0.8.inst.cfg
index 056dee24e0..233d4c6230 100644
--- a/resources/variants/creality_ender3s1plus_0.8.inst.cfg
+++ b/resources/variants/creality_ender3s1plus_0.8.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1plus
 name = 0.8mm Nozzle
 version = 4
-definition = creality_ender3s1plus
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.8
+
diff --git a/resources/variants/creality_ender3s1plus_1.0.inst.cfg b/resources/variants/creality_ender3s1plus_1.0.inst.cfg
index da0ef959d0..446bb0b458 100644
--- a/resources/variants/creality_ender3s1plus_1.0.inst.cfg
+++ b/resources/variants/creality_ender3s1plus_1.0.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1plus
 name = 1.0mm Nozzle
 version = 4
-definition = creality_ender3s1plus
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 1.0
+
diff --git a/resources/variants/creality_ender3s1pro_0.4.inst.cfg b/resources/variants/creality_ender3s1pro_0.4.inst.cfg
index c842c6fb36..a6b3ebcb7d 100644
--- a/resources/variants/creality_ender3s1pro_0.4.inst.cfg
+++ b/resources/variants/creality_ender3s1pro_0.4.inst.cfg
@@ -1,12 +1,13 @@
 [general]
+definition = creality_ender3s1pro
 name = 0.4mm Nozzle
 version = 4
-definition = creality_ender3s1pro
 
 [metadata]
+hardware_type = nozzle
 setting_version = 20
 type = variant
-hardware_type = nozzle
 
 [values]
 machine_nozzle_size = 0.4
+