diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json
index fd758f6e2a..9b8af0af56 100644
--- a/resources/definitions/ultimaker_s8.def.json
+++ b/resources/definitions/ultimaker_s8.def.json
@@ -48,27 +48,145 @@
     },
     "overrides":
     {
-        "acceleration_infill": { "value": "acceleration_print" },
-        "acceleration_layer_0": { "value": 2000 },
-        "acceleration_prime_tower": { "value": "acceleration_print" },
-        "acceleration_print": { "value": 20000 },
-        "acceleration_print_layer_0": { "value": "acceleration_layer_0" },
-        "acceleration_roofing": { "value": "acceleration_wall_0" },
-        "acceleration_skirt_brim": { "value": "acceleration_layer_0" },
-        "acceleration_support": { "value": "acceleration_print" },
-        "acceleration_support_bottom": { "value": "acceleration_support_interface" },
-        "acceleration_support_infill": { "value": "acceleration_support" },
-        "acceleration_support_interface": { "value": "acceleration_support" },
-        "acceleration_support_roof": { "value": "acceleration_support_interface" },
-        "acceleration_topbottom": { "value": "acceleration_print" },
-        "acceleration_travel": { "value": 10000 },
+        "acceleration_flooring":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_roofing"
+        },
+        "acceleration_infill":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_print"
+        },
+        "acceleration_layer_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": 2000
+        },
+        "acceleration_prime_tower":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_print"
+        },
+        "acceleration_print":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": 20000
+        },
+        "acceleration_print_layer_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_layer_0"
+        },
+        "acceleration_roofing":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_wall_0"
+        },
+        "acceleration_skirt_brim":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_layer_0"
+        },
+        "acceleration_support":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_print"
+        },
+        "acceleration_support_bottom":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_support_interface"
+        },
+        "acceleration_support_infill":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_support"
+        },
+        "acceleration_support_interface":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_support"
+        },
+        "acceleration_support_roof":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_support_interface"
+        },
+        "acceleration_topbottom":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_print"
+        },
+        "acceleration_travel":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": 10000
+        },
         "acceleration_travel_enabled": { "value": true },
-        "acceleration_travel_layer_0": { "value": "acceleration_layer_0" },
-        "acceleration_wall": { "value": "acceleration_print/8" },
-        "acceleration_wall_0": { "value": "acceleration_wall" },
-        "acceleration_wall_0_roofing": { "value": "acceleration_wall_0" },
-        "acceleration_wall_x": { "value": "acceleration_print" },
-        "acceleration_wall_x_roofing": { "value": "acceleration_wall" },
+        "acceleration_travel_layer_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_layer_0"
+        },
+        "acceleration_wall":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_print/8"
+        },
+        "acceleration_wall_0":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_wall"
+        },
+        "acceleration_wall_0_flooring":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_wall_0_roofing"
+        },
+        "acceleration_wall_0_roofing":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_wall_0"
+        },
+        "acceleration_wall_x":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_print"
+        },
+        "acceleration_wall_x_flooring":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_wall_x_roofing"
+        },
+        "acceleration_wall_x_roofing":
+        {
+            "maximum_value": "machine_max_acceleration_x",
+            "maximum_value_warning": "machine_max_acceleration_x",
+            "value": "acceleration_wall"
+        },
         "adhesion_type": { "value": "'brim' if support_enable and support_structure=='tree' else 'skirt'" },
         "bottom_thickness": { "value": "3*layer_height if top_layers==4 and not support_enable else top_bottom_thickness" },
         "bridge_skin_material_flow": { "value": 200 },
@@ -89,10 +207,14 @@
         "cool_min_layer_time_overhang": { "value": 9 },
         "cool_min_layer_time_overhang_min_segment_length": { "value": 2 },
         "cool_min_speed": { "value": 6 },
-        "cool_min_temperature": { "value": "material_print_temperature-15" },
+        "cool_min_temperature":
+        {
+            "minimum_value_warning": "material_print_temperature-15",
+            "value": "material_print_temperature-15"
+        },
         "default_material_print_temperature": { "maximum_value_warning": 320 },
         "extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" },
-        "flooring_layer_count": { "value": 0 },
+        "flooring_layer_count": { "value": 1 },
         "gradual_flow_enabled": { "value": false },
         "hole_xy_offset": { "value": 0.075 },
         "infill_material_flow": { "value": "material_flow" },
@@ -241,6 +363,8 @@
             "value": "jerk_wall_0"
         },
         "machine_gcode_flavor": { "default_value": "Cheetah" },
+        "machine_max_acceleration_x": { "default_value": 50000 },
+        "machine_max_acceleration_y": { "default_value": 50000 },
         "machine_max_feedrate_x": { "default_value": 500 },
         "machine_max_feedrate_y": { "default_value": 500 },
         "machine_max_jerk_e":
@@ -281,6 +405,7 @@
         "optimize_wall_printing_order": { "value": false },
         "prime_tower_brim_enable": { "value": true },
         "prime_tower_min_volume": { "value": 10 },
+        "prime_tower_mode": { "resolve": "'normal'" },
         "retraction_amount": { "value": 6.5 },
         "retraction_combing_avoid_distance": { "value": 1.2 },
         "retraction_combing_max_distance": { "value": 50 },
@@ -293,6 +418,7 @@
         "skin_material_flow": { "value": 95 },
         "skin_overlap": { "value": 0 },
         "skin_preshrink": { "value": 0 },
+        "skirt_brim_minimal_length": { "value": 1000 },
         "skirt_brim_speed":
         {
             "maximum_value_warning": 300,
@@ -344,7 +470,7 @@
         "speed_support":
         {
             "maximum_value_warning": 300,
-            "value": "speed_print"
+            "value": "speed_wall"
         },
         "speed_support_bottom":
         {
@@ -374,11 +500,13 @@
         "speed_travel":
         {
             "maximum_value": 500,
+            "maximum_value_warning": 500,
             "value": 400
         },
         "speed_travel_layer_0":
         {
             "maximum_value": 500,
+            "maximum_value_warning": 500,
             "value": 150
         },
         "speed_wall":
@@ -417,13 +545,17 @@
             "value": "speed_wall"
         },
         "support_angle": { "value": 60 },
+        "support_bottom_distance": { "maximum_value_warning": "3*layer_height" },
         "support_bottom_offset": { "value": 0 },
         "support_brim_width": { "value": 10 },
         "support_interface_enable": { "value": true },
         "support_interface_offset": { "value": "support_offset" },
+        "support_line_width": { "value": "1.25*line_width" },
         "support_offset": { "value": "1.2 if support_structure == 'tree' else 0.8" },
         "support_pattern": { "value": "'gyroid' if support_structure == 'tree' else 'lines'" },
+        "support_roof_height": { "minimum_value_warning": 0 },
         "support_structure": { "value": "'normal'" },
+        "support_top_distance": { "maximum_value_warning": "3*layer_height" },
         "support_tree_bp_diameter": { "value": 15 },
         "support_tree_tip_diameter": { "value": 1.0 },
         "support_tree_top_rate": { "value": 20 },