diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json
new file mode 100644
index 0000000000..6a61d18d3c
--- /dev/null
+++ b/resources/definitions/ultimaker2_plus.def.json
@@ -0,0 +1,71 @@
+{
+    "id": "ultimaker2plus_base",
+    "version": 2,
+    "name": "Ultimaker 2+",
+    "inherits": "ultimaker2",
+    "visible": "false",
+    "metadata": {
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker",
+        "category": "Ultimaker",
+        "file_formats": "text/x-gcode",
+        "platform": "ultimaker2_platform.obj",
+        "platform_texture": "Ultimaker2Plusbackplate.png"
+    },
+
+    "overrides": {
+        "speed_infill": {
+            "value": "speed_print"
+        },
+        "speed_wall_x": {
+            "value": "speed_wall"
+        },
+        "layer_height_0": {
+            "value": "round(machine_nozzle_size / 1.5, 2)"
+        },
+        "line_width": {
+            "value": "round(machine_nozzle_size * 0.875, 2)"
+        },
+        "speed_layer_0": {
+            "default_value": 20
+        },
+        "speed_support": {
+            "value": "speed_wall_0"
+        },
+        "machine_height": {
+            "default_value": 203
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "gantry_height": {
+            "default_value": 52
+        },
+        "machine_nozzle_head_distance": {
+            "default_value": 5
+        },
+        "machine_nozzle_expansion_angle": {
+            "default_value": 45
+        },
+        "machine_heat_zone_length": {
+            "default_value": 20
+        },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [ -44, 14 ],
+                [ -44, -34 ],
+                [ 64, 14 ],
+                [ 64, -34 ]
+            ]
+        },
+        "machine_disallowed_areas": {
+            "default_value": [
+                [[-115,  112.5], [ -78,  112.5], [ -80,  102.5], [-115,  102.5]],
+                [[ 115,  112.5], [ 115,  102.5], [ 105,  102.5], [ 103,  112.5]],
+                [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]],
+                [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]]
+            ]
+        }
+    }
+}
diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json
deleted file mode 100644
index cc86bd8ce3..0000000000
--- a/resources/machines/ultimaker2plus.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "id": "ultimaker2plus_base",
-    "version": 1, 
-    "name": "Ultimaker 2+",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "platform": "ultimaker2_platform.obj",
-    "platform_texture": "Ultimaker2Plusbackplate.png",
-    "visible": false,
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker2.json",
-
-    "overrides": {
-        "speed_infill": { "inherit_function": "speed_print"  },
-        "speed_wall_x": { "inherit_function": "speed_wall"  },
-        "layer_height_0": { "inherit_function": "round(machine_nozzle_size / 1.5, 2)"  },
-        "line_width": { "inherit_function": "round(machine_nozzle_size * 0.875, 2)"  },
-        "speed_layer_0": { "default": "20" },
-        "speed_support": { "inherit_function": "speed_wall_0"  },
-        "machine_height": { "default": 203 },
-        "machine_show_variants": { "default": true },
-        "gantry_height": { "default": 52 },
-        "machine_nozzle_head_distance": { "default": 5 },
-        "machine_nozzle_expansion_angle": { "default": 45 },
-        "machine_heat_zone_length": { "default": 20 },
-        "machine_head_with_fans_polygon":
-        {
-            "default": [
-                [
-                    -44,
-                    14
-                ],
-                [
-                    -44,
-                    -34
-                ],
-                [
-                    64,
-                    14
-                ],
-                [
-                    64,
-                    -34
-                ]
-            ]
-        },
-        "machine_disallowed_areas": { "default": [
-              [[-115.0,  112.5], [ -78.0,  112.5], [ -80.0,  102.5], [-115.0,  102.5]],
-              [[ 115.0,  112.5], [ 115.0,  102.5], [ 105.0,  102.5], [ 103.0,  112.5]],
-              [[-115.0, -112.5], [-115.0, -104.5], [ -84.0, -104.5], [ -82.0, -112.5]],
-              [[ 115.0, -112.5], [ 108.0, -112.5], [ 110.0, -104.5], [ 115.0, -104.5]]
-        ]}
-    }
-}