diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json
index 5492b5b4c9..911fc584a9 100644
--- a/resources/definitions/kemiq_q2_beta.def.json
+++ b/resources/definitions/kemiq_q2_beta.def.json
@@ -10,13 +10,13 @@
         "category": "Other",
         "file_formats": "text/x-gcode",
         "platform": "kemiq_q2.stl",
-		"has_machine_quality": true,
+        "has_machine_quality": true,
         "has_materials": true
     },
 
     "overrides": {
         "machine_name": { "default_value": "Kemiq Q2 Beta" },
-		
+
         "machine_width": {
             "default_value": 190
         },
@@ -29,13 +29,13 @@
         "machine_heated_bed": {
             "default_value": true
         },
-		"machine_center_is_zero": {
+        "machine_center_is_zero": {
             "default_value": false
         },
-		"material_diameter": {
+        "material_diameter": {
             "default_value": 1.75
         },
-		"machine_nozzle_size": {
+        "machine_nozzle_size": {
             "default_value": 0.4
         },
         "machine_nozzle_heat_up_speed": {
diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json
index ee33b29be2..4f803ecdb8 100644
--- a/resources/definitions/kemiq_q2_gama.def.json
+++ b/resources/definitions/kemiq_q2_gama.def.json
@@ -10,13 +10,14 @@
         "category": "Other",
         "file_formats": "text/x-gcode",
         "platform": "kemiq_q2.stl",
-		"has_machine_quality": true,
+        "has_machine_quality": true,
         "has_materials": true
     },
 
     "overrides": {
-        "machine_name": { "default_value": "Kemiq Q2 Gama" },
-		
+        "machine_name": { 
+            "default_value": "Kemiq Q2 Gama" 
+        },
         "machine_width": {
             "default_value": 190
         },
@@ -29,13 +30,13 @@
         "machine_heated_bed": {
             "default_value": false
         },
-		"machine_center_is_zero": {
+        "machine_center_is_zero": {
             "default_value": false
         },
-		"material_diameter": {
+        "material_diameter": {
             "default_value": 1.75
         },
-		"machine_nozzle_size": {
+        "machine_nozzle_size": {
             "default_value": 0.4
         },
         "machine_nozzle_heat_up_speed": {
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg
index 6c52b40e08..d2b7968813 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -3
 material = generic_abs
 quality_type = coarse
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.35
@@ -35,8 +35,8 @@ raft_margin = 10
 raft_surface_layers = 3
 raft_interface_line_spacing = 2
 raft_speed = 20
-raft_base_line_width = 0.8
-raft_base_thickness = 0.36
+raft_base_line_width = 0.8
+raft_base_thickness = 0.36
 raft_surface_line_spacing = 0.4
 
 cool_fan_enabled = False
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg
index 091c016f88..eba5bd3e6d 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = 1
 material = generic_abs
 quality_type = high
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.06
@@ -35,8 +35,8 @@ raft_margin = 10
 raft_surface_layers = 3
 raft_interface_line_spacing = 2
 raft_speed = 20
-raft_base_line_width = 0.8
-raft_base_thickness = 0.36
+raft_base_line_width = 0.8
+raft_base_thickness = 0.36
 raft_surface_line_spacing = 0.4
 
 cool_fan_enabled = False
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg
index 9739d0c45e..01972c482c 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = 0
 material = generic_abs
 quality_type = normal
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.1
@@ -35,8 +35,8 @@ raft_margin = 10
 raft_surface_layers = 3
 raft_interface_line_spacing = 2
 raft_speed = 20
-raft_base_line_width = 0.8
-raft_base_thickness = 0.36
+raft_base_line_width = 0.8
+raft_base_thickness = 0.36
 raft_surface_line_spacing = 0.4
 
 cool_fan_enabled = False
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg
index 7a64763a6d..c51dd5794e 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -2
 material = generic_abs
 quality_type = draft
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.2
@@ -35,8 +35,8 @@ raft_margin = 10
 raft_surface_layers = 3
 raft_interface_line_spacing = 2
 raft_speed = 20
-raft_base_line_width = 0.8
-raft_base_thickness = 0.36
+raft_base_line_width = 0.8
+raft_base_thickness = 0.36
 raft_surface_line_spacing = 0.4
 
 cool_fan_enabled = False
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg
index 57a1754a4e..2c0eb0b51e 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -1
 material = generic_abs
 quality_type = low
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.15
@@ -35,8 +35,8 @@ raft_margin = 10
 raft_surface_layers = 3
 raft_interface_line_spacing = 2
 raft_speed = 20
-raft_base_line_width = 0.8
-raft_base_thickness = 0.36
+raft_base_line_width = 0.8
+raft_base_thickness = 0.36
 raft_surface_line_spacing = 0.4
 
 cool_fan_enabled = False
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg
index a53790c8b5..1959c251c2 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -3
 material = generic_pla
 quality_type = coarse
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.35
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg
index c574d79dd7..ea5fc11349 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = 1
 quality_type = high
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.06
@@ -30,9 +30,3 @@ retraction_speed = 40
 retraction_amount = 2.15
 
 raft_airgap = 0.25
-
-
-
-
-
-
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg
index 8b6852e28e..1f2d52affc 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = 0
 material = generic_pla
 quality_type = normal
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.1
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg
index 0abaa334fb..97dcabd8e5 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -2
 material = generic_pla
 quality_type = draft
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg
index a737ec5fa8..5ad4183058 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -1
 material = generic_pla
 quality_type = low
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.15
diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg
index 4f7e2544d5..537ee829b8 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -3
 material = generic_pla
 quality_type = coarse
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.35
diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg
index e84f73716a..a01298ce58 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = 1
 quality_type = high
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.06
@@ -29,9 +29,3 @@ retraction_speed = 40
 retraction_amount = 2.15
 
 raft_airgap = 0.25
-
-
-
-
-
-
diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg
index 6f2d9523c5..fc03449351 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = 0
 material = generic_pla
 quality_type = normal
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.1
diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg
index 55aedc1e32..6b9fb3acce 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -2
 material = generic_pla
 quality_type = draft
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg
index e6c2902d0e..70e16a9bea 100644
--- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg
+++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 weight = -1
 material = generic_pla
 quality_type = low
-setting_version = 1
+setting_version = 2
 
 [values]
 layer_height = 0.15
@@ -29,9 +29,3 @@ retraction_speed = 40
 retraction_amount = 2.15
 
 raft_airgap = 0.25
-
-
-
-
-
-