diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json
index 6534b8c471..f5487f986a 100644
--- a/resources/definitions/eryone_thinker.def.json
+++ b/resources/definitions/eryone_thinker.def.json
@@ -12,7 +12,7 @@
         "platform_texture": "eryone_thinker_plate.png",
         "platform_offset": [0, -120, 0],
         "has_materials": true,
-        "preferred_material": "generic_pla",
+        "preferred_material": "eryone_pla",
         "has_machine_quality": true,
         "preferred_quality_type": "normal",
         "machine_extruder_trains": 
@@ -57,10 +57,10 @@
             "default_value": "Marlin" 
         },
         "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\nG5 ;enable resume from power failure\nM117 Printing..." 
+            "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..." 
         },
         "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 E-5 F300\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" 
+            "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" 
         },
         "acceleration_enabled": {
             "value": true
@@ -160,7 +160,7 @@
             "value": 10
         },
         "skirt_brim_speed": {
-            "value": 40
+            "value": "math.ceil(speed_print * 40 / 60)"
         },
         "skirt_gap": {
             "value": 5
@@ -229,7 +229,7 @@
             "value": 3
           },
         "wall_thickness": {
-            "value": "1.2"
+            "value": "line_width * wall_line_count"
         },
         "bottom_layers": {
             "value": "4"
@@ -250,4 +250,4 @@
             "value": "'z_seam_corner_inner'"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg
new file mode 100644
index 0000000000..a824d8f84a
--- /dev/null
+++ b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg
@@ -0,0 +1,37 @@
+[general]
+version = 4
+name = Extra Fast
+definition = eryone_thinker
+
+[metadata]
+setting_version = 17
+type = quality
+quality_type = verydraft
+weight = -3
+global_quality = True
+
+[values]
+acceleration_print = 1500
+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)
+speed_topbottom = =math.ceil(speed_print * 40 / 50)
+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 f7d701f771..125fc1e15a 100644
--- a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
+++ b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
@@ -11,9 +11,11 @@ weight = -1
 global_quality = True
 
 [values]
+acceleration_print = 1500
+acceleration_travel = 3000
 infill_sparse_density = 15
 initial_layer_line_width_factor = 100.0
-layer_height = 0.3
+layer_height = 0.25
 layer_height_0 = =layer_height
 material_bed_temperature = =default_material_bed_temperature
 material_bed_temperature_layer_0 = =material_bed_temperature