diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json
index 2fd76df8fe..3918631699 100644
--- a/resources/definitions/atom2.def.json
+++ b/resources/definitions/atom2.def.json
@@ -21,7 +21,7 @@
     "machine_extruder_count": { "default_value": 1 },
     "machine_heated_bed":     { "default_value": false },
     "machine_center_is_zero": { "default_value": true },
-    "machine_gcode_flavor":   { "default_value": "RepRap (Marlin/Sprinter)" },
+    "machine_gcode_flavor":   { "RepRap (Marlin/Sprinter)": "Marlin" },
 
     "machine_start_gcode":    { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" },
     "machine_end_gcode":      { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" },
diff --git a/resources/definitions/atomPlus.def.json b/resources/definitions/atomPlus.def.json
new file mode 100644
index 0000000000..1726fee8eb
--- /dev/null
+++ b/resources/definitions/atomPlus.def.json
@@ -0,0 +1,35 @@
+{
+  "name": "Atom Plus",
+  "version": 2,
+  "inherits": "fdmprinter",
+  "metadata": {
+    "visible": true,
+    "author": "Victor (Yu Chieh) Lin",
+    "manufacturer": "Layer One",
+    "file_formats": "text/x-gcode",
+    "platform_offset": [0,0,0],
+    "machine_extruder_trains":  { "0": "atomPlus_extruder_0"
+    }
+  },
+
+  "overrides": {
+    "machine_name":           { "default_value": "Atom Plus" },
+    "machine_shape":          { "default_value": "elliptic" },
+    "machine_width":          { "default_value": 420 },
+    "machine_depth":          { "default_value": 420 },
+    "machine_height":         { "default_value": 910 },
+    "machine_extruder_count": { "default_value": 1 },
+    "machine_heated_bed":     { "default_value": false },
+    "machine_center_is_zero": { "default_value": true },
+    "machine_gcode_flavor":   { "RepRap (Marlin/Sprinter)": "Marlin" },
+
+    "machine_start_gcode":    { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" },
+    "machine_end_gcode":      { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" },
+
+    "layer_height": { "default_value": 0.4 },
+    "default_material_print_temperature": { "default_value": 220 },
+    "speed_print": { "default_value": 32 },
+    "optimize_wall_printing_order": { "value": "True" },
+    "infill_sparse_density": { "default_value": 10 }
+  }
+}
\ No newline at end of file