diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py
index ad80d286c3..c6f94f0a80 100644
--- a/cura/CrashHandler.py
+++ b/cura/CrashHandler.py
@@ -75,7 +75,6 @@ class CrashHandler:
 
     ##  Creates a modal dialog.
     def _createDialog(self):
-        self.dialog = QDialog()
         self.dialog.setMinimumWidth(640)
         self.dialog.setMinimumHeight(640)
         self.dialog.setWindowTitle(catalog.i18nc("@title:window", "Crash Report"))
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 7904066966..292ad93121 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -105,7 +105,7 @@ class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # changes of the settings.
-    SettingVersion = 3
+    SettingVersion = 4
 
     class ResourceTypes:
         QmlFiles = Resources.UserType + 1
@@ -216,6 +216,7 @@ class CuraApplication(QtApplication):
 
         self.setRequiredPlugins([
             "CuraEngineBackend",
+            "UserAgreement",
             "SolidView",
             "LayerView",
             "STLReader",
@@ -274,8 +275,9 @@ class CuraApplication(QtApplication):
         empty_quality_container = copy.deepcopy(empty_container)
         empty_quality_container._id = "empty_quality"
         empty_quality_container.setName("Not Supported")
-        empty_quality_container.addMetaDataEntry("quality_type", "normal")
+        empty_quality_container.addMetaDataEntry("quality_type", "not_supported")
         empty_quality_container.addMetaDataEntry("type", "quality")
+        empty_quality_container.addMetaDataEntry("supported", False)
         ContainerRegistry.getInstance().addContainer(empty_quality_container)
 
         empty_quality_changes_container = copy.deepcopy(empty_container)
@@ -308,6 +310,8 @@ class CuraApplication(QtApplication):
 
         preferences.addPreference("view/invert_zoom", False)
 
+        self._need_to_show_user_agreement = not Preferences.getInstance().getValue("general/accepted_user_agreement")
+
         for key in [
             "dialog_load_path",  # dialog_save_path is in LocalFileOutputDevicePlugin
             "dialog_profile_path",
@@ -380,6 +384,14 @@ class CuraApplication(QtApplication):
     def _onEngineCreated(self):
         self._engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
 
+    @pyqtProperty(bool)
+    def needToShowUserAgreement(self):
+        return self._need_to_show_user_agreement
+
+
+    def setNeedToShowUserAgreement(self, set_value = True):
+        self._need_to_show_user_agreement = set_value
+
     ## The "Quit" button click event handler.
     @pyqtSlot()
     def closeApplication(self):
diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py
index 86bcc2719e..f3b178c356 100644
--- a/cura/PrintInformation.py
+++ b/cura/PrintInformation.py
@@ -313,7 +313,12 @@ class PrintInformation(QObject):
             elif word.isdigit():
                 abbr_machine += word
             else:
-                abbr_machine += self._stripAccents(word.strip("()[]{}#").upper())[0]
+                stripped_word = self._stripAccents(word.strip("()[]{}#").upper())
+                # - use only the first character if the word is too long (> 3 characters)
+                # - use the whole word if it's not too long (<= 3 characters)
+                if len(stripped_word) > 3:
+                    stripped_word = stripped_word[0]
+                abbr_machine += stripped_word
 
         self._abbr_machine = abbr_machine
 
@@ -339,4 +344,3 @@ class PrintInformation(QObject):
 
         temp_material_amounts = [0]
         self._onPrintDurationMessage(temp_message, temp_material_amounts)
-
diff --git a/cura/QualityManager.py b/cura/QualityManager.py
index b6d47d919b..abd14fa841 100644
--- a/cura/QualityManager.py
+++ b/cura/QualityManager.py
@@ -87,7 +87,7 @@ class QualityManager:
         qualities = set(quality_type_dict.values())
         for material_container in material_containers[1:]:
             next_quality_type_dict = self.__fetchQualityTypeDictForMaterial(machine_definition, material_container)
-            qualities.update(set(next_quality_type_dict.values()))
+            qualities.intersection_update(set(next_quality_type_dict.values()))
 
         return list(qualities)
 
@@ -178,12 +178,25 @@ class QualityManager:
     def findAllUsableQualitiesForMachineAndExtruders(self, global_container_stack: "GlobalStack", extruder_stacks: List["ExtruderStack"]) -> List[InstanceContainer]:
         global_machine_definition = global_container_stack.getBottom()
 
+        machine_manager = Application.getInstance().getMachineManager()
+        active_stack_id = machine_manager.activeStackId
+
+        materials = []
+
+        # TODO: fix this
         if extruder_stacks:
-            # Multi-extruder machine detected.
-            materials = [stack.material for stack in extruder_stacks]
+            # Multi-extruder machine detected
+            for stack in extruder_stacks:
+                if stack.getId() == active_stack_id and machine_manager.newMaterial:
+                    materials.append(machine_manager.newMaterial)
+                else:
+                    materials.append(stack.material)
         else:
-            # Machine with one extruder.
-            materials = [global_container_stack.material]
+            # Machine with one extruder
+            if global_container_stack.getId() == active_stack_id and machine_manager.newMaterial:
+                materials.append(machine_manager.newMaterial)
+            else:
+                materials.append(global_container_stack.material)
 
         quality_types = self.findAllQualityTypesForMachineAndMaterials(global_machine_definition, materials)
 
diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py
index 26dc8b775e..11c4cf2d4a 100644
--- a/cura/Settings/CuraContainerRegistry.py
+++ b/cura/Settings/CuraContainerRegistry.py
@@ -306,6 +306,9 @@ class CuraContainerRegistry(ContainerRegistry):
         if "material" in quality_type_criteria:
             materials = ContainerRegistry.getInstance().findInstanceContainers(id = quality_type_criteria["material"])
             del quality_type_criteria["material"]
+        # Do not filter quality containers here with materials because we are trying to import a profile, so it should
+        # NOT be restricted by the active materials on the current machine.
+        materials = None
 
         # Check to make sure the imported profile actually makes sense in context of the current configuration.
         # This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index bcc64fdefb..13751794f0 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -50,6 +50,7 @@ class MachineManager(QObject):
         # Used to store the new containers until after confirming the dialog
         self._new_variant_container = None
         self._new_material_container = None
+        self._new_quality_containers = []
 
         self._error_check_timer = QTimer()
         self._error_check_timer.setInterval(250)
@@ -70,10 +71,10 @@ class MachineManager(QObject):
 
         self._stacks_have_errors = None
 
-        self._empty_variant_container = ContainerRegistry.getInstance().getEmptyInstanceContainer()
-        self._empty_material_container = ContainerRegistry.getInstance().getEmptyInstanceContainer()
-        self._empty_quality_container = ContainerRegistry.getInstance().getEmptyInstanceContainer()
-        self._empty_quality_changes_container = ContainerRegistry.getInstance().getEmptyInstanceContainer()
+        self._empty_variant_container = ContainerRegistry.getInstance().findContainers(id = "empty_variant")[0]
+        self._empty_material_container = ContainerRegistry.getInstance().findContainers(id = "empty_material")[0]
+        self._empty_quality_container = ContainerRegistry.getInstance().findContainers(id = "empty_quality")[0]
+        self._empty_quality_changes_container = ContainerRegistry.getInstance().findContainers(id = "empty_quality_changes")[0]
 
         self._onGlobalContainerChanged()
 
@@ -146,6 +147,14 @@ class MachineManager(QObject):
 
         self.outputDevicesChanged.emit()
 
+    @property
+    def newVariant(self):
+        return self._new_variant_container
+
+    @property
+    def newMaterial(self):
+        return self._new_material_container
+
     @pyqtProperty("QVariantList", notify = outputDevicesChanged)
     def printerOutputDevices(self):
         return self._printer_output_devices
@@ -838,8 +847,6 @@ class MachineManager(QObject):
             if not containers or not self._global_container_stack:
                 return
 
-            Logger.log("d", "Attempting to change the active quality to %s", quality_id)
-
             # Quality profile come in two flavours: type=quality and type=quality_changes
             # If we found a quality_changes profile then look up its parent quality profile.
             container_type = containers[0].getMetaDataEntry("type")
@@ -859,49 +866,73 @@ class MachineManager(QObject):
             if new_quality_settings_list is None:
                 return
 
-            name_changed_connect_stacks = []  # Connect these stacks to the name changed callback
+            # check if any of the stacks have a not supported profile
+            # if that is the case, all stacks should have a not supported state (otherwise it will show quality_type normal)
+            has_not_supported_quality = False
+
+            # check all stacks for not supported
+            for setting_info in new_quality_settings_list:
+                if setting_info["quality"].getMetaDataEntry("quality_type") == "not_supported":
+                    has_not_supported_quality = True
+                    break
+
+            # set all stacks to not supported if that's the case
+            if has_not_supported_quality:
+                for setting_info in new_quality_settings_list:
+                    setting_info["quality"] = self._empty_quality_container
+
+            self._new_quality_containers.clear()
+
+            # store the upcoming quality profile changes per stack for later execution
+            # this prevents re-slicing before the user has made a choice in the discard or keep dialog
+            # (see _executeDelayedActiveContainerStackChanges)
             for setting_info in new_quality_settings_list:
                 stack = setting_info["stack"]
                 stack_quality = setting_info["quality"]
                 stack_quality_changes = setting_info["quality_changes"]
 
-                name_changed_connect_stacks.append(stack_quality)
-                name_changed_connect_stacks.append(stack_quality_changes)
-                self._replaceQualityOrQualityChangesInStack(stack, stack_quality, postpone_emit=True)
-                self._replaceQualityOrQualityChangesInStack(stack, stack_quality_changes, postpone_emit=True)
-
-            # Connect to onQualityNameChanged
-            for stack in name_changed_connect_stacks:
-                stack.nameChanged.connect(self._onQualityNameChanged)
+                self._new_quality_containers.append({
+                    "stack": stack,
+                    "quality": stack_quality,
+                    "quality_changes": stack_quality_changes
+                })
 
             has_user_interaction = False
 
             if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1:
                 # Show the keep/discard user settings dialog
                 has_user_interaction = Application.getInstance().discardOrKeepProfileChanges()
-            else:
-                # If the user doesn't have any of adjusted settings then slicing will be triggered by emit()
-                # Send emits that are postponed in replaceContainer.
-                # Here the stacks are finished replacing and every value can be resolved based on the current state.
-                for setting_info in new_quality_settings_list:
-                    setting_info["stack"].sendPostponedEmits()
 
+            # If there is no interaction with the user (it means the dialog showing "keep" or "discard" was not shown)
+            # because either there are not user changes or because the used already decided to always keep or discard,
+            # then the quality instance container is replaced, in which case, the activeQualityChanged signal is emitted.
             if not has_user_interaction:
                 self._executeDelayedActiveContainerStackChanges()
-                self.activeQualityChanged.emit()
 
     ##  Used to update material and variant in the active container stack with a delay.
     #   This delay prevents the stack from triggering a lot of signals (eventually resulting in slicing)
     #   before the user decided to keep or discard any of their changes using the dialog.
     #   The Application.onDiscardOrKeepProfileChangesClosed signal triggers this method.
     def _executeDelayedActiveContainerStackChanges(self):
+        if self._new_variant_container is not None:
+            self._active_container_stack.variant = self._new_variant_container
+            self._new_variant_container = None
+
         if self._new_material_container is not None:
             self._active_container_stack.material = self._new_material_container
             self._new_material_container = None
 
-        if self._new_variant_container is not None:
-            self._active_container_stack.variant = self._new_variant_container
-            self._new_variant_container = None
+        # apply the new quality to all stacks
+        if self._new_quality_containers:
+            for new_quality in self._new_quality_containers:
+                self._replaceQualityOrQualityChangesInStack(new_quality["stack"], new_quality["quality"], postpone_emit = True)
+                self._replaceQualityOrQualityChangesInStack(new_quality["stack"], new_quality["quality_changes"], postpone_emit = True)
+
+            for new_quality in self._new_quality_containers:
+                new_quality["stack"].nameChanged.connect(self._onQualityNameChanged)
+                new_quality["stack"].sendPostponedEmits() # Send the signals that were postponed in _replaceQualityOrQualityChangesInStack
+
+            self._new_quality_containers.clear()
 
     ##  Cancel set changes for material and variant in the active container stack.
     #   Used for ignoring any changes when switching between printers (setActiveMachine)
@@ -931,8 +962,14 @@ class MachineManager(QObject):
 
         for stack in stacks:
             material = stack.material
+
+            # TODO: fix this
+            if self._new_material_container and stack.getId() == self._active_container_stack.getId():
+                material = self._new_material_container
+
             quality = quality_manager.findQualityByQualityType(quality_type, global_machine_definition, [material])
-            if not quality: #No quality profile is found for this quality type.
+            if not quality:
+                # No quality profile is found for this quality type.
                 quality = self._empty_quality_container
             result.append({"stack": stack, "quality": quality, "quality_changes": empty_quality_changes})
 
@@ -970,6 +1007,11 @@ class MachineManager(QObject):
         material = global_container_stack.material
 
         # find a quality type that matches both machine and materials
+        if self._new_material_container and self._active_container_stack.getId() == global_container_stack.getId():
+            material = self._new_material_container
+
+        # For the global stack, find a quality which matches the quality_type in
+        # the quality changes profile and also satisfies any material constraints.
         quality_type = global_quality_changes.getMetaDataEntry("quality_type")
 
         extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
@@ -989,6 +1031,10 @@ class MachineManager(QObject):
                 quality_changes = self._empty_quality_changes_container
 
             material = extruder_stack.material
+
+            if self._new_material_container and self._active_container_stack.getId() == stack.getId():
+                material = self._new_material_container
+
             quality = quality_manager.findQualityByQualityType(quality_type, global_machine_definition, [material])
 
             if not quality:
diff --git a/cura/Settings/ProfilesModel.py b/cura/Settings/ProfilesModel.py
index 7432605481..2b75cf1bd2 100644
--- a/cura/Settings/ProfilesModel.py
+++ b/cura/Settings/ProfilesModel.py
@@ -82,10 +82,18 @@ class ProfilesModel(InstanceContainersModel):
             if quality.getMetaDataEntry("quality_type") not in quality_type_set:
                 result.append(quality)
 
+        # if still profiles are found, add a single empty_quality ("Not supported") instance to the drop down list
+        if len(result) == 0:
+            # If not qualities are found we dynamically create a not supported container for this machine + material combination
+            not_supported_container = ContainerRegistry.getInstance().findContainers(id = "empty_quality")[0]
+            result.append(not_supported_container)
+
         return result
 
     ##  Re-computes the items in this model, and adds the layer height role.
     def _recomputeItems(self):
+
+        # Some globals that we can re-use.
         global_container_stack = Application.getInstance().getGlobalContainerStack()
         if global_container_stack is None:
             return
@@ -134,14 +142,24 @@ class ProfilesModel(InstanceContainersModel):
 
         # Now all the containers are set
         for item in containers:
-            profile = container_registry.findContainers(id=item["id"])
+            profile = container_registry.findContainers(id = item["id"])
+
+            # When for some reason there is no profile container in the registry
             if not profile:
-                self._setItemLayerHeight(item, "", unit)
+                self._setItemLayerHeight(item, "", "")
                 item["available"] = False
                 yield item
                 continue
 
             profile = profile[0]
+
+            # When there is a profile but it's an empty quality should. It's shown in the list (they are "Not Supported" profiles)
+            if profile.getId() == "empty_quality":
+                self._setItemLayerHeight(item, "", "")
+                item["available"] = True
+                yield item
+                continue
+
             item["available"] = profile in qualities
 
             # Easy case: This profile defines its own layer height.
diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py
index 5b1e084262..28d12bf2d5 100755
--- a/plugins/3MFReader/ThreeMFWorkspaceReader.py
+++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py
@@ -21,6 +21,8 @@ from cura.Settings.CuraStackBuilder import CuraStackBuilder
 from cura.Settings.ExtruderManager import ExtruderManager
 from cura.Settings.ExtruderStack import ExtruderStack
 from cura.Settings.GlobalStack import GlobalStack
+from cura.Settings.CuraContainerStack import _ContainerIndexes
+from cura.QualityManager import QualityManager
 
 from configparser import ConfigParser
 import zipfile
@@ -757,13 +759,37 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 self._container_registry.removeContainer(container.getId())
             return
 
+        # Check quality profiles to make sure that if one stack has the "not supported" quality profile,
+        # all others should have the same.
+        #
+        # This block code tries to fix the following problems in Cura 3.0 and earlier:
+        #  1. The upgrade script can rename all "Not Supported" quality profiles to "empty_quality", but it cannot fix
+        #     the problem that the global stack the extruder stacks may have different quality profiles. The code
+        #     below loops over all stacks and make sure that if there is one stack with "Not Supported" profile, the
+        #     rest should also use the "Not Supported" profile.
+        #  2. In earlier versions (at least 2.7 and 3.0), a wrong quality profile could be assigned to a stack. For
+        #     example, a UM3 can have a BB 0.8 variant with "aa04_pla_fast" quality profile enabled. To fix this,
+        #     in the code below we also check the actual available quality profiles for the machine.
+        #
+        has_not_supported = False
+        for stack in [global_stack] + extruder_stacks:
+            if stack.quality.getId() == "empty_quality":
+                has_not_supported = True
+                break
+        if not has_not_supported:
+            available_quality = QualityManager.getInstance().findAllUsableQualitiesForMachineAndExtruders(global_stack, extruder_stacks)
+            has_not_supported = not available_quality
+        if has_not_supported:
+            empty_quality_container = self._container_registry.findInstanceContainers(id = "empty_quality")[0]
+            for stack in [global_stack] + extruder_stacks:
+                stack.replaceContainer(_ContainerIndexes.Quality, empty_quality_container)
+
         #
         # Replacing the old containers if resolve is "new".
         # When resolve is "new", some containers will get renamed, so all the other containers that reference to those
         # MUST get updated too.
         #
         if self._resolve_strategies["machine"] == "new":
-
             # A new machine was made, but it was serialized with the wrong user container. Fix that now.
             for container in user_instance_containers:
                 # replacing the container ID for user instance containers for the extruders
diff --git a/plugins/ChangeLogPlugin/ChangeLog.py b/plugins/ChangeLogPlugin/ChangeLog.py
index 8d1e54f40c..a80779da50 100644
--- a/plugins/ChangeLogPlugin/ChangeLog.py
+++ b/plugins/ChangeLogPlugin/ChangeLog.py
@@ -8,7 +8,6 @@ from UM.Application import Application
 from UM.PluginRegistry import PluginRegistry
 from UM.Version import Version
 
-from PyQt5.QtQuick import QQuickView
 from PyQt5.QtQml import QQmlComponent, QQmlContext
 from PyQt5.QtCore import QUrl, pyqtSlot, QObject
 
diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py
index be76c0724a..d4d6c430a8 100755
--- a/plugins/MachineSettingsAction/MachineSettingsAction.py
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.py
@@ -147,6 +147,7 @@ class MachineSettingsAction(MachineAction):
                 for setting_instance in extruder_user_container.findInstances():
                     setting_key = setting_instance.definition.key
                     settable_per_extruder = self._global_container_stack.getProperty(setting_key, "settable_per_extruder")
+
                     if settable_per_extruder:
                         limit_to_extruder = self._global_container_stack.getProperty(setting_key, "limit_to_extruder")
 
@@ -154,11 +155,16 @@ class MachineSettingsAction(MachineAction):
                             global_user_container.setProperty(setting_key, "value", extruder_user_container.getProperty(setting_key, "value"))
                             extruder_user_container.removeInstance(setting_key)
 
-        # Check to see if any features are set to print with an extruder that will no longer exist
-        for setting_key in ["adhesion_extruder_nr", "support_extruder_nr", "support_extruder_nr_layer_0", "support_infill_extruder_nr", "support_interface_extruder_nr"]:
-            if int(self._global_container_stack.getProperty(setting_key, "value")) > extruder_count - 1:
-                Logger.log("i", "Lowering %s setting to match number of extruders", setting_key)
-                self._global_container_stack.getTop().setProperty(setting_key, "value", extruder_count - 1)
+        # reset all extruder number settings whose value is no longer valid
+        for setting_instance in self._global_container_stack.userChanges.findInstances():
+            setting_key = setting_instance.definition.key
+            if not self._global_container_stack.getProperty(setting_key, "type") in ("extruder", "optional_extruder"):
+                continue
+
+            old_value = int(self._global_container_stack.userChanges.getProperty(setting_key, "value"))
+            if old_value >= extruder_count:
+                self._global_container_stack.userChanges.removeInstance(setting_key)
+                Logger.log("d", "Reset [%s] because its old value [%s] is no longer valid ", setting_key, old_value)
 
         # Check to see if any objects are set to print with an extruder that will no longer exist
         root_node = Application.getInstance().getController().getScene().getRoot()
diff --git a/plugins/UM3NetworkPrinting/UM3InfoComponents.qml b/plugins/UM3NetworkPrinting/UM3InfoComponents.qml
index 8d0d8a0754..d0c95e1524 100644
--- a/plugins/UM3NetworkPrinting/UM3InfoComponents.qml
+++ b/plugins/UM3NetworkPrinting/UM3InfoComponents.qml
@@ -119,11 +119,17 @@ Item
             onClicked: manager.loadConfigurationFromPrinter()
 
             function isClusterPrinter() {
-                var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize
-                // This is a non cluster printer or the cluster it is just one printer
-                if (clusterSize == undefined || clusterSize == 1)
-                    return false
-                return true
+                if(Cura.MachineManager.printerOutputDevices.length == 0)
+                {
+                    return false;
+                }
+                var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize;
+                // This is not a cluster printer or the cluster it is just one printer
+                if(clusterSize == undefined || clusterSize == 1)
+                {
+                    return false;
+                }
+                return true;
             }
         }
     }
diff --git a/plugins/UserAgreementPlugin/UserAgreement.py b/plugins/UserAgreementPlugin/UserAgreement.py
new file mode 100644
index 0000000000..f472b6fb13
--- /dev/null
+++ b/plugins/UserAgreementPlugin/UserAgreement.py
@@ -0,0 +1,53 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from UM.Extension import Extension
+from UM.Preferences import Preferences
+from UM.Application import Application
+from UM.PluginRegistry import PluginRegistry
+from UM.Logger import Logger
+
+from cura.CuraApplication import CuraApplication
+
+from PyQt5.QtQml import QQmlComponent, QQmlContext
+from PyQt5.QtCore import QUrl, QObject, pyqtSlot
+
+import os.path
+
+class UserAgreement(QObject, Extension):
+    def __init__(self, parent = None):
+        super(UserAgreement, self).__init__()
+        self._user_agreement_window = None
+        self._user_agreement_context = None
+        Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
+        Preferences.getInstance().addPreference("general/accepted_user_agreement", False)
+
+    def _onEngineCreated(self):
+        if not Preferences.getInstance().getValue("general/accepted_user_agreement"):
+            self.showUserAgreement()
+
+    def showUserAgreement(self):
+        if not self._user_agreement_window:
+            self.createUserAgreementWindow()
+
+        self._user_agreement_window.show()
+
+    @pyqtSlot(bool)
+    def didAgree(self, userChoice):
+        if userChoice:
+            Logger.log("i", "User agreed to the user agreement")
+            Preferences.getInstance().setValue("general/accepted_user_agreement", True)
+            self._user_agreement_window.hide()
+        else:
+            Logger.log("i", "User did NOT agree to the user agreement")
+            Preferences.getInstance().setValue("general/accepted_user_agreement", False)
+            CuraApplication.getInstance().quit()
+        CuraApplication.getInstance().setNeedToShowUserAgreement(False)
+
+    def createUserAgreementWindow(self):
+        path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "UserAgreement.qml"))
+
+        component = QQmlComponent(Application.getInstance()._engine, path)
+        self._user_agreement_context = QQmlContext(Application.getInstance()._engine.rootContext())
+        self._user_agreement_context.setContextProperty("manager", self)
+        self._user_agreement_window = component.create(self._user_agreement_context)
diff --git a/plugins/UserAgreementPlugin/UserAgreement.qml b/plugins/UserAgreementPlugin/UserAgreement.qml
new file mode 100644
index 0000000000..52d35a4f44
--- /dev/null
+++ b/plugins/UserAgreementPlugin/UserAgreement.qml
@@ -0,0 +1,64 @@
+// Copyright (c) 2017 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.2
+import QtQuick.Controls 1.4
+
+import UM 1.3 as UM
+
+UM.Dialog
+{
+    id: baseDialog
+    minimumWidth: Math.floor(UM.Theme.getSize("modal_window_minimum").width * 0.75)
+    minimumHeight: Math.floor(UM.Theme.getSize("modal_window_minimum").height * 0.5)
+    width: minimumWidth
+    height: minimumHeight
+    title: catalog.i18nc("@title:window", "User Agreement")
+
+    TextArea
+    {
+        anchors.top: parent.top
+        width: parent.width
+        anchors.bottom: buttonRow.top
+        text: ' <center><h3>DISCLAIMER BY ULTIMAKER</h3></center>
+                <p>PLEASE READ THIS DISCLAIMER CAREFULLY.</p>
+                <p>EXCEPT WHEN OTHERWISE STATED IN WRITING, ULTIMAKER PROVIDES ANY ULTIMAKER SOFTWARE OR THIRD PARTY SOFTWARE “AS IS” WITHOUT WARRANTY OF ANY KIND. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF ULTIMAKER SOFTWARE IS WITH YOU.</p>
+                <p>UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, IN NO EVENT WILL ULTIMAKER BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE ANY ULTIMAKER SOFTWARE OR THIRD PARTY SOFTWARE.</p>
+                '
+        readOnly: true;
+        textFormat: TextEdit.RichText
+    }
+
+    Item
+    {
+        id: buttonRow
+        anchors.bottom: parent.bottom
+        width: parent.width
+        anchors.bottomMargin: UM.Theme.getSize("default_margin").height
+
+        UM.I18nCatalog { id: catalog; name:"cura" }
+
+        Button
+        {
+            anchors.right: parent.right
+            text: catalog.i18nc("@action:button", "I understand and agree")
+            onClicked: {
+                manager.didAgree(true)
+            }
+        }
+
+        Button
+        {
+            anchors.left: parent.left
+            text: catalog.i18nc("@action:button", "I don't agree")
+            onClicked: {
+                manager.didAgree(false)
+            }
+        }
+
+    }
+
+    onClosing: {
+        manager.didAgree(false)
+    }
+}
diff --git a/plugins/UserAgreementPlugin/__init__.py b/plugins/UserAgreementPlugin/__init__.py
new file mode 100644
index 0000000000..88cb151f9e
--- /dev/null
+++ b/plugins/UserAgreementPlugin/__init__.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from . import UserAgreement
+
+def getMetaData():
+    return {}
+
+def register(app):
+    return {"extension": UserAgreement.UserAgreement()}
diff --git a/plugins/UserAgreementPlugin/plugin.json b/plugins/UserAgreementPlugin/plugin.json
new file mode 100644
index 0000000000..aa5dbb1258
--- /dev/null
+++ b/plugins/UserAgreementPlugin/plugin.json
@@ -0,0 +1,8 @@
+{
+    "name": "UserAgreement",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Ask the user once if he/she agrees with our license",
+    "api": 4,
+    "i18n-catalog": "cura"
+}
diff --git a/plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py b/plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py
new file mode 100644
index 0000000000..d328b14367
--- /dev/null
+++ b/plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py
@@ -0,0 +1,141 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import configparser #To parse preference files.
+import io #To serialise the preference files afterwards.
+
+from UM.VersionUpgrade import VersionUpgrade #We're inheriting from this.
+
+
+# a list of all legacy "Not Supported" quality profiles
+_OLD_NOT_SUPPORTED_PROFILES = [
+    "um2p_pp_0.25_normal.inst.cfg",
+    "um2p_tpu_0.8_normal.inst.cfg",
+    "um3_bb0.4_ABS_Fast_Print.inst.cfg",
+    "um3_bb0.4_ABS_Superdraft_Print.inst.cfg",
+    "um3_bb0.4_CPEP_Fast_Print.inst.cfg",
+    "um3_bb0.4_CPEP_Superdraft_Print.inst.cfg",
+    "um3_bb0.4_CPE_Fast_Print.inst.cfg",
+    "um3_bb0.4_CPE_Superdraft_Print.inst.cfg",
+    "um3_bb0.4_Nylon_Fast_Print.inst.cfg",
+    "um3_bb0.4_Nylon_Superdraft_Print.inst.cfg",
+    "um3_bb0.4_PC_Fast_Print.inst.cfg",
+    "um3_bb0.4_PLA_Fast_Print.inst.cfg",
+    "um3_bb0.4_PLA_Superdraft_Print.inst.cfg",
+    "um3_bb0.4_PP_Fast_Print.inst.cfg",
+    "um3_bb0.4_PP_Superdraft_Print.inst.cfg",
+    "um3_bb0.4_TPU_Fast_Print.inst.cfg",
+    "um3_bb0.4_TPU_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_ABS_Fast_Print.inst.cfg",
+    "um3_bb0.8_ABS_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_CPEP_Fast_Print.inst.cfg",
+    "um3_bb0.8_CPEP_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_CPE_Fast_Print.inst.cfg",
+    "um3_bb0.8_CPE_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_Nylon_Fast_Print.inst.cfg",
+    "um3_bb0.8_Nylon_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_PC_Fast_Print.inst.cfg",
+    "um3_bb0.8_PC_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_PLA_Fast_Print.inst.cfg",
+    "um3_bb0.8_PLA_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_PP_Fast_Print.inst.cfg",
+    "um3_bb0.8_PP_Superdraft_Print.inst.cfg",
+    "um3_bb0.8_TPU_Fast_print.inst.cfg",
+    "um3_bb0.8_TPU_Superdraft_Print.inst.cfg",
+]
+
+
+class VersionUpgrade30to31(VersionUpgrade):
+    ##  Gets the version number from a CFG file in Uranium's 3.0 format.
+    #
+    #   Since the format may change, this is implemented for the 3.0 format only
+    #   and needs to be included in the version upgrade system rather than
+    #   globally in Uranium.
+    #
+    #   \param serialised The serialised form of a CFG file.
+    #   \return The version number stored in the CFG file.
+    #   \raises ValueError The format of the version number in the file is
+    #   incorrect.
+    #   \raises KeyError The format of the file is incorrect.
+    def getCfgVersion(self, serialised):
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+        format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised.
+        setting_version = int(parser.get("metadata", "setting_version", fallback = 0))
+        return format_version * 1000000 + setting_version
+
+    ##  Upgrades a preferences file from version 3.0 to 3.1.
+    #
+    #   \param serialised The serialised form of a preferences file.
+    #   \param filename The name of the file to upgrade.
+    def upgradePreferences(self, serialised, filename):
+        parser = configparser.ConfigParser(interpolation=None)
+        parser.read_string(serialised)
+
+        # Update version numbers
+        if "general" not in parser:
+            parser["general"] = {}
+        parser["general"]["version"] = "5"
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "4"
+
+        # Re-serialise the file.
+        output = io.StringIO()
+        parser.write(output)
+        return [filename], [output.getvalue()]
+
+    ##  Upgrades the given instance container file from version 3.0 to 3.1.
+    #
+    #   \param serialised The serialised form of the container file.
+    #   \param filename The name of the file to upgrade.
+    def upgradeInstanceContainer(self, serialised, filename):
+        parser = configparser.ConfigParser(interpolation=None)
+        parser.read_string(serialised)
+
+        for each_section in ("general", "metadata"):
+            if not parser.has_section(each_section):
+                parser.add_section(each_section)
+
+        # Update version numbers
+        parser["general"]["version"] = "2"
+        parser["metadata"]["setting_version"] = "4"
+
+        # Re-serialise the file.
+        output = io.StringIO()
+        parser.write(output)
+        return [filename], [output.getvalue()]
+
+
+    ##  Upgrades a container stack from version 3.0 to 3.1.
+    #
+    #   \param serialised The serialised form of a container stack.
+    #   \param filename The name of the file to upgrade.
+    def upgradeStack(self, serialised, filename):
+        parser = configparser.ConfigParser(interpolation=None)
+        parser.read_string(serialised)
+
+        for each_section in ("general", "metadata"):
+            if not parser.has_section(each_section):
+                parser.add_section(each_section)
+
+        # change "not supported" quality profiles to empty because they no longer exist
+        if parser.has_section("containers"):
+            if parser.has_option("containers", "2"):
+                quality_profile_id = parser["containers"]["2"]
+                if quality_profile_id in _OLD_NOT_SUPPORTED_PROFILES:
+                    parser["containers"]["2"] = "empty_quality"
+
+        # Update version numbers
+        if "general" not in parser:
+            parser["general"] = {}
+        parser["general"]["version"] = "3"
+
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "4"
+
+        # Re-serialise the file.
+        output = io.StringIO()
+        parser.write(output)
+        return [filename], [output.getvalue()]
diff --git a/plugins/VersionUpgrade/VersionUpgrade30to31/__init__.py b/plugins/VersionUpgrade/VersionUpgrade30to31/__init__.py
new file mode 100644
index 0000000000..b4b75dddf7
--- /dev/null
+++ b/plugins/VersionUpgrade/VersionUpgrade30to31/__init__.py
@@ -0,0 +1,56 @@
+# Copyright (c) 2017 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from . import VersionUpgrade30to31
+
+upgrade = VersionUpgrade30to31.VersionUpgrade30to31()
+
+def getMetaData():
+    return {
+        "version_upgrade": {
+            # From                    To                       Upgrade function
+            ("preferences", 5000003): ("preferences", 5000004, upgrade.upgradePreferences),
+
+            ("machine_stack", 3000003):     ("machine_stack", 3000004,     upgrade.upgradeStack),
+            ("extruder_train", 3000003):    ("extruder_train", 3000004,    upgrade.upgradeStack),
+
+            ("quality_changes", 2000003):    ("quality_changes", 2000004,    upgrade.upgradeInstanceContainer),
+            ("user", 2000003):               ("user", 2000004,               upgrade.upgradeInstanceContainer),
+            ("quality", 2000003):            ("quality", 2000004,            upgrade.upgradeInstanceContainer),
+            ("definition_changes", 2000003): ("definition_changes", 2000004, upgrade.upgradeInstanceContainer),
+            ("variant", 2000003):            ("variant", 2000004,            upgrade.upgradeInstanceContainer)
+        },
+        "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
+            "machine_stack": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./machine_instances"}
+            },
+            "extruder_train": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./extruders"}
+            },
+            "quality_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
+            },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
+            "variant": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./variants"}
+            }
+        }
+    }
+
+def register(app):
+    return { "version_upgrade": upgrade }
diff --git a/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json
new file mode 100644
index 0000000000..d80b820976
--- /dev/null
+++ b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json
@@ -0,0 +1,8 @@
+ {
+    "name": "Version Upgrade 3.0 to 3.1",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.",
+    "api": 4,
+    "i18n-catalog": "cura"
+}
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
index 86f3c87bb5..51a3c51a8b 100644
--- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py
+++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -35,7 +35,7 @@ class XmlMaterialProfile(InstanceContainer):
     #   \return The corresponding setting_version.
     def xmlVersionToSettingVersion(self, xml_version: str) -> int:
         if xml_version == "1.3":
-            return 3
+            return 4
         return 0 #Older than 1.3.
 
     def getInheritedFiles(self):
diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json
new file mode 100644
index 0000000000..5fc4b46c98
--- /dev/null
+++ b/resources/definitions/builder_premium_large.def.json
@@ -0,0 +1,117 @@
+{
+    "id": "builder_premium_large",
+    "version": 2,
+    "name": "Builder Premium Large",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Builder SZ",
+        "manufacturer": "Builder",
+        "category": "Other",
+        "quality_definition": "builder_premium_small",
+        "file_formats": "text/x-gcode",
+        "platform": "builder_premium_platform.stl",
+        "platform_offset": [-126, -36, 117],
+        "has_machine_quality": true,
+        "preferred_quality": "*Normal*",
+        "machine_extruder_trains":
+        {
+            "0": "builder_premium_large_rear",
+            "1": "builder_premium_large_front"
+        }
+    },
+	
+	
+	
+    "overrides": {
+        "machine_name": { "default_value": "Builder Premium Large" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_width": { "default_value": 215 },
+        "machine_height": { "default_value": 600 },
+        "machine_depth": { "default_value": 205 },
+        "material_diameter": { "default_value": 1.75 },
+
+        "infill_pattern": {"value": "'triangles'" },
+        "infill_before_walls": {"value": false },
+
+        "default_material_print_temperature": { "value": "215" },
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
+        "material_standby_temperature": { "value": "material_print_temperature" },
+		
+        "switch_extruder_retraction_speeds": {"default_value": 15 },
+        "switch_extruder_retraction_speed": {"default_value": 15 },
+        "switch_extruder_prime_speed": {"default_value": 15 },
+        "switch_extruder_retraction_amount": {"value": 1 },
+
+        "speed_travel": { "value": "100" },
+        "speed_layer_0": { "value": "20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": "40" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
+        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
+        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
+        "speed_wall_x": { "value": "speed_wall" },
+
+        "prime_tower_position_x": { "default_value": 175 },
+        "prime_tower_position_y": { "default_value": 178 },
+        "prime_tower_wipe_enabled": { "default_value": false },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "dual_pre_wipe": { "default_value": false },
+		
+        "prime_blob_enable": { "enabled": true },
+		
+        "acceleration_enabled": { "value": "True" },
+        "acceleration_layer_0": { "value": "acceleration_topbottom" },
+        "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_print": { "value": "3000" },
+        "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_support_interface": { "value": "acceleration_topbottom" },
+        "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
+        "acceleration_travel": { "value": "acceleration_print" },
+        "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
+        "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
+		
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "default_value": 10 },
+
+        "jerk_enabled": { "value": "True" },
+        "jerk_layer_0": { "value": "jerk_topbottom" },
+        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_print": { "value": "25" },
+        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_support_interface": { "value": "jerk_topbottom" },
+        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
+        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
+        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
+		
+        "wall_thickness": { "value": "1.2" },
+		
+        "retraction_amount": { "default_value": 3 },
+        "retraction_speed": { "default_value": 15 },
+        "retraction_retract_speed": { "default_value": 15 },
+        "retraction_prime_speed": { "default_value": 15 },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "skin_overlap": { "value": "15" },
+        "adhesion_type": { "default_value": "skirt" },
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+        "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -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": 40 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_acceleration": { "default_value": 1000 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_start_gcode": {
+            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        },
+        "machine_extruder_count": { "default_value": 2 }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json
new file mode 100644
index 0000000000..56dab8f863
--- /dev/null
+++ b/resources/definitions/builder_premium_medium.def.json
@@ -0,0 +1,117 @@
+{
+    "id": "builder_premium_medium",
+    "version": 2,
+    "name": "Builder Premium Medium",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Builder SZ",
+        "manufacturer": "Builder",
+        "category": "Other",
+        "quality_definition": "builder_premium_small",
+        "file_formats": "text/x-gcode",
+        "platform": "builder_premium_platform.stl",
+        "platform_offset": [-126, -36, 117],
+        "has_machine_quality": true,
+        "preferred_quality": "*Normal*",
+        "machine_extruder_trains":
+        {
+            "0": "builder_premium_medium_rear",
+            "1": "builder_premium_medium_front"
+        }
+    },
+	
+	
+	
+    "overrides": {
+        "machine_name": { "default_value": "Builder Premium Medium" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_width": { "default_value": 215 },
+        "machine_height": { "default_value": 400 },
+        "machine_depth": { "default_value": 205 },
+        "material_diameter": { "default_value": 1.75 },
+
+        "infill_pattern": {"value": "'triangles'" },
+        "infill_before_walls": {"value": false },
+
+        "default_material_print_temperature": { "value": "215" },
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
+        "material_standby_temperature": { "value": "material_print_temperature" },
+		
+        "switch_extruder_retraction_speeds": {"default_value": 15 },
+        "switch_extruder_retraction_speed": {"default_value": 15 },
+        "switch_extruder_prime_speed": {"default_value": 15 },
+        "switch_extruder_retraction_amount": {"value": 1 },
+
+        "speed_travel": { "value": "100" },
+        "speed_layer_0": { "value": "20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": "40" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
+        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
+        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
+        "speed_wall_x": { "value": "speed_wall" },
+
+        "prime_tower_position_x": { "default_value": 175 },
+        "prime_tower_position_y": { "default_value": 178 },
+        "prime_tower_wipe_enabled": { "default_value": false },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "dual_pre_wipe": { "default_value": false },
+		
+        "prime_blob_enable": { "enabled": true },
+		
+        "acceleration_enabled": { "value": "True" },
+        "acceleration_layer_0": { "value": "acceleration_topbottom" },
+        "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_print": { "value": "3000" },
+        "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_support_interface": { "value": "acceleration_topbottom" },
+        "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
+        "acceleration_travel": { "value": "acceleration_print" },
+        "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
+        "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
+		
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "default_value": 10 },
+
+        "jerk_enabled": { "value": "True" },
+        "jerk_layer_0": { "value": "jerk_topbottom" },
+        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_print": { "value": "25" },
+        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_support_interface": { "value": "jerk_topbottom" },
+        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
+        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
+        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
+		
+        "wall_thickness": { "value": "1.2" },
+		
+        "retraction_amount": { "default_value": 3 },
+        "retraction_speed": { "default_value": 15 },
+        "retraction_retract_speed": { "default_value": 15 },
+        "retraction_prime_speed": { "default_value": 15 },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "skin_overlap": { "value": "15" },
+        "adhesion_type": { "default_value": "skirt" },
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+        "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -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": 40 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_acceleration": { "default_value": 1000 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_start_gcode": {
+            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        },
+        "machine_extruder_count": { "default_value": 2 }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json
new file mode 100644
index 0000000000..65103ce1af
--- /dev/null
+++ b/resources/definitions/builder_premium_small.def.json
@@ -0,0 +1,116 @@
+{
+    "id": "builder_premium_small",
+    "version": 2,
+    "name": "Builder Premium Small",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Builder SZ",
+        "manufacturer": "Builder",
+        "category": "Other",
+        "file_formats": "text/x-gcode",
+        "platform": "builder_premium_platform.stl",
+        "platform_offset": [-126, -36, 117],
+        "has_machine_quality": true,
+        "preferred_quality": "*Normal*",
+        "machine_extruder_trains":
+        {
+            "0": "builder_premium_small_rear",
+            "1": "builder_premium_small_front"
+        }
+    },
+	
+	
+	
+    "overrides": {
+        "machine_name": { "default_value": "Builder Premium Small" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_width": { "default_value": 215 },
+        "machine_height": { "default_value": 200 },
+        "machine_depth": { "default_value": 205 },
+        "material_diameter": { "default_value": 1.75 },
+
+        "infill_pattern": {"value": "'triangles'" },
+        "infill_before_walls": {"value": false },
+
+        "default_material_print_temperature": { "value": "215" },
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
+        "material_standby_temperature": { "value": "material_print_temperature" },
+		
+        "switch_extruder_retraction_speeds": {"default_value": 15 },
+        "switch_extruder_retraction_speed": {"default_value": 15 },
+        "switch_extruder_prime_speed": {"default_value": 15 },
+        "switch_extruder_retraction_amount": {"value": 1 },
+
+        "speed_travel": { "value": "100" },
+        "speed_layer_0": { "value": "20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": "40" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
+        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
+        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
+        "speed_wall_x": { "value": "speed_wall" },
+
+        "prime_tower_position_x": { "default_value": 175 },
+        "prime_tower_position_y": { "default_value": 178 },
+        "prime_tower_wipe_enabled": { "default_value": false },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "dual_pre_wipe": { "default_value": false },
+		
+        "prime_blob_enable": { "enabled": true },
+		
+        "acceleration_enabled": { "value": "True" },
+        "acceleration_layer_0": { "value": "acceleration_topbottom" },
+        "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_print": { "value": "3000" },
+        "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_support_interface": { "value": "acceleration_topbottom" },
+        "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
+        "acceleration_travel": { "value": "acceleration_print" },
+        "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
+        "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
+		
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "default_value": 10 },
+
+        "jerk_enabled": { "value": "True" },
+        "jerk_layer_0": { "value": "jerk_topbottom" },
+        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_print": { "value": "25" },
+        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_support_interface": { "value": "jerk_topbottom" },
+        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
+        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
+        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
+		
+        "wall_thickness": { "value": "1.2" },
+		
+        "retraction_amount": { "default_value": 3 },
+        "retraction_speed": { "default_value": 15 },
+        "retraction_retract_speed": { "default_value": 15 },
+        "retraction_prime_speed": { "default_value": 15 },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "skin_overlap": { "value": "15" },
+        "adhesion_type": { "default_value": "skirt" },
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+        "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -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": 40 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_acceleration": { "default_value": 1000 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_start_gcode": {
+            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        },
+        "machine_extruder_count": { "default_value": 2 }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json
index ef3ef8159e..c8c2cc1363 100644
--- a/resources/definitions/prusa_i3_mk2.def.json
+++ b/resources/definitions/prusa_i3_mk2.def.json
@@ -5,7 +5,7 @@
     "inherits": "fdmprinter",
     "metadata": {
         "visible": true,
-        "author": "Apsu",
+        "author": "Apsu, Nounours2099",
         "manufacturer": "Prusa Research",
         "file_formats": "text/x-gcode",
         "icon": "icon_ultimaker2",
@@ -41,7 +41,7 @@
         "machine_max_jerk_e": { "default_value": 2.5 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_start_gcode": {
-            "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature} ; set extruder temp\nM140 S{material_bed_temperature} ; set bed temp\nM190 S{material_bed_temperature} ; wait for bed temp\nM109 S{material_print_temperature} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position"
+            "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position"
         },
         "machine_end_gcode": {
             "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors"
diff --git a/resources/extruders/builder_premium_large_front.def.json b/resources/extruders/builder_premium_large_front.def.json
new file mode 100644
index 0000000000..159682dc1c
--- /dev/null
+++ b/resources/extruders/builder_premium_large_front.def.json
@@ -0,0 +1,27 @@
+{
+    "id": "builder_premium_large_front",
+    "version": 2,
+    "name": "Front Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "builder_premium_large",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+		
+	    "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+		"extruder_prime_pos_abs": { "default_value": true }
+    }
+}
diff --git a/resources/extruders/builder_premium_large_rear.def.json b/resources/extruders/builder_premium_large_rear.def.json
new file mode 100644
index 0000000000..5e9cc062ae
--- /dev/null
+++ b/resources/extruders/builder_premium_large_rear.def.json
@@ -0,0 +1,27 @@
+{
+    "id": "builder_premium_large_rear",
+    "version": 2,
+    "name": "Rear Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "builder_premium_large",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+	    "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+		"extruder_prime_pos_abs": { "default_value": true }
+    }
+}
diff --git a/resources/extruders/builder_premium_medium_front.def.json b/resources/extruders/builder_premium_medium_front.def.json
new file mode 100644
index 0000000000..9a330b4f4b
--- /dev/null
+++ b/resources/extruders/builder_premium_medium_front.def.json
@@ -0,0 +1,27 @@
+{
+    "id": "builder_premium_medium_front",
+    "version": 2,
+    "name": "Front Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "builder_premium_medium",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+		
+	    "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+		"extruder_prime_pos_abs": { "default_value": true }
+    }
+}
diff --git a/resources/extruders/builder_premium_medium_rear.def.json b/resources/extruders/builder_premium_medium_rear.def.json
new file mode 100644
index 0000000000..49d4734306
--- /dev/null
+++ b/resources/extruders/builder_premium_medium_rear.def.json
@@ -0,0 +1,27 @@
+{
+    "id": "builder_premium_medium_rear",
+    "version": 2,
+    "name": "Rear Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "builder_premium_medium",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+	    "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+		"extruder_prime_pos_abs": { "default_value": true }
+    }
+}
diff --git a/resources/extruders/builder_premium_small_front.def.json b/resources/extruders/builder_premium_small_front.def.json
new file mode 100644
index 0000000000..2e6293d153
--- /dev/null
+++ b/resources/extruders/builder_premium_small_front.def.json
@@ -0,0 +1,27 @@
+{
+    "id": "builder_premium_small_front",
+    "version": 2,
+    "name": "Front Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "builder_premium_small",
+        "position": "1"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+		
+	    "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+        "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+		"extruder_prime_pos_abs": { "default_value": true }
+    }
+}
diff --git a/resources/extruders/builder_premium_small_rear.def.json b/resources/extruders/builder_premium_small_rear.def.json
new file mode 100644
index 0000000000..d1606cdd79
--- /dev/null
+++ b/resources/extruders/builder_premium_small_rear.def.json
@@ -0,0 +1,27 @@
+{
+    "id": "builder_premium_small_rear",
+    "version": 2,
+    "name": "Rear Extruder",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "builder_premium_small",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
+
+        "machine_extruder_start_pos_abs": { "default_value": true },
+        "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
+	    "machine_extruder_end_pos_abs": { "default_value": true },
+        "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
+        "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" },
+		"extruder_prime_pos_abs": { "default_value": true }
+    }
+}
diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot
index fb4b9ed0d6..99ccd7a459 100644
--- a/resources/i18n/cura.pot
+++ b/resources/i18n/cura.pot
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#Manually added for plugins/UserAgreementPlugin/UserAgreement.qml
+msgctxt "@title:window"
+msgid "User Agreement"
+msgstr ""
+
+#Manually added for plugins/UserAgreementPlugin/UserAgreement.qml
+msgctxt "@action:button"
+msgid "I understand and agree"
+msgstr ""
+
+#Manually added for plugins/UserAgreementPlugin/UserAgreement.qml
+msgctxt "@action:button"
+msgid "I don't agree"
+msgstr ""
+
 #: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
 msgctxt "@label:status"
 msgid "Print aborted"
diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po
index 6bb71a5ae0..179994a4a6 100644
--- a/resources/i18n/de_DE/cura.po
+++ b/resources/i18n/de_DE/cura.po
@@ -2519,7 +2519,7 @@ msgstr "Sichtbarkeit einstellen"
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:44
 msgctxt "@label:textbox"
 msgid "Check all"
-msgstr "Alle prüfen"
+msgstr "Alles wählen"
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:40
 msgctxt "@info:status"
diff --git a/resources/meshes/builder_premium_platform.stl b/resources/meshes/builder_premium_platform.stl
new file mode 100644
index 0000000000..b315d4b6d4
Binary files /dev/null and b/resources/meshes/builder_premium_platform.stl differ
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 325902e1be..fb2bd3bff2 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -894,6 +894,11 @@ UM.MainWindow
             if(!base.visible)
             {
                 base.visible = true;
+            }
+
+            // check later if the user agreement dialog has been closed
+            if (CuraApplication.needToShowUserAgreement)
+            {
                 restart();
             }
             else if(Cura.MachineManager.activeMachineId == null || Cura.MachineManager.activeMachineId == "")
diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
index 1feb351bb1..a6666b67f4 100644
--- a/resources/qml/Menus/MaterialMenu.qml
+++ b/resources/qml/Menus/MaterialMenu.qml
@@ -16,11 +16,17 @@ Menu
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
     property bool isClusterPrinter:
     {
-        var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize
-        // This is a non cluster printer or the cluster it is just one printer
-        if (clusterSize == undefined || clusterSize == 1)
-            return false
-        return true
+        if(Cura.MachineManager.printerOutputDevices.length == 0)
+        {
+            return false;
+        }
+        var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize;
+        // This is not a cluster printer or the cluster it is just one printer
+        if(clusterSize == undefined || clusterSize == 1)
+        {
+            return false;
+        }
+        return true;
     }
 
     UM.SettingPropertyProvider
diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml
index 9dead66499..f70e639872 100644
--- a/resources/qml/Menus/NozzleMenu.qml
+++ b/resources/qml/Menus/NozzleMenu.qml
@@ -16,11 +16,17 @@ Menu
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
     property bool isClusterPrinter:
     {
-        var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize
-        // This is a non cluster printer or the cluster it is just one printer
-        if (clusterSize == undefined || clusterSize == 1)
-            return false
-        return true
+        if(Cura.MachineManager.printerOutputDevices.length == 0)
+        {
+            return false;
+        }
+        var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize;
+        // This is not a cluster printer or the cluster it is just one printer
+        if(clusterSize == undefined || clusterSize == 1)
+        {
+            return false;
+        }
+        return true;
     }
 
     MenuItem
diff --git a/resources/qml/Menus/ProfileMenu.qml b/resources/qml/Menus/ProfileMenu.qml
index 17eb7cfb1d..fecea5ef99 100644
--- a/resources/qml/Menus/ProfileMenu.qml
+++ b/resources/qml/Menus/ProfileMenu.qml
@@ -17,9 +17,9 @@ Menu
 
         MenuItem
         {
-            text: model.name + " - " + model.layer_height
+            text: (model.layer_height != "") ? model.name + " - " + model.layer_height : model.name
             checkable: true
-            checked: Cura.MachineManager.activeQualityChangesId == "" && Cura.MachineManager.activeQualityType == model.metadata.quality_type
+            checked: Cura.MachineManager.activeQualityId == model.id
             exclusiveGroup: group
             onTriggered: Cura.MachineManager.setActiveQuality(model.id)
             visible: model.available
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 93bb52de79..d1c8ae2c51 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -51,27 +51,34 @@ Item
         {
             id: globalProfileSelection
 
-            text: {
-                var result = Cura.MachineManager.activeQualityName;
-                if (Cura.MachineManager.activeQualityLayerHeight > 0) {
-                    result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">";
-                    result += " - ";
-                    result += Cura.MachineManager.activeQualityLayerHeight + "mm";
-                    result += "</font>";
-                }
-                return result;
-            }
+            text: generateActiveQualityText()
             enabled: !header.currentExtruderVisible || header.currentExtruderIndex > -1
-
             width: Math.floor(parent.width * 0.55)
             height: UM.Theme.getSize("setting_control").height
             anchors.left: globalProfileLabel.right
             anchors.right: parent.right
             tooltip: Cura.MachineManager.activeQualityName
             style: UM.Theme.styles.sidebar_header_button
-            activeFocusOnPress: true;
+            activeFocusOnPress: true
             menu: ProfileMenu { }
 
+            function generateActiveQualityText () {
+                var result = catalog.i18nc("@", "No Profile Available") // default text
+
+                if (Cura.MachineManager.isActiveQualitySupported ) {
+                    result = Cura.MachineManager.activeQualityName
+
+                    if (Cura.MachineManager.activeQualityLayerHeight > 0) {
+                        result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
+                        result += " - "
+                        result += Cura.MachineManager.activeQualityLayerHeight + "mm"
+                        result += "</font>"
+                    }
+                }
+
+                return result
+            }
+
             UM.SimpleButton
             {
                 id: customisedSettings
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 2ea5b0b3d2..8bba4cf6fd 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -245,35 +245,29 @@ Column
             color: UM.Theme.getColor("text");
         }
 
-        ToolButton {
+        ToolButton
+        {
             id: materialSelection
+
             text: Cura.MachineManager.activeMaterialName
             tooltip: Cura.MachineManager.activeMaterialName
             visible: Cura.MachineManager.hasMaterials
-            property var valueError:
-            {
-                var data = Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeMaterialId, "compatible")
-                if(data == "False")
-                {
-                    return true
-                }
-                else
-                {
-                    return false
-                }
-
-            }
-            property var valueWarning: ! Cura.MachineManager.isActiveQualitySupported
-
             enabled: !extrudersList.visible || base.currentExtruderIndex  > -1
-
             height: UM.Theme.getSize("setting_control").height
             width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
             anchors.right: parent.right
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
+            menu: MaterialMenu {
+                extruderIndex: base.currentExtruderIndex
+            }
 
-            menu: MaterialMenu { extruderIndex: base.currentExtruderIndex }
+            property var valueError: !isMaterialSupported()
+            property var valueWarning: ! Cura.MachineManager.isActiveQualitySupported
+
+            function isMaterialSupported () {
+                return Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeMaterialId, "compatible") == "True"
+            }
         }
     }
 
diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
index 6be4578649..32550d86a5 100644
--- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
+++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = -1
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg
index d3df991d53..2007785719 100644
--- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg
+++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.1
diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
index 326e35e251..dba0a0460f 100644
--- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
+++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg
index 140a59db3b..11892a6223 100644
--- a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg
+++ b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = -1
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg
index dfa265d360..852efe699e 100644
--- a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg
+++ b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.1
diff --git a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg
index 81fbf2a42d..244d544c80 100644
--- a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg
+++ b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg
index b8d8f019cd..a2d802a3ba 100644
--- a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg
+++ b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = -1
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/abax_titan/atitan_pla_high.inst.cfg b/resources/quality/abax_titan/atitan_pla_high.inst.cfg
index 2cffe3ce8a..7ee8c35133 100644
--- a/resources/quality/abax_titan/atitan_pla_high.inst.cfg
+++ b/resources/quality/abax_titan/atitan_pla_high.inst.cfg
@@ -7,7 +7,7 @@ type = quality
 material = generic_pla
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.1
diff --git a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg
index f1b6237e07..6c40914566 100644
--- a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg
+++ b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg
new file mode 100644
index 0000000000..3454f8b3ad
--- /dev/null
+++ b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg
@@ -0,0 +1,25 @@
+[general]
+version = 2
+name = Coarse
+definition = builder_premium_small
+
+[metadata]
+type = quality
+quality_type = coarse
+material = generic_pla_175
+setting_version = 4
+weight = -1
+global_quality = True
+
+[values]
+material_print_temperature = =default_material_print_temperature + 15
+material_standby_temperature = =material_print_temperature
+material_initial_print_temperature= =material_print_temperature
+material_final_print_temperature= =material_print_temperature
+material_bed_temperature = 45
+material_bed_temperature_layer_0= =material_bed_temperature
+layer_height = 0.3
+top_thickness = =layer_height * 5
+bottom_thickness = =layer_height * 3
+speed_print = 60
+
diff --git a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg
new file mode 100644
index 0000000000..b5ac4cb6a1
--- /dev/null
+++ b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg
@@ -0,0 +1,26 @@
+[general]
+version = 2
+name = High Quality
+definition = builder_premium_small
+
+[metadata]
+type = quality
+quality_type = high
+material = generic_pla_175
+setting_version = 4
+weight = 1
+global_quality = True
+
+[values]
+acceleration_print = 2000
+material_print_temperature = =default_material_print_temperature + 15
+material_standby_temperature = =material_print_temperature
+material_initial_print_temperature= =material_print_temperature
+material_final_print_temperature= =material_print_temperature
+material_bed_temperature = 45
+material_bed_temperature_layer_0= =material_bed_temperature
+layer_height = 0.1
+top_thickness = =layer_height * 7
+bottom_thickness = =layer_height * 5
+speed_print = 40
+layer_height_0 = 0.2
\ No newline at end of file
diff --git a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg
new file mode 100644
index 0000000000..c5a93e65c1
--- /dev/null
+++ b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg
@@ -0,0 +1,24 @@
+[general]
+version = 2
+name = Normal
+definition = builder_premium_small
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_pla_175
+setting_version = 4
+weight = 0
+global_quality = True
+
+[values]
+material_print_temperature = =default_material_print_temperature + 15
+material_standby_temperature = =material_print_temperature
+material_initial_print_temperature= =material_print_temperature
+material_final_print_temperature= =material_print_temperature
+material_bed_temperature = 45
+material_bed_temperature_layer_0= =material_bed_temperature
+layer_height = 0.2
+top_thickness = =layer_height * 5
+bottom_thickness = =layer_height * 3
+speed_print = 50
\ No newline at end of file
diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg
index 3abcc16f39..418855a9ba 100644
--- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_abs_175_cartesio_0.25_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg
index a47fc2b8bf..e95ef08e22 100644
--- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_abs_175_cartesio_0.25_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg
index c37b5c677c..524f5ba12a 100644
--- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_abs_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg
index ec0fdfa07b..24ffb19d6f 100644
--- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_abs_175_cartesio_0.4_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg
index 211e78357b..1281a3afdd 100644
--- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 material = generic_abs_175_cartesio_0.8_mm
 weight = 3
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg
index 319c0748af..a8d19deef7 100644
--- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 material = generic_abs_175_cartesio_0.8_mm
 weight = 4
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg
index fc3b1e49f0..87cc855f44 100644
--- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_abs_175_cartesio_0.8_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg
index 0c453ed6b0..4ca2598051 100644
--- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg
+++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_abs_175_cartesio_0.8_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg
index 4052520597..42eb705f11 100644
--- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg
+++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = dsm_arnitel2045_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg
index a8a5e22a3b..538fe91b76 100644
--- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg
+++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = dsm_arnitel2045_175_cartesio_0.4_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg
index 29c99bda49..11760b139f 100644
--- a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg
+++ b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 global_quality = True
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.4
diff --git a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg
index e5cb9712d2..c654dba598 100644
--- a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg
+++ b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 global_quality = True
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.6
diff --git a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg
index 16570b97bf..393a5f3b39 100644
--- a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg
+++ b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 global_quality = True
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.1
diff --git a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg
index 182ae137e7..c09493ba10 100644
--- a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg
+++ b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 global_quality = True
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg
index 1a51725339..eae4e82cd3 100644
--- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_hips_175_cartesio_0.25_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg
index fa845592fa..0c47b18196 100644
--- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_hips_175_cartesio_0.25_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg
index 56b5e7ef38..14f1ea4662 100644
--- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_hips_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg
index cad4b5255f..bd13b358ff 100644
--- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_hips_175_cartesio_0.4_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg
index b52f4df1fa..ca864692c3 100644
--- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 material = generic_hips_175_cartesio_0.8_mm
 weight = 3
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg
index 7eba4c99c4..3cadef4fdd 100644
--- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 material = generic_hips_175_cartesio_0.8_mm
 weight = 4
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg
index 06ddcc0959..07839c8a9a 100644
--- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_hips_175_cartesio_0.8_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg
index 534d63115b..acc9db0891 100644
--- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg
+++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_hips_175_cartesio_0.8_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg
index ba2c95043c..b1f2f17d41 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_nylon_175_cartesio_0.25_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg
index fb9393577f..bcfa1c2e30 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_nylon_175_cartesio_0.25_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg
index 92c00bc5df..2cd50efeb2 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_nylon_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg
index 389a01fcb4..7a7d767ea3 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_nylon_175_cartesio_0.4_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg
index f8ed2fbf41..5684c89e23 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 material = generic_nylon_175_cartesio_0.8_mm
 weight = 3
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg
index 607069e4db..8d97e9ac5f 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 material = generic_nylon_175_cartesio_0.8_mm
 weight = 4
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg
index 3c1bbffa83..946f8de34d 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_nylon_175_cartesio_0.8_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg
index e964ab95b2..80f390c254 100644
--- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg
+++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_nylon_175_cartesio_0.8_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg
index 86f2dbf91f..2f401556d4 100644
--- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pc_175_cartesio_0.25_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg
index f24f3caed0..225b0ec5cf 100644
--- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pc_175_cartesio_0.25_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg
index 3d44cfd39f..53e61a81a2 100644
--- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pc_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg
index fe873f537a..e7b179dfe1 100644
--- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pc_175_cartesio_0.4_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg
index 4e802a4e9b..baa3a1fdce 100644
--- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 material = generic_pc_175_cartesio_0.8_mm
 weight = 3
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg
index 21153fce38..81f939f800 100644
--- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 material = generic_pc_175_cartesio_0.8_mm
 weight = 4
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg
index a8cc757fbb..41b2cc70f0 100644
--- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pc_175_cartesio_0.8_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg
index 9574471b1c..e5ae6aff1d 100644
--- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg
+++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pc_175_cartesio_0.8_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg
index 2efa3ca0da..c5c4be6f4a 100644
--- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_petg_175_cartesio_0.25_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg
index 377520f471..6d12bdc402 100644
--- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_petg_175_cartesio_0.25_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg
index c31c18b192..43dda5007c 100644
--- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_petg_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg
index 1bf8c4a4d6..094dc33263 100644
--- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_petg_175_cartesio_0.4_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg
index 599ba08eaa..da9e4ad3dd 100644
--- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 material = generic_petg_175_cartesio_0.8_mm
 weight = 3
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg
index 2f1a138115..607ba778a1 100644
--- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 material = generic_petg_175_cartesio_0.8_mm
 weight = 4
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg
index 1a804307c9..3010d95dab 100644
--- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_petg_175_cartesio_0.8_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg
index 6eca142191..fbf8fac67f 100644
--- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg
+++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_petg_175_cartesio_0.8_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg
index 9cfa09aee7..9d8130602e 100644
--- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pla_175_cartesio_0.25_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg
index 359ca15f96..98401dbf42 100644
--- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pla_175_cartesio_0.25_mm
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg
index 3d97fdbae8..2eda5103d7 100644
--- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pla_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg
index fef8bb53d3..f3d3820ff7 100644
--- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pla_175_cartesio_0.4_mm
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg
index 06cd974d26..d2cf708336 100644
--- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 material = generic_pla_175_cartesio_0.8_mm
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg
index d161befcc1..888d8f91a7 100644
--- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 material = generic_pla_175_cartesio_0.8_mm
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg
index b017fb9d5d..558514db98 100644
--- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pla_175_cartesio_0.8_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg
index 6075c2651f..9c508e4a1f 100644
--- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg
+++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pla_175_cartesio_0.8_mm
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg
index bd170cfccc..fcbf4913de 100644
--- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pva_175_cartesio_0.25_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg
index 23ba53078b..3893421df0 100644
--- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pva_175_cartesio_0.25_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.3
diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg
index de12e2987d..5876db1e2e 100644
--- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pva_175_cartesio_0.4_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg
index 3418cce66c..c977e79a5c 100644
--- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pva_175_cartesio_0.4_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.5
diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg
index 17c9f81d2d..8c36d8e7ed 100644
--- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 material = generic_pva_175_cartesio_0.8_mm
 weight = 3
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg
index ffd4e34204..c2b19868f6 100644
--- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = extra coarse
 material = generic_pva_175_cartesio_0.8_mm
 weight = 4
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg
index bd32e91b20..5bd285285a 100644
--- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pva_175_cartesio_0.8_mm
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg
index 6d309464a6..a11bff95e1 100644
--- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg
+++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pva_175_cartesio_0.8_mm
 weight = 2
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_line_width = 0.9
diff --git a/resources/quality/coarse.inst.cfg b/resources/quality/coarse.inst.cfg
index 3f197bb50c..133ffc8951 100644
--- a/resources/quality/coarse.inst.cfg
+++ b/resources/quality/coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = coarse
 global_quality = True
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.4
diff --git a/resources/quality/draft.inst.cfg b/resources/quality/draft.inst.cfg
index 00932feb68..a155c8f2e1 100644
--- a/resources/quality/draft.inst.cfg
+++ b/resources/quality/draft.inst.cfg
@@ -9,7 +9,7 @@ type = quality
 quality_type = draft
 global_quality = True
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/extra_coarse.inst.cfg b/resources/quality/extra_coarse.inst.cfg
index 183fa825e8..ce28e54721 100644
--- a/resources/quality/extra_coarse.inst.cfg
+++ b/resources/quality/extra_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = Extra coarse
 global_quality = True
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.6
diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg
index d38323a180..245997a27e 100644
--- a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg
@@ -5,7 +5,7 @@ name = Fast Quality
 
 [metadata]
 type = quality
-setting_version = 3
+setting_version = 4
 material = fabtotum_abs
 quality_type = fast
 weight = -1
diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg
index 5333512e4c..26300eec7d 100644
--- a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg
@@ -5,7 +5,7 @@ name = High Quality
 
 [metadata]
 type = quality
-setting_version = 3
+setting_version = 4
 material = fabtotum_abs
 quality_type = high
 weight = 1
diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg
index fd0fca7887..53d20c8cbc 100644
--- a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg
@@ -5,7 +5,7 @@ name = Normal Quality
 
 [metadata]
 type = quality
-setting_version = 3
+setting_version = 4
 material = fabtotum_abs
 quality_type = normal
 weight = 0
diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg
index 1c9e384e77..22bbcbeaeb 100644
--- a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = fabtotum_nylon
 quality_type = fast
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg
index cffa1f0e86..a625bd715f 100644
--- a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = fabtotum_nylon
 quality_type = high
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg
index c2bec3396e..b05d30c5c6 100644
--- a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = fabtotum_nylon
 quality_type = normal
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg
index 4adda21b5a..1f1c93961b 100644
--- a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg
@@ -5,7 +5,7 @@ name = Fast Quality
 
 [metadata]
 type = quality
-setting_version = 3
+setting_version = 4
 material = fabtotum_pla
 quality_type = fast
 weight = -1
diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg
index e3aed0ab0e..9cd067703c 100644
--- a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg
@@ -5,7 +5,7 @@ name = High Quality
 
 [metadata]
 type = quality
-setting_version = 3
+setting_version = 4
 material = fabtotum_pla
 quality_type = high
 weight = 1
diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg
index 81a75283a5..5b5125c4e5 100644
--- a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg
+++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg
@@ -5,7 +5,7 @@ name = Normal Quality
 
 [metadata]
 type = quality
-setting_version = 3
+setting_version = 4
 material = fabtotum_pla
 quality_type = normal
 weight = 0
diff --git a/resources/quality/high.inst.cfg b/resources/quality/high.inst.cfg
index 846dc58827..d4333c90da 100644
--- a/resources/quality/high.inst.cfg
+++ b/resources/quality/high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 global_quality = True
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.06
diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse.inst.cfg
index ad22aacc18..e36286c6ae 100644
--- a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_petg_imade3d_jellybox_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse_2-fans.inst.cfg
index 35268229b3..3240bad98b 100644
--- a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse_2-fans.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse_2-fans.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_petg_imade3d_jellybox_0.4_mm_2-fans
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_medium.inst.cfg
index ca5f8b5a28..2790a5a742 100644
--- a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_petg_0.4_medium.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_petg_imade3d_jellybox_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_medium_2-fans.inst.cfg
index a2b540dc7f..14f141f0bf 100644
--- a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium_2-fans.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_petg_0.4_medium_2-fans.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_petg_imade3d_jellybox_0.4_mm_2-fans
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse.inst.cfg
index b3472a0cf5..842ec618e0 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse_2-fans.inst.cfg
index c7dd462a74..17e085d84d 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse_2-fans.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse_2-fans.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_fine.inst.cfg
index 7035deab6e..a4b44f47f6 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_fine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_fine_2-fans.inst.cfg
index 73e33a74fb..962b3c9ad4 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine_2-fans.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_fine_2-fans.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_medium.inst.cfg
index 8a14eab5c6..952b16ecf8 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_medium.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_medium_2-fans.inst.cfg
index 64917bc37d..bd70d105a4 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium_2-fans.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_medium_2-fans.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine.inst.cfg
index 15be25bb1b..a9d0679612 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm
 weight = 2
 quality_type = ultrahigh
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine_2-fans.inst.cfg
index b4f0db9cb6..097e1fc76a 100644
--- a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine_2-fans.inst.cfg
+++ b/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine_2-fans.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
 weight = 2
 quality_type = ultrahigh
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = skirt
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 5d3bf86b90..5401ec7bd6 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.35
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 e29c38f225..aea8fc9535 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.06
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 552ad8901e..24adbd9f6c 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.1
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 a63f9065ef..98d2475633 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
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 1449961b6c..ab2e9dabbc 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.15
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 2b3e64c67b..f868ab40fc 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 = 3
+setting_version = 4
 
 [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 2c14044484..e907f7ccaf 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.06
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 48617d23df..841023d532 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 = 3
+setting_version = 4
 
 [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 724c52b40d..ca874c6bce 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 = 3
+setting_version = 4
 
 [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 7c6f7d5e05..fcfbe72b24 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 = 3
+setting_version = 4
 
 [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 105cf0b199..009af9b87b 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 = 3
+setting_version = 4
 
 [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 35aef2e19e..447e3b012d 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.06
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 06ec265152..80b2375108 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 = 3
+setting_version = 4
 
 [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 db47c47fc4..e30c52f4e6 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 = 3
+setting_version = 4
 
 [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 1ad63191a4..31bdaa51bc 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 = 3
+setting_version = 4
 
 [values]
 layer_height = 0.15
diff --git a/resources/quality/low.inst.cfg b/resources/quality/low.inst.cfg
index 21e4d0d404..e92490722d 100644
--- a/resources/quality/low.inst.cfg
+++ b/resources/quality/low.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = low
 global_quality = True
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_sparse_density = 10
diff --git a/resources/quality/normal.inst.cfg b/resources/quality/normal.inst.cfg
index acbdf1033e..9fb7b238cd 100644
--- a/resources/quality/normal.inst.cfg
+++ b/resources/quality/normal.inst.cfg
@@ -8,6 +8,6 @@ type = quality
 quality_type = normal
 global_quality = True
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
index deefea63dd..ae8a377116 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg
@@ -7,7 +7,7 @@ definition = peopoly_moai
 type = quality
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_sparse_density = 70
diff --git a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
index f9ed09afca..07ab7e364b 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg
@@ -7,7 +7,7 @@ definition = peopoly_moai
 type = quality
 weight = 2
 quality_type = extra_high
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_sparse_density = 70
diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
index 7cbd9a84fe..e0d2f7d818 100644
--- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
+++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg
@@ -7,7 +7,7 @@ definition = peopoly_moai
 type = quality
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_sparse_density = 70
diff --git a/resources/quality/ultimaker2/um2_draft.inst.cfg b/resources/quality/ultimaker2/um2_draft.inst.cfg
index 11bdf03e92..4fe3f51e20 100644
--- a/resources/quality/ultimaker2/um2_draft.inst.cfg
+++ b/resources/quality/ultimaker2/um2_draft.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker2
 type = quality
 quality_type = draft
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/ultimaker2/um2_high.inst.cfg b/resources/quality/ultimaker2/um2_high.inst.cfg
index 63b820479a..96941beed2 100644
--- a/resources/quality/ultimaker2/um2_high.inst.cfg
+++ b/resources/quality/ultimaker2/um2_high.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker2
 type = quality
 quality_type = high
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.06
diff --git a/resources/quality/ultimaker2/um2_low.inst.cfg b/resources/quality/ultimaker2/um2_low.inst.cfg
index bb8ef2fa87..832962984c 100644
--- a/resources/quality/ultimaker2/um2_low.inst.cfg
+++ b/resources/quality/ultimaker2/um2_low.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker2
 type = quality
 quality_type = low
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 infill_sparse_density = 10
diff --git a/resources/quality/ultimaker2/um2_normal.inst.cfg b/resources/quality/ultimaker2/um2_normal.inst.cfg
index 0673ba9eb4..ea804feb80 100644
--- a/resources/quality/ultimaker2/um2_normal.inst.cfg
+++ b/resources/quality/ultimaker2/um2_normal.inst.cfg
@@ -7,6 +7,6 @@ definition = ultimaker2
 type = quality
 quality_type = normal
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
index ba94d1a008..638a1a9384 100644
--- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_ultimaker2_plus_0.25_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_layer_time = 5
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
index fa91cb12e5..9f4dfc0b5d 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_ultimaker2_plus_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_layer_time = 5
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
index 97253fb753..7bf51b0211 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_ultimaker2_plus_0.4_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_layer_time = 5
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
index 2b63b8e8be..3c6f40e0bc 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pla_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_layer_time = 5
diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
index 6d4dc257bf..ef79e30b74 100644
--- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
@@ -8,7 +8,7 @@ material = generic_pla_ultimaker2_plus_0.6_mm
 type = quality
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_layer_time = 5
diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
index 88d95ebc3f..42418ea392 100644
--- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
@@ -8,7 +8,7 @@ material = generic_pla_ultimaker2_plus_0.8_mm
 type = quality
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_layer_time = 5
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
index e2b7f34549..50a4076de2 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_abs_ultimaker2_plus_0.25_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
index aa4918b0c7..9d1bcf6ff5 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_abs_ultimaker2_plus_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
index 0c8b8233fb..84a5557434 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_abs_ultimaker2_plus_0.4_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
index de5ddb9726..efc749ad8c 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_abs_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
index bff307740a..eb706c5762 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_abs_ultimaker2_plus_0.6_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.5
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
index 510494c0c6..2dba5a9304 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_abs_ultimaker2_plus_0.8_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.5
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
index f47437eb58..8e87e0e7b6 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_ultimaker2_plus_0.25_mm
 weight = -1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
index 7e3dc1a39e..e311df00a8 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_ultimaker2_plus_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
index 4be015ce35..685b7798fc 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_ultimaker2_plus_0.4_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
index 9b5ac3c163..aadb4195f3 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
index acac263691..332033368f 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_ultimaker2_plus_0.6_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
index a3b15628dd..e4fcae8aa1 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_ultimaker2_plus_0.8_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.8
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
index 4c81178592..55af936a89 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_plus_ultimaker2_plus_0.4_mm
 weight = -2
 quality_type = draft
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
index 216c8568d1..eb0ca5e81f 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_plus_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
index b718af40d9..b324d867bc 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_plus_ultimaker2_plus_0.6_mm
 weight = -2
 quality_type = draft
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
index 4e8de61ad6..c8c7576d30 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_plus_ultimaker2_plus_0.6_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
index 1e9f1029c6..28353f729d 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_plus_ultimaker2_plus_0.8_mm
 weight = -2
 quality_type = draft
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
index f64cd2cf1a..f74db21b91 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_cpe_plus_ultimaker2_plus_0.8_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
index e136dad3b8..b8924423e2 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.25_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
index e963f8b438..323fa51a8d 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.25_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
index 134c1d033b..7628cd0be1 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
index 04469385a0..a97a4c4e8f 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
index 20662c3e21..0cd7bbdbfd 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.6_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
index b8cd3a1a3a..d5e0025913 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.6_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
index c615480917..f653a90f95 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.8_mm
 weight = -2
 quality_type = draft
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
index af20b564e4..144c8e74ac 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_nylon_ultimaker2_plus_0.8_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
index 0498e5a81f..d38f2af4d3 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.25_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
index e4a08a5bb1..aa176f67a2 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.25_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
index c3d3626380..0408ead05e 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
index 705dfb175a..ed430f10c0 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
index 5eb29eba57..b6c3a66c0b 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.6_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
index 82a3e56013..0dfb533f56 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.6_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
index 890a08608c..3eee23006f 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.8_mm
 weight = -2
 quality_type = draft
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
index 0456166d70..40da82e6bf 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pc_ultimaker2_plus_0.8_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = raft
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.25_normal.inst.cfg
deleted file mode 100644
index 13b05df085..0000000000
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.25_normal.inst.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker2_plus
-
-[metadata]
-type = quality
-material = generic_pp_ultimaker2_plus_0.25_mm
-weight = 0
-quality_type = normal
-setting_version = 3
-supported = False
-
-[values]
-
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
index d471e39853..6f4e366209 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pp_ultimaker2_plus_0.4_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
index e313b04ac2..c7224f475f 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pp_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
index 901a23ba08..203db9883e 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pp_ultimaker2_plus_0.6_mm
 weight = -2
 quality_type = draft
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
index 3adebf1fc6..64dfbc9281 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pp_ultimaker2_plus_0.6_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
index 55567d2c4e..f6d56242dd 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pp_ultimaker2_plus_0.8_mm
 weight = -2
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
index 8653faea13..ecb3e3da4a 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_pp_ultimaker2_plus_0.8_mm
 weight = -3
 quality_type = draft
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
index bbb4002d0b..b1cb56a543 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_tpu_ultimaker2_plus_0.25_mm
 weight = 1
 quality_type = high
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = brim
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
index 22fe2566f9..80cc92fe64 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_tpu_ultimaker2_plus_0.4_mm
 weight = 0
 quality_type = normal
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = brim
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
index 12a8f6521b..9796adada9 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 material = generic_tpu_ultimaker2_plus_0.6_mm
 weight = -1
 quality_type = fast
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = brim
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.8_normal.inst.cfg
deleted file mode 100644
index 65f9ba383e..0000000000
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.8_normal.inst.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker2_plus
-
-[metadata]
-weight = 0
-type = quality
-quality_type = normal
-material = generic_tpu_ultimaker2_plus_0.8_mm
-supported = False
-setting_version = 3
-
-[values]
-
diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
index ea95ac161b..13dca72c27 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_abs_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
index 6db50fe270..10fa10c726 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_abs_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_speed = 7
diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
index 305de52ea6..02f2327468 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_abs_ultimaker3_AA_0.4
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_speed = 12
diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
index fc23b25e3e..fccb6a35f5 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_abs_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
index bbbfd3b6a1..dfdb1ca8a7 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_cpe_plus_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
index f39da90dc6..93b371a627 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_cpe_plus_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
index 6641e0f4ed..93647f9f44 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_cpe_plus_ultimaker3_AA_0.4
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
index c22d6eda31..2886ef2229 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_cpe_plus_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
index 96065673d6..5e3daf5a9e 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_cpe_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 material_print_temperature = =default_material_print_temperature + 10
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
index e866877b0e..e48f83994d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_cpe_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_speed = 7
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
index 971c222ef7..fd0a8cd18d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_cpe_ultimaker3_AA_0.4
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_min_speed = 12
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
index d77b673721..56c997eb15 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_cpe_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
index 5f3680c391..15283a3242 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_nylon_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = brim
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
index c5dc2c37f9..c063725e82 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_nylon_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = brim
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
index cb39a20918..218e1e50e1 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_nylon_ultimaker3_AA_0.4
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = brim
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
index 0e3467d901..3b96939ac9 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_nylon_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 adhesion_type = brim
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
index 2a2e7a1010..f8b4dd067c 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_pc_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
index 8887895e46..1db3935180 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_pc_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
index 07c372f9dc..0f9e9b15b0 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pc_ultimaker3_AA_0.4
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
index 9a7daeed93..26a3136069 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pc_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg
index f2d76753b0..8c6e7bd782 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_pla_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
index b78d1598cd..db441015a8 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_pla_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
index 0fa518546f..61807490e9 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 material = generic_pla_ultimaker3_AA_0.4
 weight = 1
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg
index ca4a3bf27b..d7254b854d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pla_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
index 7be9425947..3fe25e563a 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_pp_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
index 132a4e6303..4c92c7a14b 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_pp_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
index 780ad8b2a1..db55956497 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_pp_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PVA_Fast_Print.inst.cfg
deleted file mode 100644
index 121d9c92bb..0000000000
--- a/resources/quality/ultimaker3/um3_aa0.4_PVA_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-weight = 0
-type = quality
-quality_type = normal
-material = generic_pva_ultimaker3_AA_0.4
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
index f1825240cf..6116dc1bda 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_tpu_ultimaker3_AA_0.4
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
index d223a83554..1da5d0fec8 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 material = generic_tpu_ultimaker3_AA_0.4
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
index c0b5065f53..1938e1c26c 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 material = generic_tpu_ultimaker3_AA_0.4
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg
index b55678643d..7c16e6e8ee 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_abs_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 line_width = =machine_nozzle_size * 0.875
diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
index 3c21c74d8e..728b4c868f 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_abs_ultimaker3_AA_0.8
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.4
diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg
index 9c4352043b..98ae70c568 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_abs_ultimaker3_AA_0.8
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.3
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg
index 795d224a65..0a05e9aafd 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_cpe_plus_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 14
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
index 58723d05fe..82efb6a57b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_cpe_plus_ultimaker3_AA_0.8
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 14
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg
index e125ec9f0b..ff375b6e49 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_cpe_plus_ultimaker3_AA_0.8
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 14
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
index 3c303fc9c2..b4d7035b8d 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_cpe_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 15
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
index 6525e0452f..b5ccc38534 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_cpe_ultimaker3_AA_0.8
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 15
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
index 195598e0f9..33ae223526 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_cpe_ultimaker3_AA_0.8
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 15
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
index fec8232b59..43ec77453c 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_nylon_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 5.6
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 8a0004309d..5b8626e8c2 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_nylon_ultimaker3_AA_0.8
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 5.6
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
index d3729b22d9..0b115ada4b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_nylon_ultimaker3_AA_0.8
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 5.6
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg
index dfc3d3ce72..0b666d2e0b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_pc_ultimaker3_AA_0.8
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 14
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
index 3f9864b72e..de212df4af 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_pc_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 14
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
index 2fe51a392e..3e0c669eeb 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_pc_ultimaker3_AA_0.8
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 14
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
index eebe1a8e38..3c4303e017 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_pla_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
index c35bf05908..5509f42aae 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_pla_ultimaker3_AA_0.8
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
index 984a825085..645c3fe3ef 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_pla_ultimaker3_AA_0.8
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
index 0eb264a9db..f46c3cfb8f 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_pp_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 25
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
index cb12f4aedc..ac8087d0c4 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_pp_ultimaker3_AA_0.8
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 25
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
index 3ceb547378..daf60f24e6 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_pp_ultimaker3_AA_0.8
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 25
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PVA_Fast_Print.inst.cfg
deleted file mode 100644
index 071a72da0d..0000000000
--- a/resources/quality/ultimaker3/um3_aa0.8_PVA_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-weight = 0
-type = quality
-quality_type = normal
-material = generic_pva_ultimaker3_AA_0.8
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PVA_Superdraft_Print.inst.cfg
deleted file mode 100644
index 485226fe3d..0000000000
--- a/resources/quality/ultimaker3/um3_aa0.8_PVA_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-weight = 0
-type = quality
-quality_type = superdraft
-material = generic_pva_ultimaker3_AA_0.8
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
index 0514a22b95..726ab82867 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 material = generic_tpu_ultimaker3_AA_0.8
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 8.75
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
index 805f12ef81..269725daa9 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 material = generic_tpu_ultimaker3_AA_0.8
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 8.75
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 3d1f29ee21..dd1737433a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 material = generic_tpu_ultimaker3_AA_0.8
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 8.75
diff --git a/resources/quality/ultimaker3/um3_bb0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_ABS_Fast_Print.inst.cfg
deleted file mode 100644
index 65fbb4aa22..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_ABS_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_abs_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_ABS_Superdraft_Print.inst.cfg
deleted file mode 100644
index d92791970e..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_ABS_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_abs_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_CPEP_Fast_Print.inst.cfg
deleted file mode 100644
index 3aa8fc43e0..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_CPEP_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_cpe_plus_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_CPEP_Superdraft_Print.inst.cfg
deleted file mode 100644
index c3bfa7a731..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_CPEP_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_cpe_plus_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_CPE_Fast_Print.inst.cfg
deleted file mode 100644
index 6594cd4403..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_CPE_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_cpe_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_CPE_Superdraft_Print.inst.cfg
deleted file mode 100644
index 4eda6ce767..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_CPE_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_cpe_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_Nylon_Fast_Print.inst.cfg
deleted file mode 100644
index ca4589f150..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_Nylon_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_nylon_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_Nylon_Superdraft_Print.inst.cfg
deleted file mode 100644
index 94dcfe2aff..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_Nylon_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_nylon_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PC_Fast_Print.inst.cfg
deleted file mode 100644
index 46334b219c..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_PC_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_pc_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PLA_Fast_Print.inst.cfg
deleted file mode 100644
index 37998b3346..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_PLA_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_pla_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PLA_Superdraft_Print.inst.cfg
deleted file mode 100644
index 51ea4d609a..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_PLA_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_pla_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PP_Fast_Print.inst.cfg
deleted file mode 100644
index be9f93c662..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_PP_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_pp_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PP_Superdraft_Print.inst.cfg
deleted file mode 100644
index d2f54e3137..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_PP_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_pp_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
index ee57d2b177..c87f744932 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 weight = -2
 material = generic_pva_ultimaker3_BB_0.4
-setting_version = 3
+setting_version = 4
 
 [values]
 material_print_temperature = =default_material_print_temperature + 10
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
index 90280ed2ee..23fa6d61d8 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg
@@ -8,7 +8,7 @@ weight = -1
 type = quality
 quality_type = fast
 material = generic_pva_ultimaker3_BB_0.4
-setting_version = 3
+setting_version = 4
 
 [values]
 material_print_temperature = =default_material_print_temperature + 5
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
index b8d7dd3ada..3ba82d65c6 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ weight = 1
 type = quality
 quality_type = high
 material = generic_pva_ultimaker3_BB_0.4
-setting_version = 3
+setting_version = 4
 
 [values]
 material_standby_temperature = 100
diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
index 32591a38b7..a709d5613b 100644
--- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ weight = 0
 type = quality
 quality_type = normal
 material = generic_pva_ultimaker3_BB_0.4
-setting_version = 3
+setting_version = 4
 
 [values]
 material_standby_temperature = 100
diff --git a/resources/quality/ultimaker3/um3_bb0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_TPU_Fast_Print.inst.cfg
deleted file mode 100644
index ba1eaaf548..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_TPU_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_tpu_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.4_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_TPU_Superdraft_Print.inst.cfg
deleted file mode 100644
index 783d1dfa80..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.4_TPU_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_tpu_ultimaker3_BB_0.4
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_ABS_Fast_Print.inst.cfg
deleted file mode 100644
index 7f4dc9f23e..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_ABS_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_abs_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_ABS_Superdraft_Print.inst.cfg
deleted file mode 100644
index c0fe6216c2..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_ABS_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_abs_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_CPEP_Fast_Print.inst.cfg
deleted file mode 100644
index 4aa96f3a02..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_CPEP_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_cpe_plus_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_CPEP_Superdraft_Print.inst.cfg
deleted file mode 100644
index 5e2d079f20..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_CPEP_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_cpe_plus_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_CPE_Fast_Print.inst.cfg
deleted file mode 100644
index 384d44cf93..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_CPE_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_cpe_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_CPE_Superdraft_Print.inst.cfg
deleted file mode 100644
index 87bdedb204..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_CPE_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_cpe_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_Nylon_Fast_Print.inst.cfg
deleted file mode 100644
index 699bb575d2..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_Nylon_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_nylon_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_Nylon_Superdraft_Print.inst.cfg
deleted file mode 100644
index 261d63e6e7..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_Nylon_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_nylon_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PC_Fast_Print.inst.cfg
deleted file mode 100644
index ac8515a1ea..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_PC_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_pc_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PC_Superdraft_Print.inst.cfg
deleted file mode 100644
index 12d82993e6..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_PC_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_pc_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PLA_Fast_Print.inst.cfg
deleted file mode 100644
index f93273a33a..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_PLA_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_pla_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PLA_Superdraft_Print.inst.cfg
deleted file mode 100644
index 499af56b4b..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_PLA_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_pla_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PP_Fast_Print.inst.cfg
deleted file mode 100644
index 5ffda57b8b..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_PP_Fast_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_pp_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PP_Superdraft_Print.inst.cfg
deleted file mode 100644
index aa50edcf55..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_PP_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_pp_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
index a46218f31f..4cb296b4c7 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 weight = -2
 material = generic_pva_ultimaker3_BB_0.8
-setting_version = 3
+setting_version = 4
 
 [values]
 material_print_temperature = =default_material_print_temperature + 5
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
index 4e2f13af07..5249517844 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 weight = -4
 material = generic_pva_ultimaker3_BB_0.8
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.4
diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
index c2d66f59bb..c34e19b134 100644
--- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 weight = -3
 material = generic_pva_ultimaker3_BB_0.8
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.3
diff --git a/resources/quality/ultimaker3/um3_bb0.8_TPU_Fast_print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_TPU_Fast_print.inst.cfg
deleted file mode 100644
index 6be3b596f9..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_TPU_Fast_print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_tpu_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_bb0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_TPU_Superdraft_Print.inst.cfg
deleted file mode 100644
index e3484b3556..0000000000
--- a/resources/quality/ultimaker3/um3_bb0.8_TPU_Superdraft_Print.inst.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-version = 2
-name = Not Supported
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = superdraft
-material = generic_tpu_ultimaker3_BB_0.8
-weight = 0
-supported = False
-setting_version = 3
-
-[values]
diff --git a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg
index f9976d0fbc..b56775a987 100644
--- a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = draft
 global_quality = True
 weight = -2
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.2
diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg
index 0a30227322..12f1183364 100644
--- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = fast
 global_quality = True
 weight = -1
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.15
diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg
index a7028590af..cf6e6c45e0 100644
--- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = high
 global_quality = True
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.06
diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg
index c8bf165b55..fef2328923 100644
--- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = normal
 global_quality = True
 weight = 0
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.1
diff --git a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg
index f3ab433e92..be9acd4394 100644
--- a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = superdraft
 global_quality = True
 weight = -4
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.4
diff --git a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg
index 46199fcece..e2c828fc2d 100644
--- a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg
@@ -8,7 +8,7 @@ type = quality
 quality_type = verydraft
 global_quality = True
 weight = -3
-setting_version = 3
+setting_version = 4
 
 [values]
 layer_height = 0.3
diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg
index a266b10b24..0e082e5afa 100644
--- a/resources/variants/cartesio_0.25.inst.cfg
+++ b/resources/variants/cartesio_0.25.inst.cfg
@@ -6,7 +6,7 @@ definition = cartesio
 [metadata]
 author = Cartesio
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.25
diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg
index fe52e83622..27d07c0328 100644
--- a/resources/variants/cartesio_0.4.inst.cfg
+++ b/resources/variants/cartesio_0.4.inst.cfg
@@ -6,7 +6,7 @@ definition = cartesio
 [metadata]
 author = Cartesio
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg
index 8a260c1e17..e96c78d922 100644
--- a/resources/variants/cartesio_0.8.inst.cfg
+++ b/resources/variants/cartesio_0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = cartesio
 [metadata]
 author = Cartesio
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.8
diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum_hyb35.inst.cfg
index 9d46205941..01e94728da 100644
--- a/resources/variants/fabtotum_hyb35.inst.cfg
+++ b/resources/variants/fabtotum_hyb35.inst.cfg
@@ -6,7 +6,7 @@ definition = fabtotum
 [metadata]
 author = FABtotum
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.35
diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum_lite04.inst.cfg
index 9209b2fffc..ee270a9ead 100644
--- a/resources/variants/fabtotum_lite04.inst.cfg
+++ b/resources/variants/fabtotum_lite04.inst.cfg
@@ -6,7 +6,7 @@ definition = fabtotum
 [metadata]
 author = FABtotum
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum_lite06.inst.cfg
index 8c03f33794..49722a50d1 100644
--- a/resources/variants/fabtotum_lite06.inst.cfg
+++ b/resources/variants/fabtotum_lite06.inst.cfg
@@ -6,7 +6,7 @@ definition = fabtotum
 [metadata]
 author = FABtotum
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.6
diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum_pro02.inst.cfg
index 84e1583701..376588fe71 100644
--- a/resources/variants/fabtotum_pro02.inst.cfg
+++ b/resources/variants/fabtotum_pro02.inst.cfg
@@ -6,7 +6,7 @@ definition = fabtotum
 [metadata]
 author = FABtotum
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.2
diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum_pro04.inst.cfg
index 3e136e951a..54294c572c 100644
--- a/resources/variants/fabtotum_pro04.inst.cfg
+++ b/resources/variants/fabtotum_pro04.inst.cfg
@@ -6,7 +6,7 @@ definition = fabtotum
 [metadata]
 author = FABtotum
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum_pro06.inst.cfg
index 7aa789fd17..f1055b6ade 100644
--- a/resources/variants/fabtotum_pro06.inst.cfg
+++ b/resources/variants/fabtotum_pro06.inst.cfg
@@ -6,7 +6,7 @@ definition = fabtotum
 [metadata]
 author = FABtotum
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.6
diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum_pro08.inst.cfg
index f1b9d195e7..ef7eb172be 100644
--- a/resources/variants/fabtotum_pro08.inst.cfg
+++ b/resources/variants/fabtotum_pro08.inst.cfg
@@ -6,7 +6,7 @@ definition = fabtotum
 [metadata]
 author = FABtotum
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.8
diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d_jellybox_0.4.inst.cfg
index e487b6abdc..ce9e82e59a 100644
--- a/resources/variants/imade3d_jellybox_0.4.inst.cfg
+++ b/resources/variants/imade3d_jellybox_0.4.inst.cfg
@@ -6,7 +6,7 @@ definition = imade3d_jellybox
 [metadata]
 author = IMADE3D
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg b/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg
index 2db00fa0e3..60f9793b2a 100644
--- a/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg
+++ b/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg
@@ -6,7 +6,7 @@ definition = imade3d_jellybox
 [metadata]
 author = IMADE3D
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/ultimaker2_0.25.inst.cfg b/resources/variants/ultimaker2_0.25.inst.cfg
index 1637f0ceaa..04084867dd 100644
--- a/resources/variants/ultimaker2_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_0.25.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.25
diff --git a/resources/variants/ultimaker2_0.4.inst.cfg b/resources/variants/ultimaker2_0.4.inst.cfg
index b074214138..f21d85e258 100644
--- a/resources/variants/ultimaker2_0.4.inst.cfg
+++ b/resources/variants/ultimaker2_0.4.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/ultimaker2_0.6.inst.cfg b/resources/variants/ultimaker2_0.6.inst.cfg
index 6bd3b06d22..04128cc297 100644
--- a/resources/variants/ultimaker2_0.6.inst.cfg
+++ b/resources/variants/ultimaker2_0.6.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.6
diff --git a/resources/variants/ultimaker2_0.8.inst.cfg b/resources/variants/ultimaker2_0.8.inst.cfg
index 66d05219b1..400069d60b 100644
--- a/resources/variants/ultimaker2_0.8.inst.cfg
+++ b/resources/variants/ultimaker2_0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.8
diff --git a/resources/variants/ultimaker2_extended_0.25.inst.cfg b/resources/variants/ultimaker2_extended_0.25.inst.cfg
index 6496025820..bdff9a5795 100644
--- a/resources/variants/ultimaker2_extended_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_extended_0.25.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.25
diff --git a/resources/variants/ultimaker2_extended_0.4.inst.cfg b/resources/variants/ultimaker2_extended_0.4.inst.cfg
index 47be42efd7..2af9a75024 100644
--- a/resources/variants/ultimaker2_extended_0.4.inst.cfg
+++ b/resources/variants/ultimaker2_extended_0.4.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/ultimaker2_extended_0.6.inst.cfg b/resources/variants/ultimaker2_extended_0.6.inst.cfg
index cac05731e8..e0753f1c28 100644
--- a/resources/variants/ultimaker2_extended_0.6.inst.cfg
+++ b/resources/variants/ultimaker2_extended_0.6.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.6
diff --git a/resources/variants/ultimaker2_extended_0.8.inst.cfg b/resources/variants/ultimaker2_extended_0.8.inst.cfg
index 5baaf53163..43c033b799 100644
--- a/resources/variants/ultimaker2_extended_0.8.inst.cfg
+++ b/resources/variants/ultimaker2_extended_0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.8
diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg
index 173e69d893..7f1bff4b0c 100644
--- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.25
diff --git a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg
index 88e3d291d6..f6747d059d 100644
--- a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg
+++ b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg
index 54b6b90b62..706e4b8aa6 100644
--- a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg
+++ b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.6
diff --git a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg
index 5616f01699..287c3155b8 100644
--- a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg
+++ b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_extended_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.8
diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg
index 4394090fa4..1d4617c86b 100644
--- a/resources/variants/ultimaker2_plus_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 coasting_min_volume = 0.17
diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg
index ab3dd807ab..75a665ad95 100644
--- a/resources/variants/ultimaker2_plus_0.4.inst.cfg
+++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.4
diff --git a/resources/variants/ultimaker2_plus_0.6.inst.cfg b/resources/variants/ultimaker2_plus_0.6.inst.cfg
index c3324bd7a8..60bbbaa049 100644
--- a/resources/variants/ultimaker2_plus_0.6.inst.cfg
+++ b/resources/variants/ultimaker2_plus_0.6.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.6
diff --git a/resources/variants/ultimaker2_plus_0.8.inst.cfg b/resources/variants/ultimaker2_plus_0.8.inst.cfg
index d0cd2424bd..339b320af3 100644
--- a/resources/variants/ultimaker2_plus_0.8.inst.cfg
+++ b/resources/variants/ultimaker2_plus_0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 author = Ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 machine_nozzle_size = 0.8
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index 980cfd1a59..de7dfcc364 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index 01299f0853..289ae185b0 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 7
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 24c175c2b8..2cb3103dcf 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 39d33b10f8..5dc0b2832a 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index 6bd491032e..b2ad86ff01 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3_extended
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index 15c53b5930..fdea4de08c 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3_extended
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 brim_width = 7
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index e75545b7f9..6ab16c4f10 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3_extended
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_enabled = True
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index a62480bd75..ee2f138754 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker3_extended
 [metadata]
 author = ultimaker
 type = variant
-setting_version = 3
+setting_version = 4
 
 [values]
 acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
diff --git a/tests/Settings/TestExtruderStack.py b/tests/Settings/TestExtruderStack.py
index 66b4d51b04..6ed2c6649b 100644
--- a/tests/Settings/TestExtruderStack.py
+++ b/tests/Settings/TestExtruderStack.py
@@ -251,7 +251,7 @@ def test_getPropertyFallThrough(extruder_stack):
     for type_id, type_name in container_indices.IndexTypeMap.items():
         container = unittest.mock.MagicMock()
         # Return type_id when asking for value and -1 when asking for limit_to_extruder
-        container.getProperty = lambda key, property, type_id = type_id: type_id if (key == "layer_height" and property == "value") else (None if property != "limit_to_extruder" else "-1") #Returns the container type ID as layer height, in order to identify it.
+        container.getProperty = lambda key, property, context = None, type_id = type_id: type_id if (key == "layer_height" and property == "value") else (None if property != "limit_to_extruder" else "-1") #Returns the container type ID as layer height, in order to identify it.
         container.hasProperty = lambda key, property: key == "layer_height"
         container.getMetaDataEntry = unittest.mock.MagicMock(return_value = type_name)
         mock_layer_heights[type_id] = container
diff --git a/tests/Settings/TestGlobalStack.py b/tests/Settings/TestGlobalStack.py
index 89dd76aec1..afd3d2b425 100755
--- a/tests/Settings/TestGlobalStack.py
+++ b/tests/Settings/TestGlobalStack.py
@@ -63,7 +63,7 @@ def test_addContainer(global_stack):
 ##  Tests adding extruders to the global stack.
 def test_addExtruder(global_stack):
     mock_definition = unittest.mock.MagicMock()
-    mock_definition.getProperty = lambda key, property: 2 if key == "machine_extruder_count" and property == "value" else None
+    mock_definition.getProperty = lambda key, property, context = None: 2 if key == "machine_extruder_count" and property == "value" else None
 
     with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock):
         global_stack.definition = mock_definition
@@ -318,7 +318,7 @@ def test_getPropertyFallThrough(global_stack):
     container_indexes = cura.Settings.CuraContainerStack._ContainerIndexes #Cache.
     for type_id, type_name in container_indexes.IndexTypeMap.items():
         container = unittest.mock.MagicMock()
-        container.getProperty = lambda key, property, type_id = type_id: type_id if (key == "layer_height" and property == "value") else None #Returns the container type ID as layer height, in order to identify it.
+        container.getProperty = lambda key, property, context = None, type_id = type_id: type_id if (key == "layer_height" and property == "value") else None #Returns the container type ID as layer height, in order to identify it.
         container.hasProperty = lambda key, property: key == "layer_height"
         container.getMetaDataEntry = unittest.mock.MagicMock(return_value = type_name)
         mock_layer_heights[type_id] = container
@@ -355,7 +355,7 @@ def test_getPropertyFallThrough(global_stack):
 ##  In definitions, test whether having no resolve allows us to find the value.
 def test_getPropertyNoResolveInDefinition(global_stack):
     value = unittest.mock.MagicMock() #Just sets the value for bed temperature.
-    value.getProperty = lambda key, property: 10 if (key == "material_bed_temperature" and property == "value") else None
+    value.getProperty = lambda key, property, context = None: 10 if (key == "material_bed_temperature" and property == "value") else None
 
     with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking.
         global_stack.definition = value
@@ -365,7 +365,7 @@ def test_getPropertyNoResolveInDefinition(global_stack):
 #   must get the resolve first.
 def test_getPropertyResolveInDefinition(global_stack):
     resolve_and_value = unittest.mock.MagicMock() #Sets the resolve and value for bed temperature.
-    resolve_and_value.getProperty = lambda key, property: (7.5 if property == "resolve" else 5) if (key == "material_bed_temperature" and property in ("resolve", "value")) else None #7.5 resolve, 5 value.
+    resolve_and_value.getProperty = lambda key, property, context = None: (7.5 if property == "resolve" else 5) if (key == "material_bed_temperature" and property in ("resolve", "value")) else None #7.5 resolve, 5 value.
 
     with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking.
         global_stack.definition = resolve_and_value
@@ -378,9 +378,9 @@ def test_getPropertyResolveInInstance(global_stack):
     instance_containers = {}
     for container_type in container_indices.IndexTypeMap:
         instance_containers[container_type] = unittest.mock.MagicMock() #Sets the resolve and value for bed temperature.
-        instance_containers[container_type].getProperty = lambda key, property: (7.5 if property == "resolve" else (InstanceState.User if property == "state" else (5 if property != "limit_to_extruder" else "-1"))) if (key == "material_bed_temperature") else None #7.5 resolve, 5 value.
+        instance_containers[container_type].getProperty = lambda key, property, context = None: (7.5 if property == "resolve" else (InstanceState.User if property == "state" else (5 if property != "limit_to_extruder" else "-1"))) if (key == "material_bed_temperature") else None #7.5 resolve, 5 value.
         instance_containers[container_type].getMetaDataEntry = unittest.mock.MagicMock(return_value = container_indices.IndexTypeMap[container_type]) #Make queries for the type return the desired type.
-    instance_containers[container_indices.Definition].getProperty = lambda key, property: 10 if (key == "material_bed_temperature" and property == "value") else None #Definition only has value.
+    instance_containers[container_indices.Definition].getProperty = lambda key, property, context = None: 10 if (key == "material_bed_temperature" and property == "value") else None #Definition only has value.
     with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking.
         global_stack.definition = instance_containers[container_indices.Definition] #Stack must have a definition.
 
@@ -402,10 +402,10 @@ def test_getPropertyResolveInInstance(global_stack):
 #   definitions.
 def test_getPropertyInstancesBeforeResolve(global_stack):
     value = unittest.mock.MagicMock() #Sets just the value.
-    value.getProperty = lambda key, property: (10 if property == "value" else (InstanceState.User if property != "limit_to_extruder" else "-1")) if key == "material_bed_temperature" else None
+    value.getProperty = lambda key, property, context = None: (10 if property == "value" else (InstanceState.User if property != "limit_to_extruder" else "-1")) if key == "material_bed_temperature" else None
     value.getMetaDataEntry = unittest.mock.MagicMock(return_value = "quality")
     resolve = unittest.mock.MagicMock() #Sets just the resolve.
-    resolve.getProperty = lambda key, property: 7.5 if (key == "material_bed_temperature" and property == "resolve") else None
+    resolve.getProperty = lambda key, property, context = None: 7.5 if (key == "material_bed_temperature" and property == "resolve") else None
 
     with unittest.mock.patch("cura.Settings.CuraContainerStack.DefinitionContainer", unittest.mock.MagicMock): #To guard against the type checking.
         global_stack.definition = resolve