diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json
new file mode 100644
index 0000000000..0c2b9e823f
--- /dev/null
+++ b/resources/definitions/prusa_i3_xl.def.json
@@ -0,0 +1,68 @@
+{
+    "id": "prusa_i3_xl",
+    "version": 2,
+    "name": "Prusa i3 xl",
+    "inherits": "fdmprinter.json",
+    "metadata": {
+        "author": "guigashm",
+        "manufacturer": "Prusajr",
+        "category": "Other",
+        "file_formats": "text/x-gcode",
+        "icon": "icon_ultimaker2.png",
+        "platform": "prusai3_xl_platform.stl"
+    },
+
+    "overrides": {
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_width": {
+            "default_value": 200
+        },
+        "machine_height": {
+            "default_value": 200
+        },
+        "machine_depth": {
+            "default_value": 270
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 2.0
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default_value": 2.0
+        },
+        "machine_head_shape_min_x": {
+            "default_value": 75
+        },
+        "machine_head_shape_min_y": {
+            "default_value": 18
+        },
+        "machine_head_shape_max_x": {
+            "default_value": 18
+        },
+        "machine_head_shape_max_y": {
+            "default_value": 35
+        },
+        "machine_nozzle_gantry_distance": {
+            "default_value": 55
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "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"
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/machines/prusa_i3_xl.json b/resources/machines/prusa_i3_xl.json
deleted file mode 100644
index b66b974983..0000000000
--- a/resources/machines/prusa_i3_xl.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "id": "prusa_i3_xl",
-    "version": 1, 
-    "name": "Prusa i3 xl",
-    "manufacturer": "Other",
-    "author": "Other",
-    "icon": "icon_ultimaker2.png",
-    "platform": "prusai3_xl_platform.stl",
-    "file_formats": "text/x-gcode",
-    "inherits": "fdmprinter.json",
-
-    "overrides": {
-        "machine_heated_bed": { "default": true },
-        "machine_width": { "default": 200 },
-        "machine_height": { "default": 200 },
-        "machine_depth": { "default": 270 },
-        "machine_center_is_zero": { "default": false },
-        "machine_nozzle_size": { "default": 0.4 },
-        "material_diameter": { "default": 1.75 },
-        "machine_nozzle_heat_up_speed": { "default": 2.0 },
-        "machine_nozzle_cool_down_speed": { "default": 2.0 },
-        "machine_head_shape_min_x": { "default": 75 },
-        "machine_head_shape_min_y": { "default": 18 },
-        "machine_head_shape_max_x": { "default": 18 },
-        "machine_head_shape_max_y": { "default": 35 },
-        "machine_nozzle_gantry_distance": { "default": 55 },
-        "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" },
-
-        "machine_start_gcode": {
-            "default": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
-        },
-        "machine_end_gcode": {
-            "default": "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"
-        }
-    }
-}