diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json
index 5c03444d49..815469db32 100644
--- a/resources/definitions/peopoly_moai.def.json
+++ b/resources/definitions/peopoly_moai.def.json
@@ -4,15 +4,13 @@
     "inherits": "fdmprinter",
     "metadata": {
         "visible": true,
-        "author": "fieldOfView",
+        "author": "Peopoly",
         "manufacturer": "Peopoly",
         "file_formats": "text/x-gcode",
         "has_machine_quality": true,
         "has_materials": false,
-        "machine_extruder_trains":
-        {
-            "0": "peopoly_moai_extruder_0"
-        }
+        "platform": "moai.obj",
+        "platform_texture": "moai.jpg"
     },
 
     "overrides": {
@@ -28,6 +26,9 @@
         "machine_depth": {
             "default_value": 130
         },
+        "machine_nozzle_size": {
+            "default_value": 0.067
+        },
         "machine_head_with_fans_polygon":
         {
             "default_value": [
@@ -37,6 +38,10 @@
                 [ 10, -10 ]
             ]
         },
+        "material_diameter": {
+            "enabled": false,
+            "value": 1.75
+        },
         "machine_gcode_flavor": {
             "default_value": "RepRap (Marlin/Sprinter)"
         },
@@ -46,7 +51,6 @@
         "machine_end_gcode": {
             "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84"
         },
-
         "line_width": {
             "minimum_value_warning": "machine_nozzle_size"
         },
@@ -75,7 +79,8 @@
             "value": "0.1"
         },
         "top_bottom_thickness": {
-            "minimum_value_warning": "0.1"
+            "minimum_value_warning": "0.1",
+            "value": "0.4"
         },
         "infill_sparse_thickness": {
             "maximum_value_warning": "0.5"
@@ -102,24 +107,23 @@
             "value": "speed_print"
         },
         "speed_travel": {
-            "value": "300"
+            "value": 150
         },
         "speed_travel_layer_0": {
-            "value": "300"
+            "value": 150
         },
         "speed_layer_0": {
-            "value": "5"
+            "value": 5
         },
         "speed_slowdown_layers": {
-            "value": "2"
+            "value": 3
         },
         "infill_overlap": {
-            "value": "15"
+            "value": 15
         },
         "adhesion_type": {
-            "value": "\"none\""
+            "value": "'none'"
         },
-
         "acceleration_enabled": {
             "value": "False"
         },
@@ -139,6 +143,10 @@
             "enabled": false,
             "value": "False"
         },
+        "cool_fan_speed_min": {
+            "enabled": false,
+            "value": 0
+        },
         "retraction_enable": {
             "enabled": false,
             "value": "False"
@@ -148,7 +156,8 @@
             "value": "'off'"
         },
         "retract_at_layer_change": {
-            "enabled": false
+            "enabled": false,
+            "value": false
         },
         "cool_min_layer_time_fan_speed_max": {
             "enabled": false
@@ -158,6 +167,82 @@
         },
         "cool_fan_full_layer": {
             "enabled": false
+        },
+        "snap_distance": {
+            "value": "0.1"
+        },
+        "meshfix_maximum_resolution": {
+            "value": "0.005"
+        },
+        "skin_outline_count": {
+            "value": 0
+        },
+        "travel_compensate_overlapping_walls_enabled": {
+            "value": "False"
+        },
+        "travel_compensate_overlapping_walls_0_enabled": {
+            "value": "False"
+        },
+        "travel_compensate_overlapping_walls_x_enabled": {
+            "value": "False"
+        },
+        "wall_thickness": {
+            "value": 0.4
+        },
+        "infill_sparse_density": {
+            "value": 70
+        },
+        "infill_pattern": {
+            "value": "'lines'"
+        },
+        "cool_min_layer_time": {
+            "enabled": false,
+            "value": 0
+        },
+        "cool_min_speed": {
+            "enabled": false,
+            "value": 0
+        },
+        "cool_lift_head": {
+            "enabled": false,
+            "value": "False"
+        },
+        "material_flow": {
+            "enabled": false
+        },
+        "material_flow_layer_0": {
+            "enabled": false
+        },
+        "speed_equalize_flow_enabled": {
+            "enabled": false,
+            "value": "False"
+        },
+        "draft_shield_enabled": {
+            "enabled": false,
+            "value": "False"
+        },
+        "z_seam_corner": {
+            "value": "'z_seam_corner_none'"
+        },
+        "z_seam_type": {
+            "value": "'shortest'"
+        },
+        "skin_no_small_gaps_heuristic": {
+            "value": "False"
+        },
+        "ironing_enabled": {
+            "enabled": false,
+            "value": "False"
+        },
+        "skin_overlap": {
+            "value": 6
+        },
+        "infill_wipe_dist": {
+            "value": 0
+        },
+        "max_feedrate_z_override": {
+            "value": 0,
+            "enabled": false
         }
     }
 }
diff --git a/resources/images/moai.jpg b/resources/images/moai.jpg
new file mode 100644
index 0000000000..eb7fcf3562
Binary files /dev/null and b/resources/images/moai.jpg differ
diff --git a/resources/meshes/moai.obj b/resources/meshes/moai.obj
new file mode 100644
index 0000000000..f13f30d6f4
--- /dev/null
+++ b/resources/meshes/moai.obj
@@ -0,0 +1,32 @@
+# OBJ written from C:\Users\Flo\Desktop\Cura_FILES\moai.obj
+mtllib moai.mtl
+# Units	millimeters
+
+g Mesh
+v 65 -65 0
+v -65 -65 0
+v -65 65 0
+v 65 65 0
+v 65 -65 0
+v -65 -65 0
+v -65 65 0
+v 65 65 0
+v -65 65 18.8383
+v 65 65 18.8383
+vn 0 0 1
+vn 1 0 0
+vn -1 0 0
+vt 0.0975501 1
+vt 1 1
+vt 1 0.0977239
+vt 0.0975501 0.0977239
+vt 0.0186426 0.870052
+vt 0.0736426 0.870052
+vt 0.0186426 0.815052
+vt 0.0214764 0.912057
+vt 0.0764764 0.967057
+vt 0.0214764 0.967057
+usemtl red
+f 1/1/1 4/2/1 3/3/1 2/4/1
+f 7/5/2 9/6/2 6/7/2
+f 5/8/3 10/9/3 8/10/3
diff --git a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg
new file mode 100644
index 0000000000..482b8ce51a
--- /dev/null
+++ b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+version = 4
+name = Coarse
+definition = peopoly_moai
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = coarse
+weight = 3
+
+[values]
+layer_height = 0.08
+speed_print = 90
+speed_travel = 100
+speed_travel_layer_0 = 100
+speed_wall = 90
diff --git a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg
new file mode 100644
index 0000000000..e7cfa673b2
--- /dev/null
+++ b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+version = 4
+name = Draft
+definition = peopoly_moai
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = 4
+
+[values]
+layer_height = 0.1
+speed_print = 85
+speed_travel = 100
+speed_travel_layer_0 = 100
+speed_wall = 85
+speed_slowdown_layers = 2
diff --git a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg
new file mode 100644
index 0000000000..da62ee32cd
--- /dev/null
+++ b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+version = 4
+name = Extra High
+definition = peopoly_moai
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = extra_high
+weight = 0
+
+[values]
+layer_height = 0.02
+speed_print = 185
+speed_travel = 190
+speed_travel_layer_0 = 100
+speed_wall = 185
+speed_slowdown_layers = 5
diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
index 36b5f21ff8..be35dbaf05 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 version = 4
-name = Extra Fine
+name = High
 definition = peopoly_moai
 
 [metadata]
@@ -10,8 +10,9 @@ quality_type = high
 weight = 1
 
 [values]
-infill_sparse_density = 70
-layer_height = 0.05
-top_bottom_thickness = 0.4
-wall_thickness = 0.4
-speed_print = 150
+layer_height = 0.04
+speed_print = 140
+speed_travel = 145
+speed_travel_layer_0 = 100
+speed_wall = 140
+speed_slowdown_layers = 4
diff --git a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
deleted file mode 100644
index 48ffd07f33..0000000000
--- a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[general]
-version = 4
-name = Maximum Quality
-definition = peopoly_moai
-
-[metadata]
-setting_version = 5
-type = quality
-quality_type = extra_high
-weight = 2
-
-[values]
-infill_sparse_density = 70
-layer_height = 0.025
-top_bottom_thickness = 0.4
-wall_thickness = 0.4
-speed_print = 200
diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
index f5fe799ac3..2d6ba873db 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
@@ -1,17 +1,17 @@
 [general]
 version = 4
-name = Fine
+name = Normal
 definition = peopoly_moai
 
 [metadata]
 setting_version = 5
 type = quality
 quality_type = normal
-weight = 0
+weight = 2
 
 [values]
-infill_sparse_density = 70
-layer_height = 0.1
-top_bottom_thickness = 0.4
-wall_thickness = 0.4
-speed_print = 100
+layer_height = 0.06
+speed_print = 120
+speed_travel = 130
+speed_travel_layer_0 = 100
+speed_wall = 120