diff --git a/resources/machines/bq_hephestos.json b/resources/machines/bq_hephestos.json
index 6fac2cac83..0ab0964263 100644
--- a/resources/machines/bq_hephestos.json
+++ b/resources/machines/bq_hephestos.json
@@ -4,7 +4,7 @@
     "name": "BQ Prusa i3 Hephestos",
     "manufacturer": "Other",
     "author": "BQ",
-    "platform": "hephestos_platform.stl",
+    "platform": "bq_hephestos_platform.stl",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -33,7 +33,7 @@
             "default": "RepRap"
         },
         "machine_platform_offset": {
-            "default": [0, 100, 0]
+            "default": [0, -82, 0]
         }
     },
     "overrides": {
diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json
index eb79fec1d7..07be8d2467 100644
--- a/resources/machines/bq_hephestos_2.json
+++ b/resources/machines/bq_hephestos_2.json
@@ -4,7 +4,7 @@
     "name": "BQ Hephestos 2",
     "manufacturer": "Other",
     "author": "BQ",
-    "platform": "bq_hephestos_2.stl",
+    "platform": "bq_hephestos_2_platform.stl",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -37,35 +37,31 @@
         }
     },
     "overrides": {
-        "bottom_thickness": { "default": 1.2, "visible": true },
-        "cool_fan_full_at_height": { "default": 0.8, "visible": false },
-        "speed_wall_0": { "default": 30.0, "visible": false },
-        "material_diameter": { "default": 1.75 },
-        "layer_height_0": { "default": 0.2, "visible": true },
-        "speed_layer_0": { "default": 35.0, "visible": true },
-        "infill_overlap": { "default": 15.0, "visible": false },
-        "layer_height": { "default": 0.2 },
-        "cool_min_speed": { "default": 20.0, "visible": false },
-        "speed_wall_x": { "default": 35.0, "visible": false },
-        "wall_line_count": { "default": 3, "visible": false },
-        "retraction_amount": { "default": 4.0, "visible": false },
-        "retract_hop": { "default": 0.075, "visible": false },
-        "retraction_speed": { "default": 45.0, "visible": false },
-        "skirt_gap": { "default": 7.0 },
-        "skirt_line_count": { "default": 4 },
-        "speed_infill": { "default": 60.0, "visible": true },
         "material_print_temperature": { "default": 210.0, "visible": true },
-        "speed_topbottom": { "default": 35.0, "visible": false },
-        "top_thickness": { "default": 1.2, "visible": false },
-        "top_layers": { "default": 6, "visible": false },
-        "speed_travel": { "default": 150.0 },
+        "material_bed_temperature": { "default": 0 },
+        "material_diameter": { "default": 1.75 },
+        "layer_height": { "default": 0.2 },
+        "layer_height_0": { "default": 0.2, "visible": true },
         "shell_thickness": { "default": 1.2 },
+        "wall_line_count": { "default": 3, "visible": false },
         "wall_thickness": { "default": 1.2, "visible": false },
         "top_bottom_thickness": { "default": 1.2, "visible": false },
-        "material_bed_temperature": { "default": 0 },
-        "support_enable": { "default": false },
-        "speed_print": { "default": 50.0 },
+        "infill_sparse_density": { "default": 20.0 },
+        "infill_overlap": { "default": 15.0, "visible": false },
+        "speed_print": { "default": 60.0 },
+        "speed_travel": { "default": 160.0 },
+        "speed_layer_0": { "default": 30.0, "visible": true },
+        "speed_wall_x": { "default": 35.0, "visible": false },
+        "speed_wall_0": { "default": 30.0, "visible": false },
+        "speed_infill": { "default": 80.0, "visible": true },
+        "speed_topbottom": { "default": 35.0, "visible": false },
         "skirt_speed": { "default": 35.0, "visible": false },
-        "skirt_minimal_length": { "default": 30.0, "visible": false }
+        "retraction_amount": { "default": 2.0, "visible": false },
+        "retraction_speed": { "default": 45.0, "visible": false },
+        "skirt_line_count": { "default": 4 },
+        "skirt_minimal_length": { "default": 30.0, "visible": false },
+        "skirt_gap": { "default": 6.0 },
+        "cool_fan_full_at_height": { "default": 0.4, "visible": false },
+        "support_enable": { "default": false }
     }
 }
diff --git a/resources/machines/bq_hephestos_xl.json b/resources/machines/bq_hephestos_xl.json
index e518647535..29b4c9cb77 100644
--- a/resources/machines/bq_hephestos_xl.json
+++ b/resources/machines/bq_hephestos_xl.json
@@ -4,7 +4,7 @@
     "name": "BQ Prusa i3 Hephestos XL",
     "manufacturer": "Other",
     "author": "BQ",
-    "platform": "hephestos_platform.stl",
+    "platform": "bq_hephestos_platform.stl",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -33,7 +33,7 @@
             "default": "RepRap"
         },
         "machine_platform_offset": {
-            "default": [0, 100, 0]
+            "default": [0, -82, 0]
         }
     },
     "overrides": {
diff --git a/resources/machines/bq_witbox.json b/resources/machines/bq_witbox.json
index 46c01a8f9c..445859b141 100644
--- a/resources/machines/bq_witbox.json
+++ b/resources/machines/bq_witbox.json
@@ -4,7 +4,7 @@
     "name": "BQ Witbox",
     "manufacturer": "Other",
     "author": "BQ",
-    "platform": "witbox_platform.stl",
+    "platform": "bq_witbox_platform.stl",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json
index 9325e4f531..62bbc2c5ff 100644
--- a/resources/machines/bq_witbox_2.json
+++ b/resources/machines/bq_witbox_2.json
@@ -4,7 +4,7 @@
     "name": "BQ Witbox 2",
     "manufacturer": "Other",
     "author": "BQ",
-    "platform": "witbox_platform.stl",
+    "platform": "bq_witbox_platform.stl",
     "inherits": "fdmprinter.json",
 
     "machine_settings": {
@@ -37,35 +37,31 @@
         }
     },
     "overrides": {
-        "bottom_thickness": { "default": 1.2, "visible": true },
-        "cool_fan_full_at_height": { "default": 0.8, "visible": false },
-        "speed_wall_0": { "default": 30.0, "visible": false },
-        "material_diameter": { "default": 1.75 },
-        "layer_height_0": { "default": 0.2, "visible": true },
-        "speed_layer_0": { "default": 35.0, "visible": true },
-        "infill_overlap": { "default": 15.0, "visible": false },
-        "layer_height": { "default": 0.2 },
-        "cool_min_speed": { "default": 20.0, "visible": false },
-        "speed_wall_x": { "default": 35.0, "visible": false },
-        "wall_line_count": { "default": 3, "visible": false },
-        "retraction_amount": { "default": 4.0, "visible": false },
-        "retract_hop": { "default": 0.075, "visible": false },
-        "retraction_speed": { "default": 45.0, "visible": false },
-        "skirt_gap": { "default": 7.0 },
-        "skirt_line_count": { "default": 4 },
-        "speed_infill": { "default": 60.0, "visible": true },
         "material_print_temperature": { "default": 210.0, "visible": true },
-        "speed_topbottom": { "default": 35.0, "visible": false },
-        "top_thickness": { "default": 1.2, "visible": false },
-        "top_layers": { "default": 6, "visible": false },
-        "speed_travel": { "default": 150.0 },
+        "material_bed_temperature": { "default": 0 },
+        "material_diameter": { "default": 1.75 },
+        "layer_height": { "default": 0.2 },
+        "layer_height_0": { "default": 0.2, "visible": true },
         "shell_thickness": { "default": 1.2 },
+        "wall_line_count": { "default": 3, "visible": false },
         "wall_thickness": { "default": 1.2, "visible": false },
         "top_bottom_thickness": { "default": 1.2, "visible": false },
-        "material_bed_temperature": { "default": 0 },
-        "support_enable": { "default": false },
-        "speed_print": { "default": 50.0 },
+        "infill_sparse_density": { "default": 20.0 },
+        "infill_overlap": { "default": 15.0, "visible": false },
+        "speed_print": { "default": 60.0 },
+        "speed_travel": { "default": 160.0 },
+        "speed_layer_0": { "default": 30.0, "visible": true },
+        "speed_wall_x": { "default": 35.0, "visible": false },
+        "speed_wall_0": { "default": 30.0, "visible": false },
+        "speed_infill": { "default": 80.0, "visible": true },
+        "speed_topbottom": { "default": 35.0, "visible": false },
         "skirt_speed": { "default": 35.0, "visible": false },
-        "skirt_minimal_length": { "default": 30.0, "visible": false }
+        "retraction_amount": { "default": 2.0, "visible": false },
+        "retraction_speed": { "default": 45.0, "visible": false },
+        "skirt_line_count": { "default": 4 },
+        "skirt_minimal_length": { "default": 30.0, "visible": false },
+        "skirt_gap": { "default": 6.0 },
+        "cool_fan_full_at_height": { "default": 0.4, "visible": false },
+        "support_enable": { "default": false }
     }
 }
diff --git a/resources/meshes/bq_hephestos_2.stl b/resources/meshes/bq_hephestos_2_platform.stl
similarity index 100%
rename from resources/meshes/bq_hephestos_2.stl
rename to resources/meshes/bq_hephestos_2_platform.stl
diff --git a/resources/meshes/bq_hephestos_platform.stl b/resources/meshes/bq_hephestos_platform.stl
new file mode 100644
index 0000000000..7686a6f5b5
Binary files /dev/null and b/resources/meshes/bq_hephestos_platform.stl differ
diff --git a/resources/meshes/witbox_platform.stl b/resources/meshes/bq_witbox_platform.stl
similarity index 100%
rename from resources/meshes/witbox_platform.stl
rename to resources/meshes/bq_witbox_platform.stl
diff --git a/resources/meshes/hephestos_platform.stl b/resources/meshes/hephestos_platform.stl
deleted file mode 100644
index ed5b706840..0000000000
Binary files a/resources/meshes/hephestos_platform.stl and /dev/null differ