diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index cd997c3f34..e22d10f2aa 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -327,6 +327,13 @@
                     "unit": "mm",
                     "default_value": 0,
                     "global_only": "True"
+                },
+                "machine_use_extruder_offset_to_offset_coords":
+                {
+                    "label": "Offset With Extruder",
+                    "description": "Apply the extruder offset to the coordinate system.",
+                    "type": "bool",
+                    "default_value": true
                 }
             }
         },
diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json
index 14619833a7..9ba8d0d44b 100644
--- a/resources/definitions/innovo_inventor.def.json
+++ b/resources/definitions/innovo_inventor.def.json
@@ -43,10 +43,10 @@
         "gantry_height": {
             "default_value": 82.3
         },
-        "machine_nozzle_offset_x_1": {
+        "machine_nozzle_offset_x": {
             "default_value": 0
         },
-        "machine_nozzle_offset_y_1": {
+        "machine_nozzle_offset_y": {
             "default_value": 15
         },
         "machine_gcode_flavor": {
diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
index 606d51c545..7b2222e5b3 100644
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@@ -7,6 +7,7 @@
         "visible": true,
         "author": "Ultimaker",
         "manufacturer": "Ultimaker",
+        "category": "Ultimaker",
         "file_formats": "text/x-gcode",
         "icon": "icon_ultimaker2.png",
         "platform": "ultimaker2_platform.obj",
diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json
index cd2fac4599..76b6c8b4ff 100644
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@@ -6,6 +6,7 @@
     "metadata": {
         "author": "Ultimaker",
         "manufacturer": "Ultimaker",
+        "category": "Ultimaker",
         "file_formats": "text/x-gcode",
         "icon": "icon_ultimaker.png",
         "platform": "ultimaker_platform.stl",
@@ -17,6 +18,14 @@
         ]
     },
 
+    "settings": {
+        "machine_extruder_drive_upgrade": {
+            "label": "Extruder Drive Upgrade",
+            "description": "This machine has the extruder drive upgrade.",
+            "type": "bool",
+            "default_value": false
+        }
+    },
     "overrides": {
         "machine_width": {
             "default_value": 205
@@ -62,9 +71,6 @@
         },
         "machine_end_gcode": {
             "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\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 F9000 ;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\nM84 ;steppers off\nG90 ;absolute positioning"
-        },
-        "machine_extruder_drive_upgrade": {
-            "default_value": false
         }
     }
 }