diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json
index c79870537a..4a70851e33 100644
--- a/resources/definitions/ankermake_m5.def.json
+++ b/resources/definitions/ankermake_m5.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "ankermake_m5_platform.obj",
         "has_machine_quality": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" },
         "platform_texture": "ankermake_m5.png",
-        "has_textured_buildplate": true,
         "preferred_material": "generic_pla",
         "preferred_quality_type": "normal"
     },
diff --git a/resources/definitions/ankermake_m5c.def.json b/resources/definitions/ankermake_m5c.def.json
index 22d1e56a94..131bd6bd7a 100644
--- a/resources/definitions/ankermake_m5c.def.json
+++ b/resources/definitions/ankermake_m5c.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "ankermake_m5c_platform.obj",
         "has_machine_quality": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "ankermake_m5c_extruder_0" },
         "platform_texture": "ankermake_m5c.png",
-        "has_textured_buildplate": true,
         "preferred_material": "generic_pla",
         "preferred_quality_type": "normal"
     },
diff --git a/resources/definitions/dagoma_sigma_pro.def.json b/resources/definitions/dagoma_sigma_pro.def.json
index 31e477ca0e..3f39c9f713 100644
--- a/resources/definitions/dagoma_sigma_pro.def.json
+++ b/resources/definitions/dagoma_sigma_pro.def.json
@@ -11,13 +11,13 @@
         "platform": "dagoma_sigma_pro.obj",
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
+        "has_textured_buildplate": true,
         "has_variants": true,
         "machine_extruder_trains": { "0": "dagoma_sigma_pro_extruder" },
         "platform_texture": "dagoma_sigma_pro.png",
         "preferred_quality_type": "h0.2",
         "preferred_variant_name": "Brass 0.4mm",
         "quality_definition": "dagoma_sigma_pro",
-        "has_textured_buildplate": true,
         "variants_name": "Nozzle"
     },
     "overrides":
diff --git a/resources/definitions/dagoma_sigma_pro_dual.def.json b/resources/definitions/dagoma_sigma_pro_dual.def.json
index a81d1cc028..cd1702228c 100644
--- a/resources/definitions/dagoma_sigma_pro_dual.def.json
+++ b/resources/definitions/dagoma_sigma_pro_dual.def.json
@@ -11,6 +11,7 @@
         "platform": "dagoma_sigma_pro.obj",
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
+        "has_textured_buildplate": true,
         "has_variants": true,
         "machine_extruder_trains":
         {
@@ -18,7 +19,6 @@
             "1": "dagoma_sigma_pro_dual_extruder_left"
         },
         "platform_texture": "dagoma_sigma_pro.png",
-        "has_textured_buildplate": true,
         "preferred_quality_type": "h0.2",
         "preferred_variant_name": "Brass 0.4mm",
         "quality_definition": "dagoma_sigma_pro_dual",
diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json
index f283914237..807d036523 100644
--- a/resources/definitions/flyingbear_ghost_4s.def.json
+++ b/resources/definitions/flyingbear_ghost_4s.def.json
@@ -7,8 +7,8 @@
         "visible": true,
         "author": "oducceu",
         "platform": "flyingbear_platform.obj",
-        "platform_texture": "flyingbear_platform.png",
         "has_textured_buildplate": true,
+        "platform_texture": "flyingbear_platform.png",
         "quality_definition": "flyingbear_base"
     },
     "overrides":
diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json
index 615b910ee7..b72a3a18fd 100644
--- a/resources/definitions/flyingbear_ghost_5.def.json
+++ b/resources/definitions/flyingbear_ghost_5.def.json
@@ -7,8 +7,8 @@
         "visible": true,
         "author": "oducceu",
         "platform": "flyingbear_platform.obj",
-        "platform_texture": "flyingbear_platform.png",
         "has_textured_buildplate": true,
+        "platform_texture": "flyingbear_platform.png",
         "quality_definition": "flyingbear_base"
     },
     "overrides":
diff --git a/resources/definitions/flyingbear_ghost_6.def.json b/resources/definitions/flyingbear_ghost_6.def.json
index a32931748a..8c5287cb4e 100644
--- a/resources/definitions/flyingbear_ghost_6.def.json
+++ b/resources/definitions/flyingbear_ghost_6.def.json
@@ -7,8 +7,8 @@
         "visible": true,
         "author": "barrnet",
         "platform": "flyingbear_platform.obj",
-        "platform_texture": "flyingbear_platform.png",
         "has_textured_buildplate": true,
+        "platform_texture": "flyingbear_platform.png",
         "quality_definition": "flyingbear_base"
     },
     "overrides":
diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json
index 9daa5fc720..2a7022e7c1 100644
--- a/resources/definitions/hellbot_adonis.def.json
+++ b/resources/definitions/hellbot_adonis.def.json
@@ -10,14 +10,14 @@
         "file_formats": "text/x-gcode",
         "platform": "hellbot_adonis.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_adonis_extruder" },
         "platform_offset": [
             0,
             -1,
             0
         ],
-        "platform_texture": "hellbot.png",
-        "has_textured_buildplate": true
+        "platform_texture": "hellbot.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json
index 3ebdb7bb99..fe1d580354 100644
--- a/resources/definitions/hellbot_hidra.def.json
+++ b/resources/definitions/hellbot_hidra.def.json
@@ -10,6 +10,7 @@
         "file_formats": "text/x-gcode",
         "platform": "hellbot_hidra.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains":
         {
             "0": "hellbot_hidra_extruder_0",
@@ -20,8 +21,7 @@
             0,
             5
         ],
-        "platform_texture": "hellbot_hidra.png",
-        "has_textured_buildplate": true
+        "platform_texture": "hellbot_hidra.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json
index 844faa1904..dc718dc5f2 100644
--- a/resources/definitions/hellbot_hidra_plus.def.json
+++ b/resources/definitions/hellbot_hidra_plus.def.json
@@ -10,6 +10,7 @@
         "file_formats": "text/x-gcode",
         "platform": "hellbot_hidra_plus.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains":
         {
             "0": "hellbot_hidra_plus_extruder_0",
@@ -20,8 +21,7 @@
             0,
             5
         ],
-        "platform_texture": "hellbot_hidra_plus.png",
-        "has_textured_buildplate": true
+        "platform_texture": "hellbot_hidra_plus.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_230.def.json b/resources/definitions/hellbot_magna_2_230.def.json
index 6757599d3f..c2e200b100 100644
--- a/resources/definitions/hellbot_magna_2_230.def.json
+++ b/resources/definitions/hellbot_magna_2_230.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_230.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_2_230_extruder_0" },
-        "platform_texture": "Magna2_230.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_230.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json
index d913a0d89f..3ba073d89b 100644
--- a/resources/definitions/hellbot_magna_2_230_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_230_dual.def.json
@@ -10,13 +10,13 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_230.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains":
         {
             "0": "hellbot_magna_2_230_dual_extruder_0",
             "1": "hellbot_magna_2_230_dual_extruder_1"
         },
-        "platform_texture": "Magna2_230.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_230.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_300.def.json b/resources/definitions/hellbot_magna_2_300.def.json
index 1a49f41a37..565119e31f 100644
--- a/resources/definitions/hellbot_magna_2_300.def.json
+++ b/resources/definitions/hellbot_magna_2_300.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_300.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_2_300_extruder_0" },
-        "platform_texture": "Magna2_300.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_300.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json
index 9db9e9774e..9e0e72f145 100644
--- a/resources/definitions/hellbot_magna_2_300_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_300_dual.def.json
@@ -10,13 +10,13 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_300.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains":
         {
             "0": "hellbot_magna_2_300_dual_extruder_0",
             "1": "hellbot_magna_2_300_dual_extruder_1"
         },
-        "platform_texture": "Magna2_300.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_300.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_400.def.json b/resources/definitions/hellbot_magna_2_400.def.json
index 797584e341..8bc7c21811 100644
--- a/resources/definitions/hellbot_magna_2_400.def.json
+++ b/resources/definitions/hellbot_magna_2_400.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_400.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_2_400_extruder_0" },
-        "platform_texture": "Magna2_400.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_400.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_400_dual.def.json b/resources/definitions/hellbot_magna_2_400_dual.def.json
index e74221bbd3..00f10c1117 100644
--- a/resources/definitions/hellbot_magna_2_400_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_400_dual.def.json
@@ -10,13 +10,13 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_400.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains":
         {
             "0": "hellbot_magna_2_400_dual_extruder_0",
             "1": "hellbot_magna_2_400_dual_extruder_1"
         },
-        "platform_texture": "Magna2_400.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_400.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_500.def.json b/resources/definitions/hellbot_magna_2_500.def.json
index 61bddc7b9a..fe83fab70a 100644
--- a/resources/definitions/hellbot_magna_2_500.def.json
+++ b/resources/definitions/hellbot_magna_2_500.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_500.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_2_500_extruder_0" },
-        "platform_texture": "Magna2_500.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_500.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_2_500_dual.def.json b/resources/definitions/hellbot_magna_2_500_dual.def.json
index 040c289867..a8f6fc5b37 100644
--- a/resources/definitions/hellbot_magna_2_500_dual.def.json
+++ b/resources/definitions/hellbot_magna_2_500_dual.def.json
@@ -10,13 +10,13 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_2_500.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains":
         {
             "0": "hellbot_magna_2_500_dual_extruder_0",
             "1": "hellbot_magna_2_500_dual_extruder_1"
         },
-        "platform_texture": "Magna2_500.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Magna2_500.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json
index 0adcaa38e2..7425aa3db4 100644
--- a/resources/definitions/hellbot_magna_I.def.json
+++ b/resources/definitions/hellbot_magna_I.def.json
@@ -10,14 +10,14 @@
         "file_formats": "text/x-gcode",
         "platform": "hellbot_magna.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_i_extruder" },
         "platform_offset": [
             0,
             -1,
             0
         ],
-        "platform_texture": "hellbot.png",
-        "has_textured_buildplate": true
+        "platform_texture": "hellbot.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json
index f568d944ec..a449a60f01 100644
--- a/resources/definitions/hellbot_magna_SE.def.json
+++ b/resources/definitions/hellbot_magna_SE.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "hellbot_magna_SE.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" },
-        "platform_texture": "hellbot_magna_SE.png",
-        "has_textured_buildplate": true
+        "platform_texture": "hellbot_magna_SE.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_SE_300.def.json b/resources/definitions/hellbot_magna_SE_300.def.json
index 3c3aaa8195..bb83df4a37 100644
--- a/resources/definitions/hellbot_magna_SE_300.def.json
+++ b/resources/definitions/hellbot_magna_SE_300.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_SE_300.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_SE_300_extruder" },
-        "platform_texture": "Hellbot_Magna_SE_300.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Hellbot_Magna_SE_300.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json
index bb045f4517..aa71aab37b 100644
--- a/resources/definitions/hellbot_magna_SE_Pro.def.json
+++ b/resources/definitions/hellbot_magna_SE_Pro.def.json
@@ -10,9 +10,9 @@
         "file_formats": "text/x-gcode",
         "platform": "Hellbot_Magna_SE_Pro.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" },
-        "platform_texture": "Hellbot_magna_SE_Pro.png",
-        "has_textured_buildplate": true
+        "platform_texture": "Hellbot_magna_SE_Pro.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json
index d403399028..9488ec2a43 100644
--- a/resources/definitions/hellbot_magna_dual.def.json
+++ b/resources/definitions/hellbot_magna_dual.def.json
@@ -10,6 +10,7 @@
         "file_formats": "text/x-gcode",
         "platform": "hellbot_magna.obj",
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains":
         {
             "0": "hellbot_magna_dual_extruder_1",
@@ -20,8 +21,7 @@
             -1,
             0
         ],
-        "platform_texture": "hellbot.png",
-        "has_textured_buildplate": true
+        "platform_texture": "hellbot.png"
     },
     "overrides":
     {
diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json
index 516e5a081c..d194902e5c 100644
--- a/resources/definitions/koonovo_base.def.json
+++ b/resources/definitions/koonovo_base.def.json
@@ -12,9 +12,9 @@
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "has_materials": true,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "koonovo_base_extruder_0" },
         "platform_texture": "koonovo.png",
-        "has_textured_buildplate": true,
         "preferred_material": "generic_pla",
         "preferred_quality_type": "standard"
     },
diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json
index a45c5cf666..20d3bafa0a 100644
--- a/resources/definitions/peopoly_moai.def.json
+++ b/resources/definitions/peopoly_moai.def.json
@@ -11,9 +11,9 @@
         "platform": "moai.obj",
         "has_machine_quality": true,
         "has_materials": false,
+        "has_textured_buildplate": true,
         "machine_extruder_trains": { "0": "peopoly_moai_extruder_0" },
-        "platform_texture": "moai.jpg",
-        "has_textured_buildplate": true
+        "platform_texture": "moai.jpg"
     },
     "overrides":
     {
diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json
index 5e830f205f..b869004626 100644
--- a/resources/definitions/ultimaker_sketch_sprint.def.json
+++ b/resources/definitions/ultimaker_sketch_sprint.def.json
@@ -58,6 +58,7 @@
         ],
         "has_machine_quality": true,
         "has_materials": true,
+        "has_textured_buildplate": true,
         "has_variants": true,
         "machine_extruder_trains": { "0": "ultimaker_sketch_sprint_extruder" },
         "platform_offset": [
@@ -66,7 +67,6 @@
             0
         ],
         "platform_texture": "MakerbotSketchSprint.png",
-        "has_textured_buildplate": true,
         "preferred_material": "ultimaker_pla_175",
         "preferred_quality_type": "draft",
         "preferred_variant_name": "0.4mm",
diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json
index 17af2722a6..c58264e1ee 100644
--- a/resources/definitions/uni_200.def.json
+++ b/resources/definitions/uni_200.def.json
@@ -7,8 +7,8 @@
         "visible": true,
         "author": "Nail` Gimadeev (C)",
         "platform": "uni_200_platform.stl",
-        "platform_texture": "uni.png",
         "has_textured_buildplate": true,
+        "platform_texture": "uni.png",
         "quality_definition": "uni_base"
     },
     "overrides":
diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json
index 704f861fe6..ae2aad9714 100644
--- a/resources/definitions/uni_250.def.json
+++ b/resources/definitions/uni_250.def.json
@@ -7,8 +7,8 @@
         "visible": true,
         "author": "Nail` Gimadeev (C)",
         "platform": "uni_250_platform.stl",
-        "platform_texture": "uni.png",
         "has_textured_buildplate": true,
+        "platform_texture": "uni.png",
         "quality_definition": "uni_base"
     },
     "overrides":
diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json
index eee62529e5..6d801b68f8 100644
--- a/resources/definitions/uni_300.def.json
+++ b/resources/definitions/uni_300.def.json
@@ -7,8 +7,8 @@
         "visible": true,
         "author": "Nail` Gimadeev (C)",
         "platform": "uni_300_platform.stl",
-        "platform_texture": "uni.png",
         "has_textured_buildplate": true,
+        "platform_texture": "uni.png",
         "quality_definition": "uni_base"
     },
     "overrides":
diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json
index e11d4f6679..be327eef4a 100644
--- a/resources/definitions/uni_mini.def.json
+++ b/resources/definitions/uni_mini.def.json
@@ -7,8 +7,8 @@
         "visible": true,
         "author": "Nail` Gimadeev (C)",
         "platform": "uni_mini_platform.stl",
-        "platform_texture": "uni.png",
         "has_textured_buildplate": true,
+        "platform_texture": "uni.png",
         "quality_definition": "uni_base"
     },
     "overrides":