diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json
index 7dd0c9fd37..1527e09529 100644
--- a/resources/definitions/mixware_hyper_s.def.json
+++ b/resources/definitions/mixware_hyper_s.def.json
@@ -1,23 +1,27 @@
 {
-    "name": "Hyper-S",
+    "name": "Hyper S",
     "version": 2,
     "inherits": "fdmprinter",
     "metadata": {
         "visible": true,
         "author": "Mixware",
         "manufacturer": "Mixware",
+        "category": "Mixware",
         "file_formats": "text/x-gcode",
-        "platform": "mixware_hyper_s_platform.stl",
-        "has_machine_quality": true,
+        "platform": "hyper_s_platform.stl",
         "has_materials": true,
-        "preferred_quality_type": "coarse",
+        "preferred_material": "*hyper_s_pla*",
+        "preferred_quality": "*extra*",
         "machine_extruder_trains": {
-            "0": "mixware_hyper_s_extruder_0"
+            "0": "hyper_s_extruder_0"
         }
     },
     "overrides": {
+        "machine_name": {
+            "default_value": "Hyper S"
+        },
         "machine_start_gcode": {
-            "default_value": "M140 S{material_bed_temperature} ; Heat bed\nM109 S{material_print_temperature} ; Heat nozzle\nM190 S{material_bed_temperature} ; Wait for bed heating\nG28 ; home all axes\nM117 Purge extruder\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface\nG1 X0.1 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; draw 2nd line\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface"
+            "default_value": "M140 S{material_bed_temperature} ; Heat bed\nM109 S{material_print_temperature} ; Heat nozzle\nM190 S{material_bed_temperature} ; Wait for bed heating\nG28 ; home all axes\nM117 Purge extruder\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface\nG1 X0.1 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X0.1 Y100.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X0.4 Y100.0 Z0.3 F5000.0 ; move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; draw 2nd line\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface"
         },
         "machine_end_gcode": {
             "default_value": "G91; relative positioning\nG1 Z1.0 F3000 ; move z up little to prevent scratching of print\nG90; absolute positioning\nG1 X0 Y200 F1000 ; prepare for part removal\nM104 S0; turn off extruder\nM140 S0 ; turn off bed\nG1 X0 Y220 F1000 ; prepare for part removal\nM84 ; disable motors\nM106 S0 ; turn off fan"
@@ -31,89 +35,220 @@
         "machine_height": {
             "default_value": 400
         },
+        "raft_margin": {
+            "default_value": 3,
+            "minimum_value_warning": "0.01"
+        },
+        "raft_airgap": {
+            "default_value": 0.24
+        },
+        "brim_width": {
+            "default_value": 3
+        },
         "machine_heated_bed": {
             "default_value": true
         },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "top_bottom_thickness": {
-            "value": 0.8
-        },
-        "optimize_wall_printing_order": {
-            "value": true,
-            "settable_per_mesh": false
-        },
-        "material_initial_print_temperature": {
-            "value": "material_print_temperature"
-        },
-        "material_final_print_temperature": {
-            "value": "material_print_temperature"
-        },
-        "material_flow": {
-            "value": 100
-        },
-        "travel_compensate_overlapping_walls_0_enabled": {
-            "value": "False"
-        },
-        "fill_perimeter_gaps": {
-            "value": "'everywhere'"
-        },
-        "fill_outline_gaps": {
-            "value": false
-        },
-        "filter_out_tiny_gaps": {
-            "value": false
+        "material_diameter": {
+            "default_value": 1.75
         },
         "top_bottom_pattern": {
-            "value": "zigzag"
+            "default_value": "zigzag"
         },
         "ironing_line_spacing": {
-            "value": 0.4
+            "default_value": 0.4
         },
         "ironing_pattern": {
-            "value": "concentric"
+            "default_value": "concentric"
+        },
+        "skin_no_small_gaps_heuristic": {
+            "default_value": false
+        },
+        "retraction_hop_enabled": {
+            "default_value": false
+        },
+        "support_enable": {
+            "default_value": true
+        },
+        "support_type": {
+            "default_value": "buildplate"
+        },
+        "support_angle": {
+            "default_value": 60
+        },
+        "support_pattern": {
+            "default_value": "zigzag"
+        },
+        "support_infill_rate": {
+            "default_value": "15"
+        },
+        "gantry_height": {
+            "default_value": 25
+        },
+        "machine_max_feedrate_x": {
+            "default_value": 500
+        },
+        "machine_max_feedrate_y": {
+            "default_value": 500
+        },
+        "machine_max_feedrate_z": {
+            "default_value": 10
+        },
+        "machine_max_feedrate_e": {
+            "default_value": 50
+        },
+        "machine_max_acceleration_x": {
+            "default_value": 500
+        },
+        "machine_max_acceleration_y": {
+            "default_value": 500
+        },
+        "machine_max_acceleration_z": {
+            "default_value": 100
+        },
+        "machine_max_acceleration_e": {
+            "default_value": 500
+        },
+        "machine_acceleration": {
+            "default_value": 500
+        },
+        "machine_max_jerk_xy": {
+            "default_value": 10
+        },
+        "machine_max_jerk_z": {
+            "default_value": 0.4
+        },
+        "machine_max_jerk_e": {
+            "default_value": 5
+        },
+        "acceleration_print": {
+            "default_value": 1000
+        },
+        "jerk_print": {
+            "default_value": 10
+        },
+        "acceleration_enabled": {
+            "default_value": false
+        },
+        "jerk_enabled": {
+            "default_value": false
+        },
+        "speed_print": {
+            "default_value": 40.0
+        },
+        "optimize_wall_printing_order": {
+            "default_value": "True"
         },
         "z_seam_type": {
-            "value": "shortest"
+            "default_value": "shortest"
         },
-        "retraction_enable": {
-            "value": true
+        "infill_before_walls": {
+            "default_value": false
         },
-        "retraction_count_max": {
-            "value": 100
+        "infill_sparse_density": {
+            "default_value": 15
         },
-        "retraction_extrusion_window": {
-            "value": 10,
-            "maximum_value_warning": 20
+        "infill_before_walls": {
+            "default_value": false
         },
-        "retraction_min_travel": {
-            "value": 1.5
+        "fill_perimeter_gaps": {
+            "default_value": "everywhere"
+        },
+        "fill_outline_gaps": {
+            "default_value": false
+        },
+        "filter_out_tiny_gaps": {
+            "default_value": false
+        },
+        "retraction_hop": {
+            "default_value": 0.2
+        },
+        "travel_avoid_other_parts": {
+            "default_value": false
+        },
+        "travel_retract_before_outer_wall": {
+            "default_value": true
         },
         "retraction_amount": {
-            "value": 2
+            "default_value": 2
+        },
+        "retraction_enable": {
+            "default_value": true
+        },
+        "retraction_count_max": {
+            "default_value": 100
+        },
+        "cool_fan_enabled": {
+            "default_value": true
+        },
+        "cool_min_layer_time": {
+            "default_value": 10
+        },
+        "skirt_gap": {
+            "default_value": 8.0
+        },
+        "skirt_line_count": {
+            "default_value": 3
+        },
+        "adaptive_layer_height_variation": {
+            "default_value": 0.04
+        },
+        "adaptive_layer_height_variation_step": {
+            "default_value": 0.04
+        },
+        "support_use_towers": {
+            "default_value": false
+        },
+        "support_interface_enable": {
+            "default_value": true
+        },
+        "support_interface_density": {
+            "default_value": 33.333
+        },
+        "support_interface_pattern": {
+            "default_value": "grid"
+        },
+        "support_interface_skip_height": {
+            "default_value": 0.24
+        },
+        "top_bottom_thickness": {
+            "default_value": 0.8
+        },
+        "material_flow": {
+            "default_value": 100
+        },
+        "material_print_temperature": {
+            "maximum_value_warning": "330"
+        },
+        "acceleration_roofing": {
+            "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0"
         },
         "retraction_speed": {
-            "value": 40,
+            "default_value": 40,
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
+            "maximum_value": "200"
         },
         "retraction_retract_speed": {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
+            "maximum_value": "200"
         },
         "retraction_prime_speed": {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
+            "maximum_value": "200"
         },
-        "speed_print": {
-            "value": 60.0
+        "speed_layer_0": {
+            "value": "speed_print / 2"
+        },
+        "acceleration_travel_layer_0": {
+            "value": "acceleration_travel"
+        },
+        "jerk_travel": {
+            "value": "jerk_print"
+        },
+        "jerk_travel_layer_0": {
+            "value": "jerk_travel"
+        },
+        "skirt_brim_speed": {
+            "value": "speed_layer_0"
         },
         "speed_infill": {
             "value": "speed_print"
@@ -136,9 +271,6 @@
         "speed_travel": {
             "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5"
         },
-        "speed_layer_0": {
-            "value": 20.0
-        },
         "speed_print_layer_0": {
             "value": "speed_layer_0"
         },
@@ -154,92 +286,20 @@
         "speed_support_interface": {
             "value": "speed_topbottom"
         },
-        "speed_z_hop": {
-            "value": 5
+        "material_initial_print_temperature": {
+            "value": "material_print_temperature"
         },
-        "skirt_brim_speed": {
-            "value": "speed_layer_0"
-        },
-        "line_width": {
-            "value": "0.4"
-        },
-        "acceleration_enabled": {
-            "value": true
-        },
-        "acceleration_print": {
-            "value": 1000
-        },
-        "acceleration_travel": {
-            "value": 1000
-        },
-        "acceleration_travel_layer_0": {
-            "value": "acceleration_travel"
-        },
-        "acceleration_roofing": {
-            "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0"
-        },
-        "jerk_print": {
-            "value": 10
-        },
-        "jerk_travel": {
-            "value": "jerk_print"
-        },
-        "jerk_travel_layer_0": {
-            "value": "jerk_travel"
-        },
-        "jerk_enabled": {
-            "value": false
-        },
-        "skin_no_small_gaps_heuristic": {
-            "value": false
-        },
-        "retraction_hop_enabled": {
-            "value": true
-        },
-        "retraction_hop": {
-            "value": 0.2
-        },
-        "retraction_combing": {
-            "value": "all"
-        },
-        "retraction_combing_max_distance": {
-            "value": 30
-        },
-        "travel_avoid_other_parts": {
-            "value": true
-        },
-        "travel_avoid_supports": {
-            "value": true
-        },
-        "travel_retract_before_outer_wall": {
-            "value": true
+        "material_final_print_temperature": {
+            "value": "material_print_temperature"
         },
         "cool_fan_full_at_height": {
             "value": "layer_height_0 + 2 * layer_height"
         },
-        "cool_fan_enabled": {
-            "value": true
+        "adhesion_type": {
+            "default_value": "skirt"
         },
-        "cool_min_layer_time": {
-            "value": 10
-        },
-        "support_enable": {
-            "value": true
-        },
-        "support_type": {
-            "value": "buildplate"
-        },
-        "support_angle": {
-            "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))"
-        },
-        "support_pattern": {
-            "value": "'grid'"
-        },
-        "support_infill_rate": {
-            "value": "15"
-        },
-        "support_use_towers": {
-            "value": false
+        "meshfix_maximum_travel_resolution": {
+            "value": "meshfix_maximum_resolution"
         },
         "support_xy_distance": {
             "value": "wall_line_width_0 * 2"
@@ -251,122 +311,73 @@
             "value": "layer_height if layer_height >= 0.16 else layer_height * 2"
         },
         "support_xy_overrides_z": {
-            "value": "'xy_overrides_z'"
-        },
-        "support_wall_count": {
-            "value": 1
-        },
-        "support_brim_enable": {
-            "value": false
-        },
-        "support_brim_width": {
-            "value": 4
+            "default_value": "xy_overrides_z"
         },
         "support_interface_height": {
             "value": "layer_height * 4"
         },
-        "support_interface_density": {
-            "value": 33.333
-        },
-        "support_interface_pattern": {
-            "value": "'lines'"
-        },
-        "support_interface_skip_height": {
-            "value": 0.2
-        },
-        "minimum_support_area": {
-            "value": 2
-        },
-        "minimum_interface_area": {
-            "value": 10
-        },
         "wall_thickness": {
             "value": "line_width * 2"
         },
-        "adhesion_type": {
-            "value": "'skirt'"
+        "acceleration_travel": {
+            "default_value": 1000
         },
-        "brim_replaces_support": {
-            "value": false
+        "line_width": { 
+            "default_value": "0.4" 
         },
-        "raft_margin": {
-            "value": 5,
-            "minimum_value_warning": "0.01"
+        "speed_z_hop": { 
+            "default_value": 5 
         },
-        "raft_airgap": {
-            "value": 0.24
+        "retraction_combing_max_distance": { 
+            "default_value": 30 
         },
-        "skirt_gap": {
-            "value": 8.0
+        "travel_avoid_supports": { 
+            "default_value": true 
         },
-        "skirt_line_count": {
-            "value": 3
+        "brim_replaces_support": { 
+            "default_value": false 
         },
-        "adaptive_layer_height_variation": {
-            "value": 0.04
+        "support_brim_width": { 
+            "default_value": 4 
         },
-        "adaptive_layer_height_variation_step": {
-            "value": 0.04
+        "minimum_support_area": { 
+            "default_value": 2 
         },
-        "brim_width": {
-            "value": 3
+        "minimum_interface_area": { 
+            "default_value": 10 
         },
-        "infill_sparse_density": {
-            "value": "15"
+        
+        
+        "support_wall_count": { 
+            "value": 1 
         },
-        "infill_before_walls": {
-            "value": false
+        "support_brim_enable": { 
+            "value": false 
         },
-        "infill_overlap": {
-            "value": 30.0
+        "retraction_combing": {
+            "value": "all"
         },
-        "skin_overlap": {
-            "value": 10.0
+        "retraction_extrusion_window": {
+            "value": 10,
+            "maximum_value_warning": "20"
+        },
+        "retraction_min_travel": {
+            "value": 1.5
         },
         "infill_wipe_dist": {
             "value": 0.0
         },
+        "skin_overlap": {
+            "value": 10.0
+        },
+        "infill_overlap": {
+            "value": 30.0
+        },
+        "travel_compensate_overlapping_walls_0_enabled": {
+            "value": "False"
+        },
         "wall_0_wipe_dist": {
             "value": 0.0
-        },
-        "gantry_height": {
-            "value": 25
-        },
-        "machine_max_feedrate_x": {
-            "value": 500
-        },
-        "machine_max_feedrate_y": {
-            "value": 500
-        },
-        "machine_max_feedrate_z": {
-            "value": 10
-        },
-        "machine_max_feedrate_e": {
-            "value": 50
-        },
-        "machine_max_acceleration_x": {
-            "value": 500
-        },
-        "machine_max_acceleration_y": {
-            "value": 500
-        },
-        "machine_max_acceleration_z": {
-            "value": 100
-        },
-        "machine_max_acceleration_e": {
-            "value": 5000
-        },
-        "machine_acceleration": {
-            "value": 500
-        },
-        "machine_max_jerk_xy": {
-            "value": 10
-        },
-        "machine_max_jerk_z": {
-            "value": 0.4
-        },
-        "machine_max_jerk_e": {
-            "value": 5
         }
     }
 }