diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json
index 236ef63188..2f5f02d7db 100644
--- a/resources/definitions/eryone_er20.def.json
+++ b/resources/definitions/eryone_er20.def.json
@@ -48,10 +48,10 @@
         },
         "gantry_height":{ "value": "0" },
         "machine_start_gcode": {
-            "default_value": "G90 ; use absolute coordinates\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling/ABL\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0.0\nG1 Y-2.0 X150 F2400G1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\nG1 X150 F1000\nG1 Z0.2 F720\nG1 X80.0 E8.0 F900\nG1 X20.0 E10.0 F700\nG92 E0.0\nM221 S95 ; set flow\n"
+            "default_value": "G21 ;Metric values\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode\nM107 ;Start with the fan off\nG28 ;Homing the hotend\nG29 ;Auto bed leveling detecting\nG92 E0 ;Reset the extruded length\nG1 F200 E3 ;Extrude 3mm of filament\nG92 E0 ;Reset the extruded length again\nG1 Y-3 F1200 ;Move y axis to prime\nG1 X150 F6000 ;Move x axis to prime\nG1 Z0.2 F720 ;Move z axis to prime\nG1 X80.0 E8.0 F900 ;Prime line\nG1 X20.0 E10.0 F700 ;Prime line\nG92 E0 ;Reset the extruded length\nG5 ;Enable resume from power failure\nM117 Printing...\n"
         },
         "machine_end_gcode": {
-            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
+            "default_value": "G91 ;Relative positioning\nG1 Z5 F720 ;Raise Z\nG1 E-5 F300 ;Retract a bit to protect nozzle\nM104 S0 ;Turn off extruder\nM140 S0 ;Turn off bed\nM107 ;Turn off all fans\nG90 ;Absolute positioning\nG1 X230 Y200 F4800 ;Parking the hotend\nM84 X Y E ;All steppers off but left Z\n"
         },
         "material_print_temperature": {
             "value": 205
diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json
index f5487f986a..02d8abc8bf 100644
--- a/resources/definitions/eryone_thinker.def.json
+++ b/resources/definitions/eryone_thinker.def.json
@@ -54,7 +54,7 @@
             "value": 30 
         },
         "machine_gcode_flavor": { 
-            "default_value": "Marlin" 
+            "default_value": "RepRap (Marlin/Sprinter)" 
         },
         "machine_start_gcode": { 
             "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nM413 S1 ;enable resume from power failure\nM117 Printing..." 
@@ -62,6 +62,112 @@
         "machine_end_gcode": { 
             "default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off" 
         },
+        "layer_height": {
+            "value": 0.2
+        },
+        "layer_height_0": {
+            "resolve": "max(0.1, layer_height)"
+        },
+        "initial_layer_line_width_factor": {
+            "value": 120
+        },
+        "wall_line_count": {
+            "value": 3
+        },
+        "wall_thickness": {
+            "value": "line_width * wall_line_count"
+        },
+        "optimize_wall_printing_order": {
+            "default_value": true 
+        },
+        "outer_inset_first": {
+            "default_value": false 
+        },
+        "z_seam_type": {
+            "value": "'shortest'"
+        },
+        "z_seam_corner": {
+            "value": "'z_seam_corner_inner'"
+        },
+        "roofing_layer_count": {
+            "value": 1
+        },
+        "top_layers": {
+            "value": 6
+        },
+        "top_thickness":{
+            "value": "layer_height * top_layers"
+        },
+        "bottom_layers": {
+            "value": 4
+        },
+        "bottom_thickness":{
+            "value": "layer_height * bottom_layers"
+        },
+        "skin_overlap": {
+            "value": 10
+        },
+        "infill_sparse_density": {
+            "value": 20
+        },
+        "infill_pattern": {
+            "value": "'lines' if infill_sparse_density > 25 else 'grid'"
+        },
+        "infill_overlap": {
+            "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0"
+        },
+        "infill_before_walls": {
+            "value": false
+        },
+        "material_print_temperature": {
+            "value": "default_material_print_temperature",
+            "maximum_value_warning": 250
+        },
+        "material_print_temperature_layer_0": {
+            "value": "material_print_temperature + 5",
+            "maximum_value_warning": 250
+        },
+        "material_initial_print_temperature": {
+            "value": "material_print_temperature",
+            "maximum_value_warning": 250
+        },
+        "material_final_print_temperature": {
+            "value": "material_print_temperature"
+        },
+        "material_bed_temperature": {
+            "value": "default_material_bed_temperature",
+            "maximum_value_warning": 100
+        },
+        "material_bed_temperature_layer_0": {
+            "value": "material_bed_temperature"
+        },
+        "speed_infill": {
+            "value": "speed_print"
+        },
+        "speed_wall": {
+            "value": "speed_print"
+        },
+        "speed_wall_0": {
+            "value": "math.ceil(speed_print * 30 / 50)"
+        },
+        "speed_wall_x": {
+            "value": "speed_print"
+        },
+        "speed_topbottom": {
+            "value": "math.ceil(speed_print * 20 / 50)"
+        },
+        "speed_travel": {
+            "value": "speed_print if magic_spiralize else 120"
+        },
+        "speed_layer_0": {
+            "value": "math.ceil(speed_print * 30 / 50)"
+        },
+        "skirt_brim_speed": {
+            "value": "math.ceil(speed_print * 40 / 60)"
+        },
+        "speed_z_hop": {
+            "value": "math.ceil(speed_print * 30 / 60)"
+        },
         "acceleration_enabled": {
             "value": true
         },
@@ -71,38 +177,6 @@
         "acceleration_travel": {
             "value": 1500
         },
-        "adhesion_type": { 
-            "value": "'skirt'"
-        },
-        "brim_width": {
-            "value": 5
-        },
-        "cool_fan_full_at_height": {
-            "value": 0.5
-        },
-        "cool_fan_speed": {
-            "value": 100
-        },
-        "cool_fan_speed_0": {
-            "value": 0
-        },
-        "infill_overlap": {
-            "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0",
-            "maximum_value_warning": 100,
-            "minimum_value_warning": -50
-        },
-        "infill_pattern": {
-            "value": "'lines' if infill_sparse_density > 25 else 'grid'"
-        },
-        "infill_sparse_density": {
-            "value": 20
-        },
-        "initial_layer_line_width_factor": {
-            "value": 120
-        },
-        "infill_before_walls": {
-            "value": false
-        },
         "jerk_enabled": {
             "value": true
         },
@@ -112,35 +186,11 @@
         "jerk_travel": {
             "value": 15
         },
-        "material_bed_temperature": {
-            "maximum_value_warning": 100
-        },
-        "material_print_temperature": {
-            "maximum_value_warning": 250
-        },
-        "optimize_wall_printing_order": {
-            "default_value": true 
-        },
-        "outer_inset_first": {
-            "default_value": false 
-        },
         "retract_at_layer_change": {
             "value": true
         },
         "retraction_amount": {
-            "default_value": 4
-        },
-        "retraction_hop": {
-            "value": 0.075
-        },
-        "retraction_hop_enabled": {
-            "value": false
-        },
-        "retraction_hop_only_when_collides": {
-            "value": true
-        },
-        "retraction_min_travel": {
-            "value": 1.5
+            "default_value": 4.5
         },
         "retraction_speed": {
             "default_value": 85,
@@ -153,101 +203,56 @@
             "value": "math.ceil(retraction_speed * 0.4)",
             "maximum_value_warning": 130
         },
+        "retraction_min_travel": {
+            "value": "max(line_width * 2, 1.5)"
+        },
         "retraction_combing": {
             "value": "'off' if retraction_hop_enabled else 'noskin'"
         },
-        "skin_overlap": {
-            "value": 10
-        },
-        "skirt_brim_speed": {
-            "value": "math.ceil(speed_print * 40 / 60)"
-        },
-        "skirt_gap": {
-            "value": 5
-        },
-        "skirt_line_count": {
-            "value": 3
-        },
-        "speed_infill": {
-            "value": "speed_print"
-        },
-        "speed_topbottom": {
-            "value": "math.ceil(speed_print * 20 / 50)"
-        },
-        "speed_travel": {
-            "value": "120"
-        },
-        "speed_layer_0": {
-            "value": "math.ceil(speed_print * 30 / 50)"
-        },
-        "speed_wall": {
-            "value": "speed_print"
-        },
-        "speed_wall_0": {
-            "value": "math.ceil(speed_print * 30 / 50)"
-        },
-        "speed_wall_x": {
-            "value": "speed_print"
-        },
-        "support_angle": {
-            "value": 50
-        },
-        "support_enable": {
-            "default_value": false
-        },
-        "support_interface_enable": {
-            "value": true
-        },
-        "support_pattern": {
-            "value": "'triangles'"
-        },
-        "support_roof_enable": {
-            "value": true
-        },
-        "support_type": {
-            "value": "'everywhere'"
-        },
-        "support_use_towers": {
-            "value": false
-        },
-        "support_z_distance": {
-            "value": 0.3
-        },
-        "support_xy_distance": {
-            "value": 0.7
-        },
-        "support_xy_distance_overhang": {
-            "value": 0.2
-        },
-        "smooth_spiralized_contours": {
-            "value": false
-        },
         "travel_retract_before_outer_wall": {
             "value": true
         },
-        "wall_line_count": {
+        "retraction_hop_enabled": {
+            "value": false
+        },
+        "retraction_hop_only_when_collides": {
+            "value": true
+        },
+        "retraction_hop": {
+            "value": 0.1
+        },
+        "support_pattern": {
+            "value": "'triangles'"
+        },
+        "support_z_distance": {
+            "value": 0.3
+        },
+        "support_interface_enable": {
+            "value": true
+        },
+        "support_roof_enable": {
+            "value": true
+        },
+        "support_use_towers": {
+            "value": false
+        },
+        "adhesion_type": { 
+            "value": "'skirt'"
+        },
+        "skirt_line_count": {
             "value": 3
-          },
-        "wall_thickness": {
-            "value": "line_width * wall_line_count"
         },
-        "bottom_layers": {
-            "value": "4"
+        "skirt_gap": {
+            "value": 5
         },
-        "bottom_thickness":{
-            "value": "layer_height * bottom_layers"
+        "brim_width": {
+            "value": 5
         },
-        "top_layers": {
-            "value": "6"
+        "smooth_spiralized_contours": {
+            "value": false
         },
-        "top_thickness":{
-            "value": "layer_height * top_layers"
-        },
-        "z_seam_type": {
-            "value": "'shortest'"
-        },
-        "z_seam_corner": {
-            "value": "'z_seam_corner_inner'"
+        "roofing_monotonic": {
+            "value": true
         }
     }
 }
\ No newline at end of file
diff --git a/resources/extruders/eryone_er20_extruder_0.def.json b/resources/extruders/eryone_er20_extruder_0.def.json
index 9b1c1fa435..4dcf363af9 100644
--- a/resources/extruders/eryone_er20_extruder_0.def.json
+++ b/resources/extruders/eryone_er20_extruder_0.def.json
@@ -18,7 +18,7 @@
 		    "default_value": 1.75 
 		},
 		"machine_nozzle_offset_x": {
-		    "default_value": -10.0
+		    "default_value": 5
 		},
         "machine_nozzle_offset_y": {
 		    "default_value": 8.0
diff --git a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg
index 8eeedbf299..4ebf2f56df 100644
--- a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg
+++ b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg
@@ -16,13 +16,6 @@ acceleration_travel = 3000
 infill_sparse_density = 10
 initial_layer_line_width_factor = 100.0
 layer_height = 0.3
-layer_height_0 = =layer_height
-material_bed_temperature = =default_material_bed_temperature
-material_bed_temperature_layer_0 = =material_bed_temperature
-material_final_print_temperature = =material_print_temperature
-material_initial_print_temperature = =material_print_temperature
-material_print_temperature = =default_material_print_temperature
-material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5)
 skirt_brim_speed = =math.ceil(speed_print * 40 / 50)
 speed_print = 100.0
 speed_infill = =math.ceil(speed_print * 60 / 50)
@@ -31,7 +24,6 @@ speed_travel = =speed_print if magic_spiralize else 150
 speed_layer_0 = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_print * 40 / 50)
 speed_wall_x = =math.ceil(speed_print * 60 / 50)
-speed_z_hop = =math.ceil(speed_print * 30 / 60)
 top_layers = 4
 bottom_layers = 2
 wall_line_count = 2
diff --git a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
index e44d39ae7d..0a173b8c56 100644
--- a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
+++ b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
@@ -14,20 +14,12 @@ global_quality = True
 acceleration_print = 1500
 acceleration_travel = 3000
 infill_sparse_density = 15
-initial_layer_line_width_factor = 100.0
+initial_layer_line_width_factor = 110.0
 layer_height = 0.25
-layer_height_0 = =layer_height
-material_bed_temperature = =default_material_bed_temperature
-material_bed_temperature_layer_0 = =material_bed_temperature
-material_final_print_temperature = =material_print_temperature
-material_initial_print_temperature = =material_print_temperature
-material_print_temperature = =default_material_print_temperature
-material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5)
 speed_infill = =math.ceil(speed_print * 80 / 60)
 speed_topbottom = =math.ceil(speed_print * 40 / 60)
 speed_travel = =speed_print if magic_spiralize else 150
 speed_wall_x = =math.ceil(speed_print * 80 / 60)
-speed_z_hop = =math.ceil(speed_print * 30 / 60)
-top_layers = 4
-bottom_layers = 2
-wall_line_count = 2
+top_layers = 5
+bottom_layers = 3
+wall_line_count = 2
\ No newline at end of file
diff --git a/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg
new file mode 100644
index 0000000000..05c7760d98
--- /dev/null
+++ b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg
@@ -0,0 +1,22 @@
+[general]
+version = 4
+name = Fine
+definition = eryone_thinker
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = fine
+weight = 2
+global_quality = True
+
+[values]
+alternate_extra_perimeter = true
+infill_sparse_density = 30
+initial_layer_line_width_factor = 130.0
+layer_height = 0.1
+speed_print = 40.0
+speed_topbottom = =math.ceil(speed_print * 30 / 60)
+speed_travel = =speed_print if magic_spiralize else 100
+top_layers = 12
+bottom_layers = 8
diff --git a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg
index f7ad19e93f..c535a24198 100644
--- a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg
+++ b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg
@@ -13,18 +13,10 @@ global_quality = True
 [values]
 alternate_extra_perimeter = true
 infill_sparse_density = 25
-initial_layer_line_width_factor = 130.0
-layer_height = 0.1
-layer_height_0 = =layer_height
-material_bed_temperature = =default_material_bed_temperature
-material_bed_temperature_layer_0 = =material_bed_temperature
-material_final_print_temperature = =material_print_temperature
-material_initial_print_temperature = =material_print_temperature
-material_print_temperature = =default_material_print_temperature
-material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5)
+initial_layer_line_width_factor = 125.0
+layer_height = 0.15
 speed_print = 50.0
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_travel = =speed_print if magic_spiralize else 100
-speed_z_hop = =math.ceil(speed_print * 30 / 60)
-top_layers = 12
-bottom_layers = 8
+top_layers = 8
+bottom_layers = 6
diff --git a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg
index 458e3d0e3c..cc12b5cb79 100644
--- a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg
+++ b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg
@@ -11,18 +11,3 @@ weight = 0
 global_quality = True
 
 [values]
-infill_sparse_density = 20
-initial_layer_line_width_factor = 120.0
-layer_height = 0.2
-layer_height_0 = =layer_height
-material_bed_temperature = =default_material_bed_temperature
-material_bed_temperature_layer_0 = =material_bed_temperature
-material_final_print_temperature = =material_print_temperature
-material_initial_print_temperature = =material_print_temperature
-material_print_temperature = =default_material_print_temperature
-material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5)
-speed_travel = =speed_print if magic_spiralize else 120
-speed_z_hop = =math.ceil(speed_print * 30 / 60)
-top_layers = 6
-bottom_layers = 4
-