diff --git a/resources/definitions/flsun_qq_s.def.json b/resources/definitions/flsun_qq_s.def.json
new file mode 100644
index 0000000000..5a739e9ae1
--- /dev/null
+++ b/resources/definitions/flsun_qq_s.def.json
@@ -0,0 +1,78 @@
+{
+    "id": "flsun_qq_s",
+    "version": 2,
+    "name": "FLSUN QQ-S",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Cataldo URSO",
+        "manufacturer": "FLSUN",
+        "file_formats": "text/x-gcode",
+        "has_materials": true,
+        "preferred_quality_type": "draft",
+        "machine_extruder_trains": {
+            "0": "flsun_qq_s_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_center_is_zero": {
+            "default_value": true
+        },
+        "machine_shape": {
+            "default_value": "elliptic"
+        },
+        "machine_width": {
+            "default_value": 260
+        },
+        "machine_depth": {
+            "default_value": 260
+        },
+        "machine_height": {
+            "default_value": 370
+        },
+        "z_seam_type": {
+            "default_value": "back"
+        },
+        "top_thickness": {
+            "default_value": 5
+        },
+        "bottom_layers": {
+            "default_value": 4
+        },
+        "gantry_height": {
+            "default_value": 0
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_start_gcode": {
+            "default_value": "G21\nG90\nM82\nM107 T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG0 E3 F200\nG92 E0\n"
+        },
+        "machine_end_gcode": {
+            "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n"
+        },
+        "infill_sparse_density": {
+            "default_value": 10
+        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [0, 0],
+                [0, 0],
+                [0, 0],
+                [0, 0]
+            ]
+        },
+        "retraction_enable": {
+            "default_value": true
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_gcode_flavor": {
+            "default_value": "Repetier"
+        }
+    }
+}
diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json
new file mode 100644
index 0000000000..9b9ceb3f40
--- /dev/null
+++ b/resources/definitions/geeetech_a30.def.json
@@ -0,0 +1,132 @@
+{
+    "id": "geeetech_a30",
+    "version": 2,
+    "name": "Geeetech A30",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "author": "William & Cataldo URSO",
+        "manufacturer": "Shenzhen Geeetech Technology",
+        "setting_version": 8,
+        "file_formats": "text/x-gcode",
+        "visible": true,
+        "has_materials": true,
+        "preferred_quality_type": "draft",
+        "machine_extruder_trains": {
+            "0": "geeetech_a30_extruder_0"
+        }
+    },
+    "overrides": {
+        "machine_name": {
+            "default_value": "Geeetech A30"
+        },
+        "machine_start_gcode": {
+            "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84"
+        },
+        "machine_width": {
+            "default_value": 320
+        },
+        "machine_height": {
+            "default_value": 420
+        },
+        "machine_depth": {
+            "default_value": 320
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "material_bed_temperature": {
+            "default_value": 60
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "layer_height": {
+            "default_value": 0.1
+        },
+        "layer_height_0": {
+            "default_value": 0.3
+        },
+        "retraction_amount": {
+            "default_value": 2
+        },
+        "retraction_speed": {
+            "default_value": 25
+        },
+        "retraction_retract_speed": {
+            "default_value": 25
+        },
+        "retraction_prime_speed": {
+            "default_value": 25
+        },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "machine_head_polygon": {
+            "default_value": [
+                [-75, 35],
+                [18, 35],
+                [18, -18],
+                [-75, -18]
+            ]
+        },
+        "machine_head_with_fans_polygon": {
+            "default_value": [
+                [-75, 35],
+                [18, 35],
+                [18, -18],
+                [-75, -18]
+            ]
+        },
+        "gantry_height": {
+            "default_value": 55
+        },
+        "machine_max_feedrate_x": {
+            "default_value": 300
+        },
+        "machine_max_feedrate_y": {
+            "default_value": 300
+        },
+        "machine_max_feedrate_z": {
+            "default_value": 7
+        },
+        "machine_max_feedrate_e": {
+            "default_value": 50
+        },
+        "machine_max_acceleration_x": {
+            "default_value": 2000
+        },
+        "machine_max_acceleration_y": {
+            "default_value": 2000
+        },
+        "machine_max_acceleration_z": {
+            "default_value": 100
+        },
+        "machine_max_acceleration_e": {
+            "default_value": 10000
+        },
+        "machine_acceleration": {
+            "default_value": 2000
+        },
+        "machine_max_jerk_xy": {
+            "default_value": 10
+        },
+        "machine_max_jerk_z": {
+            "default_value": 1
+        },
+        "machine_max_jerk_e": {
+            "default_value": 5
+        },
+        "machine_gcode_flavor": {
+            "default_value": "Repetier"
+        }
+    }
+}
diff --git a/resources/extruders/flsun_qq_s_extruder_0.def.json b/resources/extruders/flsun_qq_s_extruder_0.def.json
new file mode 100644
index 0000000000..cba424e182
--- /dev/null
+++ b/resources/extruders/flsun_qq_s_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "id": "flsun_qq_s_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "flsun_qq_s",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/extruders/geeetech_a30_extruder_0.def.json b/resources/extruders/geeetech_a30_extruder_0.def.json
new file mode 100644
index 0000000000..bc1d6a6ed6
--- /dev/null
+++ b/resources/extruders/geeetech_a30_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "id": "geeetech_a30_extruder_0",
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "geeetech_a30",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}