diff --git a/resources/definitions/bq_hephestos.def.json b/resources/definitions/bq_hephestos.def.json
index 9958ef2b86..3b5b68c021 100644
--- a/resources/definitions/bq_hephestos.def.json
+++ b/resources/definitions/bq_hephestos.def.json
@@ -12,78 +12,84 @@
         "platform": "bq_hephestos_platform.stl"
     },
 
-    "settings": {
-        "machine_start_gcode": {
-            "value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/sec\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "value": 215
-        },
-        "machine_depth": {
-            "value": 210
-        },
-        "machine_height": {
-            "value": 180
-        },
-        "machine_heated_bed": {
-            "value": false
-        },
-        "machine_center_is_zero": {
-            "value": false
-        },
-        "machine_gcode_flavor": {
-            "value": "RepRap"
-        },
-        "machine_platform_offset": {
-            "value": [0, -82, 0]
-        },
-        "layer_height": {
-            "value": 0.2
-        },
-        "layer_height_0": {
-            "value": 0.2
-        },
-        "wall_thickness": {
-            "value": 1.0
-        },
-        "top_bottom_thickness": {
-            "value": 1.0
-        },
-        "bottom_thickness": {
-            "value": 1.0
-        },
-        "material_print_temperature": {
-            "value": 220
-        },
-        "material_bed_temperature": {
-            "value": 0
-        },
-        "material_diameter": {
-            "value": 1.75
-        },
-        "speed_print": {
-            "value": 40.0
-        },
-        "speed_infill": {
-            "value": 40.0
-        },
-        "speed_wall": {
-            "value": 35.0
-        },
-        "speed_topbottom": {
-            "value": 35.0
-        },
-        "speed_travel": {
-            "value": 120.0
-        },
-        "speed_layer_0": {
-            "value": 20.0
-        },
-        "support_enable": {
-            "value": true
+    "overrides": {
+        "settings": {
+            "machine_start_gcode": {
+                "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/sec\n; -- end of START GCODE --"
+            },
+            "machine_end_gcode": {
+                "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+            },
+            "machine_width": {
+                "value": 215
+            },
+            "machine_depth": {
+                "value": 210
+            },
+            "machine_height": {
+                "value": 180
+            },
+            "machine_heated_bed": {
+                "value": false
+            },
+            "machine_center_is_zero": {
+                "value": false
+            },
+            "machine_gcode_flavor": {
+                "value": "RepRap"
+            },
+            "machine_platform_offset": {
+                "value": [
+                    0,
+                    -82,
+                    0
+                ]
+            },
+            "layer_height": {
+                "value": 0.2
+            },
+            "layer_height_0": {
+                "value": 0.2
+            },
+            "wall_thickness": {
+                "value": 1.0
+            },
+            "top_bottom_thickness": {
+                "value": 1.0
+            },
+            "bottom_thickness": {
+                "value": 1.0
+            },
+            "material_print_temperature": {
+                "value": 220
+            },
+            "material_bed_temperature": {
+                "value": 0
+            },
+            "material_diameter": {
+                "value": 1.75
+            },
+            "speed_print": {
+                "value": 40.0
+            },
+            "speed_infill": {
+                "value": 40.0
+            },
+            "speed_wall": {
+                "value": 35.0
+            },
+            "speed_topbottom": {
+                "value": 35.0
+            },
+            "speed_travel": {
+                "value": 120.0
+            },
+            "speed_layer_0": {
+                "value": 20.0
+            },
+            "support_enable": {
+                "value": true
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json
index 2e084518ba..3e9b640586 100644
--- a/resources/definitions/bq_hephestos_2.def.json
+++ b/resources/definitions/bq_hephestos_2.def.json
@@ -14,104 +14,109 @@
     "author": "BQ",
     "platform": "bq_hephestos_2_platform.stl",
     "file_formats": "text/x-gcode",
-    "inherits": "fdmprinter.json",
 
-    "settings": {
-        "machine_start_gcode": {
-            "value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "value": "; -- END GCODE --\nM801        ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "value": 210
-        },
-        "machine_depth": {
-            "value": 297
-        },
-        "machine_height": {
-            "value": 220
-        },
-        "machine_heated_bed": {
-            "value": false
-        },
-        "machine_center_is_zero": {
-            "value": false
-        },
-        "machine_gcode_flavor": {
-            "value": "RepRap"
-        },
-        "machine_platform_offset": {
-            "value": [6, 1320, 0]
-        },
-        "material_print_temperature": {
-            "value": 210.0
-        },
-        "material_bed_temperature": {
-            "value": 0
-        },
-        "material_diameter": {
-            "value": 1.75
-        },
-        "layer_height": {
-            "value": 0.2
-        },
-        "layer_height_0": {
-            "value": 0.2
-        },
-        "wall_line_count": {
-            "value": 3
-        },
-        "wall_thickness": {
-            "value": 1.2
-        },
-        "top_bottom_thickness": {
-            "value": 1.2
-        },
-        "infill_sparse_density": {
-            "value": 20.0
-        },
-        "infill_overlap": {
-            "value": 15.0
-        },
-        "speed_print": {
-            "value": 60.0
-        },
-        "speed_travel": {
-            "value": 160.0
-        },
-        "speed_layer_0": {
-            "value": 30.0
-        },
-        "speed_wall_x": {
-            "value": 35.0
-        },
-        "speed_wall_0": {
-            "value": 30.0
-        },
-        "speed_infill": {
-            "value": 80.0
-        },
-        "speed_topbottom": {
-            "value": 35.0
-        },
-        "skirt_speed": {
-            "value": 35.0
-        },
-        "skirt_line_count": {
-            "value": 4
-        },
-        "skirt_minimal_length": {
-            "value": 30.0
-        },
-        "skirt_gap": {
-            "value": 6.0
-        },
-        "cool_fan_full_at_height": {
-            "value": 0.4
-        },
-        "support_enable": {
-            "value": false
+    "overrides": {
+        "settings": {
+            "machine_start_gcode": {
+                "default_value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --"
+            },
+            "machine_end_gcode": {
+                "default_value": "; -- END GCODE --\nM801        ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --"
+            },
+            "machine_width": {
+                "value": 210
+            },
+            "machine_depth": {
+                "value": 297
+            },
+            "machine_height": {
+                "value": 220
+            },
+            "machine_heated_bed": {
+                "value": false
+            },
+            "machine_center_is_zero": {
+                "value": false
+            },
+            "machine_gcode_flavor": {
+                "value": "RepRap"
+            },
+            "machine_platform_offset": {
+                "value": [
+                    6,
+                    1320,
+                    0
+                ]
+            },
+            "material_print_temperature": {
+                "value": 210.0
+            },
+            "material_bed_temperature": {
+                "value": 0
+            },
+            "material_diameter": {
+                "value": 1.75
+            },
+            "layer_height": {
+                "value": 0.2
+            },
+            "layer_height_0": {
+                "value": 0.2
+            },
+            "wall_line_count": {
+                "value": 3
+            },
+            "wall_thickness": {
+                "value": 1.2
+            },
+            "top_bottom_thickness": {
+                "value": 1.2
+            },
+            "infill_sparse_density": {
+                "value": 20.0
+            },
+            "infill_overlap": {
+                "value": 15.0
+            },
+            "speed_print": {
+                "value": 60.0
+            },
+            "speed_travel": {
+                "value": 160.0
+            },
+            "speed_layer_0": {
+                "value": 30.0
+            },
+            "speed_wall_x": {
+                "value": 35.0
+            },
+            "speed_wall_0": {
+                "value": 30.0
+            },
+            "speed_infill": {
+                "value": 80.0
+            },
+            "speed_topbottom": {
+                "value": 35.0
+            },
+            "skirt_speed": {
+                "value": 35.0
+            },
+            "skirt_line_count": {
+                "value": 4
+            },
+            "skirt_minimal_length": {
+                "value": 30.0
+            },
+            "skirt_gap": {
+                "value": 6.0
+            },
+            "cool_fan_full_at_height": {
+                "value": 0.4
+            },
+            "support_enable": {
+                "value": false
+            }
         }
     }
 }
diff --git a/resources/definitions/bq_hephestos_xl.def.json b/resources/definitions/bq_hephestos_xl.def.json
index 0d4bc13ea1..d810c49ea5 100644
--- a/resources/definitions/bq_hephestos_xl.def.json
+++ b/resources/definitions/bq_hephestos_xl.def.json
@@ -10,79 +10,84 @@
         "file_formats": "text/x-code",
         "platform": "bq_hephestos_platform.stl"
     },
-
-    "settings": {
-        "machine_start_gcode": {
-            "value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/sec\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "value": 200
-        },
-        "machine_depth": {
-            "value": 300
-        },
-        "machine_height": {
-            "value": 180
-        },
-        "machine_heated_bed": {
-            "value": false
-        },
-        "machine_center_is_zero": {
-            "value": false
-        },
-        "machine_gcode_flavor": {
-            "value": "RepRap"
-        },
-        "machine_platform_offset": {
-            "value": [0, -82, 0]
-        },
-        "layer_height": {
-            "value": 0.2
-        },
-        "layer_height_0": {
-            "value": 0.2
-        },
-        "wall_thickness": {
-            "value": 1.0
-        },
-        "top_bottom_thickness": {
-            "value": 1.0
-        },
-        "bottom_thickness": {
-            "value": 1.0
-        },
-        "material_print_temperature": {
-            "value": 220
-        },
-        "material_bed_temperature": {
-            "value": 0
-        },
-        "material_diameter": {
-            "value": 1.75
-        },
-        "speed_print": {
-            "value": 40.0
-        },
-        "speed_infill": {
-            "value": 40.0
-        },
-        "speed_wall": {
-            "value": 35.0
-        },
-        "speed_topbottom": {
-            "value": 35.0
-        },
-        "speed_travel": {
-            "value": 120.0
-        },
-        "speed_layer_0": {
-            "value": 20.0
-        },
-        "support_enable": {
-            "value": true
+    "overrides": {
+        "settings": {
+            "machine_start_gcode": {
+                "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/sec\n; -- end of START GCODE --"
+            },
+            "machine_end_gcode": {
+                "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+            },
+            "machine_width": {
+                "value": 200
+            },
+            "machine_depth": {
+                "value": 300
+            },
+            "machine_height": {
+                "value": 180
+            },
+            "machine_heated_bed": {
+                "value": false
+            },
+            "machine_center_is_zero": {
+                "value": false
+            },
+            "machine_gcode_flavor": {
+                "value": "RepRap"
+            },
+            "machine_platform_offset": {
+                "value": [
+                    0,
+                    -82,
+                    0
+                ]
+            },
+            "layer_height": {
+                "value": 0.2
+            },
+            "layer_height_0": {
+                "value": 0.2
+            },
+            "wall_thickness": {
+                "value": 1.0
+            },
+            "top_bottom_thickness": {
+                "value": 1.0
+            },
+            "bottom_thickness": {
+                "value": 1.0
+            },
+            "material_print_temperature": {
+                "value": 220
+            },
+            "material_bed_temperature": {
+                "value": 0
+            },
+            "material_diameter": {
+                "value": 1.75
+            },
+            "speed_print": {
+                "value": 40.0
+            },
+            "speed_infill": {
+                "value": 40.0
+            },
+            "speed_wall": {
+                "value": 35.0
+            },
+            "speed_topbottom": {
+                "value": 35.0
+            },
+            "speed_travel": {
+                "value": 120.0
+            },
+            "speed_layer_0": {
+                "value": 20.0
+            },
+            "support_enable": {
+                "value": true
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/bq_witbox.def.json b/resources/definitions/bq_witbox.def.json
index dfa8eb5712..15ab9318ef 100644
--- a/resources/definitions/bq_witbox.def.json
+++ b/resources/definitions/bq_witbox.def.json
@@ -10,78 +10,84 @@
         "file_formats": "text/x-gcode",
         "platform": "bq_witbox_platform.stl"
     },
-    "settings": {
-        "machine_start_gcode": {
-            "value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/sec\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG90                     ;set to absolute positioning\nG1 Z200                 ;move the platform to the bottom\nG28 X0 Y0               ;move to the X/Y origin (Home)\nM84                     ;turn off steppers\n; -- end of END GCODE --"
-        },
-        "machine_width": {
-            "value": 297
-        },
-        "machine_depth": {
-            "value": 210
-        },
-        "machine_height": {
-            "value": 200
-        },
-        "machine_heated_bed": {
-            "value": false
-        },
-        "machine_center_is_zero": {
-            "value": false
-        },
-        "machine_gcode_flavor": {
-            "value": "RepRap"
-        },
-        "machine_platform_offset": {
-            "value": [0, -145, -38]
-        },
-        "layer_height": {
-            "value": 0.2
-        },
-        "layer_height_0": {
-            "value": 0.2
-        },
-        "wall_thickness": {
-            "value": 1
-        },
-        "top_bottom_thickness": {
-            "value": 1
-        },
-        "bottom_thickness": {
-            "value": 1
-        },
-        "material_print_temperature": {
-            "value": 220
-        },
-        "material_bed_temperature": {
-            "value": 0
-        },
-        "material_diameter": {
-            "value": 1.75
-        },
-        "speed_print": {
-            "value": 40
-        },
-        "speed_infill": {
-            "value": 40
-        },
-        "speed_wall": {
-            "value": 35
-        },
-        "speed_topbottom": {
-            "value": 35
-        },
-        "speed_travel": {
-            "value": 120
-        },
-        "speed_layer_0": {
-            "value": 20
-        },
-        "support_enable": {
-            "value": true
+    "overrides": {
+        "settings": {
+            "machine_start_gcode": {
+                "value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/sec\n; -- end of START GCODE --"
+            },
+            "machine_end_gcode": {
+                "value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG90                     ;set to absolute positioning\nG1 Z200                 ;move the platform to the bottom\nG28 X0 Y0               ;move to the X/Y origin (Home)\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+            },
+            "machine_width": {
+                "value": 297
+            },
+            "machine_depth": {
+                "value": 210
+            },
+            "machine_height": {
+                "value": 200
+            },
+            "machine_heated_bed": {
+                "value": false
+            },
+            "machine_center_is_zero": {
+                "value": false
+            },
+            "machine_gcode_flavor": {
+                "value": "RepRap"
+            },
+            "machine_platform_offset": {
+                "value": [
+                    0,
+                    -145,
+                    -38
+                ]
+            },
+            "layer_height": {
+                "value": 0.2
+            },
+            "layer_height_0": {
+                "value": 0.2
+            },
+            "wall_thickness": {
+                "value": 1
+            },
+            "top_bottom_thickness": {
+                "value": 1
+            },
+            "bottom_thickness": {
+                "value": 1
+            },
+            "material_print_temperature": {
+                "value": 220
+            },
+            "material_bed_temperature": {
+                "value": 0
+            },
+            "material_diameter": {
+                "value": 1.75
+            },
+            "speed_print": {
+                "value": 40
+            },
+            "speed_infill": {
+                "value": 40
+            },
+            "speed_wall": {
+                "value": 35
+            },
+            "speed_topbottom": {
+                "value": 35
+            },
+            "speed_travel": {
+                "value": 120
+            },
+            "speed_layer_0": {
+                "value": 20
+            },
+            "support_enable": {
+                "value": true
+            }
         }
     }
 }
\ No newline at end of file