diff --git a/resources/definitions/creawsome_cr10.def.json b/resources/definitions/creawsome_cr10.def.json
index 65170e282d..d45afa2e96 100644
--- a/resources/definitions/creawsome_cr10.def.json
+++ b/resources/definitions/creawsome_cr10.def.json
@@ -9,14 +9,21 @@
         "machine_depth": { "default_value": 300 },
         "machine_height": { "default_value": 400 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
             ]
         },
 
-        "gantry_height": { "default_value": 30 }
+        "gantry_height": { "value": 25 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_cr10mini.def.json b/resources/definitions/creawsome_cr10mini.def.json
index 14fdb5a841..7debdca938 100644
--- a/resources/definitions/creawsome_cr10mini.def.json
+++ b/resources/definitions/creawsome_cr10mini.def.json
@@ -9,14 +9,21 @@
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 300 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
             ]
         },
-        
-        "gantry_height": { "default_value": 30 }
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
+            ]
+        },
+
+        "gantry_height": { "value": 25 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_cr10s4.def.json b/resources/definitions/creawsome_cr10s4.def.json
index 90bcb62891..01f612bfcf 100644
--- a/resources/definitions/creawsome_cr10s4.def.json
+++ b/resources/definitions/creawsome_cr10s4.def.json
@@ -9,14 +9,21 @@
         "machine_depth": { "default_value": 400 },
         "machine_height": { "default_value": 400 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
             ]
         },
-        
-        "gantry_height": { "default_value": 30 }
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
+            ]
+        },
+
+        "gantry_height": { "value": 25 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_cr10s5.def.json b/resources/definitions/creawsome_cr10s5.def.json
index e799c916b8..a4add4669f 100644
--- a/resources/definitions/creawsome_cr10s5.def.json
+++ b/resources/definitions/creawsome_cr10s5.def.json
@@ -9,14 +9,21 @@
         "machine_depth": { "default_value": 500 },
         "machine_height": { "default_value": 500 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
             ]
         },
 
-        "gantry_height": { "default_value": 30 }
+        "gantry_height": { "value": 25 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_cr10spro.def.json b/resources/definitions/creawsome_cr10spro.def.json
index e63611093f..295ae42239 100644
--- a/resources/definitions/creawsome_cr10spro.def.json
+++ b/resources/definitions/creawsome_cr10spro.def.json
@@ -5,7 +5,23 @@
     "inherits": "creawsome_cr10",
     "overrides": {
         "machine_name": { "default_value": "Creawsome CR-10S Pro" },
-        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}
+        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
+        "machine_head_polygon": { "default_value": [
+                [-44, 34],
+                [-44, -34],
+                [18, -34],
+                [18, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-44, 34],
+                [-44, -34],
+                [38, -34],
+                [38, 34]
+            ]
+        },
+
+        "gantry_height": { "value": 30 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_cr20.def.json b/resources/definitions/creawsome_cr20.def.json
index d05ea22987..df0b2de8eb 100644
--- a/resources/definitions/creawsome_cr20.def.json
+++ b/resources/definitions/creawsome_cr20.def.json
@@ -9,14 +9,21 @@
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 250 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
             ]
         },
 
-        "gantry_height": { "default_value": 30 }
+        "gantry_height": { "value": 25 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_ender2.def.json b/resources/definitions/creawsome_ender2.def.json
index ae777e0b84..3b093e24b6 100644
--- a/resources/definitions/creawsome_ender2.def.json
+++ b/resources/definitions/creawsome_ender2.def.json
@@ -9,14 +9,21 @@
         "machine_depth": { "default_value": 150 },
         "machine_height": { "default_value": 200 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
             ]
         },
 
-        "gantry_height": { "default_value": 30 }
+        "gantry_height": { "value": 25 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_ender3.def.json b/resources/definitions/creawsome_ender3.def.json
index d4968721d9..780c11d23e 100644
--- a/resources/definitions/creawsome_ender3.def.json
+++ b/resources/definitions/creawsome_ender3.def.json
@@ -9,14 +9,21 @@
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 250 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
             ]
         },
 
-        "gantry_height": { "default_value": 30 }
+        "gantry_height": { "value": 25 }
 
     },
     "metadata": {
diff --git a/resources/definitions/creawsome_ender4.def.json b/resources/definitions/creawsome_ender4.def.json
index ffd81d78e8..422c077db9 100644
--- a/resources/definitions/creawsome_ender4.def.json
+++ b/resources/definitions/creawsome_ender4.def.json
@@ -9,14 +9,22 @@
         "machine_depth": { "default_value": 468 },
         "machine_height": { "default_value": 482 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
             ]
         },
 
-        "gantry_height": { "default_value": 30 },
+        "gantry_height": { "value": 25 },
+
         "speed_print": { "value": 80.0 }
 
     },
diff --git a/resources/definitions/creawsome_ender5.def.json b/resources/definitions/creawsome_ender5.def.json
index d6bebc4074..39c14ab842 100644
--- a/resources/definitions/creawsome_ender5.def.json
+++ b/resources/definitions/creawsome_ender5.def.json
@@ -9,14 +9,22 @@
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 300 },
         "machine_head_polygon": { "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
+        },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
             ]
         },
 
-        "gantry_height": { "default_value": 30 },
+        "gantry_height": { "value": 25 },
+
         "speed_print": { "value": 80.0 }
 
     },