diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py
index 49f13751a2..c3c4430b00 100644
--- a/cura/Machines/MaterialManager.py
+++ b/cura/Machines/MaterialManager.py
@@ -205,14 +205,22 @@ class MaterialManager(QObject):
             else:
                 # this material is variant-specific, so we save it in a variant-specific node under the
                 # machine-specific node
-                if variant_name not in machine_node.children_map:
-                    machine_node.children_map[variant_name] = MaterialNode()
 
-                variant_node = machine_node.children_map[variant_name]
-                if root_material_id in variant_node.material_map: #We shouldn't have duplicated variant-specific materials for the same machine.
-                    ConfigurationErrorMessage.getInstance().addFaultyContainers(root_material_id)
-                    continue
-                variant_node.material_map[root_material_id] = MaterialNode(material_metadata)
+                # Check first if the variant exist in the manager
+                existing_variant = self._application.getVariantManager().getVariantNode(definition, variant_name)
+                if existing_variant is not None:
+                    if variant_name not in machine_node.children_map:
+                        machine_node.children_map[variant_name] = MaterialNode()
+
+                    variant_node = machine_node.children_map[variant_name]
+                    if root_material_id in variant_node.material_map:  # We shouldn't have duplicated variant-specific materials for the same machine.
+                        ConfigurationErrorMessage.getInstance().addFaultyContainers(root_material_id)
+                        continue
+                    variant_node.material_map[root_material_id] = MaterialNode(material_metadata)
+                else:
+                    # Add this container id to the wrong containers list in the registry
+                    Logger.log("w", "Not adding {id} to the material manager because the variant does not exist.".format(id = material_metadata["id"]))
+                    self._container_registry.wrong_container_ids.append(material_metadata["id"])
 
         self.materialsUpdated.emit()
 
diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml
index 0254bb0dcd..cdbe2f0710 100644
--- a/plugins/Toolbox/resources/qml/Toolbox.qml
+++ b/plugins/Toolbox/resources/qml/Toolbox.qml
@@ -46,6 +46,11 @@ Window
                 id: viewLoading
                 visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading"
             }
+            ToolboxErrorPage
+            {
+                id: viewErrored
+                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored"
+            }
             ToolboxDownloadsPage
             {
                 id: viewDownloads
diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
index b81e511cc6..6bad12236b 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
@@ -11,10 +11,7 @@ Item
     id: tile
     property bool installed: toolbox.isInstalled(model.id)
     width: detailList.width - UM.Theme.getSize("wide_margin").width
-    // TODO: Without this line, every instance of this object has 0 height. With
-    // it, QML spits out tons of bugs claiming a binding loop (not true). Why?
-    // Because QT is garbage.
-    height: Math.max( UM.Theme.getSize("toolbox_detail_tile").height, childrenRect.height + UM.Theme.getSize("default_margin").height)
+    height: Math.max(UM.Theme.getSize("toolbox_detail_tile").height, childrenRect.height + UM.Theme.getSize("default_margin").height)
     Item
     {
         id: normalData
@@ -66,7 +63,7 @@ Item
                 }
                 else
                 {
-                    if ( toolbox.isDownloading && toolbox.activePackage == model )
+                    if (toolbox.isDownloading && toolbox.activePackage == model)
                     {
                         return catalog.i18nc("@action:button", "Cancel")
                     }
@@ -76,21 +73,7 @@ Item
                     }
                 }
             }
-            enabled:
-            {
-                if (installed)
-                {
-                    return true
-                }
-                if ( toolbox.isDownloading )
-                {
-                    return toolbox.activePackage == model ? true : false
-                }
-                else
-                {
-                    return true
-                }
-            }
+            enabled: installed || !(toolbox.isDownloading && toolbox.activePackage != model) //Don't allow installing while another download is running.
             opacity: enabled ? 1.0 : 0.5
             style: ButtonStyle
             {
@@ -252,7 +235,8 @@ Item
         color: UM.Theme.getColor("lining")
         width: tile.width
         height: UM.Theme.getSize("default_lining").height
-        anchors.bottom: tile.bottom
+        anchors.top: supportedConfigsChart.bottom
+        anchors.topMargin: UM.Theme.getSize("default_margin").height + UM.Theme.getSize("wide_margin").height //Normal margin for spacing after chart, wide margin between items.
     }
     Connections
     {
diff --git a/plugins/Toolbox/resources/qml/ToolboxErrorPage.qml b/plugins/Toolbox/resources/qml/ToolboxErrorPage.qml
new file mode 100644
index 0000000000..600ae2b39f
--- /dev/null
+++ b/plugins/Toolbox/resources/qml/ToolboxErrorPage.qml
@@ -0,0 +1,22 @@
+// Copyright (c) 2018 Ultimaker B.V.
+// Toolbox is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.7
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+
+Rectangle
+{
+    id: page
+    width: parent.width
+    height: parent.height
+    color: "transparent"
+    Label
+    {
+        text: catalog.i18nc("@info", "Could not connect to the Cura Package database. Please check your connection.")
+        anchors
+        {
+            centerIn: parent
+        }
+    }
+}
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index 2e2fb3cbb8..ea5a535196 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -314,8 +314,9 @@ class Toolbox(QObject, Extension):
         return
 
     def resetDownload(self):
-        self._download_reply.abort()
-        self._download_reply.downloadProgress.disconnect(self._onDownloadProgress)
+        if self._download_reply:
+            self._download_reply.abort()
+            self._download_reply.downloadProgress.disconnect(self._onDownloadProgress)
         self._download_reply = None
         self._download_request = None
         self.setDownloadProgress(0)
@@ -333,11 +334,13 @@ class Toolbox(QObject, Extension):
 
         if reply.error() == QNetworkReply.TimeoutError:
             Logger.log("w", "Got a timeout.")
+            self.setViewPage("errored")
             self.resetDownload()
             return
 
         if reply.error() == QNetworkReply.HostNotFoundError:
             Logger.log("w", "Unable to reach server.")
+            self.setViewPage("errored")
             self.resetDownload()
             return
 
diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg
index e647f5df02..249abb237f 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker3
 
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
index f9c9b6c3d8..850fbd247b 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker3
 
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg
index 789d9b93fd..f61e356a8f 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker3
 
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg
index cd755b3ac0..0779260c76 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker3
 
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg
index ef1a838586..ec4fb317cc 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker3
 
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
index fc3790436e..6c9e2ca21b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker3
 
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg
index 9527b3f8f0..50edcb5b88 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker3
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
index 9143dd0379..265ada43a3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
index e93f5e9a8e..a69053b8ab 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
index 96a730a7fd..ecc8a8f250 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
index 2b53fb8db4..c188f37d96 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg
index 5909cbb8a7..f964bba440 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
index f70f7e5ed1..72338b0319 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg
index e003a30eef..8f7ac47368 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg
index 21ce503633..a72664aa53 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg
index 1ca4533188..9c0cbabe05 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg
index 1d3541435a..c9cdf862bf 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg
index 0fe89a30eb..6392f372d6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
index ffbf93e8da..b4652d23dd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
index d02f2de083..bebc993ca3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
index 00ee94686c..40f0c2ab70 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
index a6694fd030..bb5cad456f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
index 5e54bf5568..ef3e8d7f4e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
index 3319406652..823a6e0fdf 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
index 0ab7346266..05c960e443 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
index b2cb1394d3..b510b74c8a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
index 7de22070f3..5a5411f0ea 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
index d1ee4756e8..7bb2ed31e9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
index 53a4451114..ed166d0eef 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
index 74dd7b00a4..ac23b19285 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
index d1dd243dd2..977ba5c309 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
index 834276c880..7e4ebed906 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
index be5f2dd188..941561499b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
index 61f491c65e..04db39fc54 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
index 2f8f178648..65fd293954 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
index b92eff029a..d75b918479 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
index beaa1b61d4..ccffa0bc7c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
index ffd27ce147..8ea92a86d7 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg
index e8e8358823..35a6c51ea4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg
index 477e8bf608..d739d132a9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg
index 77f1a84fae..7c86049fe1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
index 0d3e855d4b..bee5fdad75 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
index d42d809ea9..b5cbde326a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
index 4687bf4a99..8f41897c6c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
index ad50848ddc..8adebb167e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg
index 417db3d1a0..780ad37ab4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg
index b4c29898e8..3bcb7142e9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg
index 08af121efe..b1e7eee3bb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
index b4679f6a06..c2405c0c39 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
index 025dd45ee7..489c485c72 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
index 81a3a23ae1..c6f07fdb12 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg
index 1e65bbd748..f6bd1aace8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
index e326a4225c..38138f8109 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg
index 3251534622..ec5055b4ae 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg
index c7420c8205..4599155da4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
index 7f4cee1879..36654edf61 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg
index 5689da7eb2..0588f2bf34 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
index 8b4c2c9cc7..9f3911279b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
index 58e3e6c7be..d5bfa0243e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
index 37e4ec3ebf..dbaef3e200 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
index efaca1a196..df121a420f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
index b5330d38b2..63c9ac80ba 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
index e7023ac379..d3a95be0c4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
index 4ee9852f05..fddb41d4b5 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
index 4135eb319f..9f364651c4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
index 3396785aee..d3ee0ed88c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast - Experimental
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
index 430b1a92a3..80cd8e7e2e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
index c500c5173c..f0aed44aea 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
index bc99237cba..5e75dc8e4e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
index ca200e7c73..32dd0d6acf 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
index b9693b6b9a..b52ddf1a23 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
index 629352bf65..c4566ed1a3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg
index 824d8611a7..8fe0b01c0c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
index 818fece7bd..906d0c7022 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg
index 09f047e145..3a8a15717a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
index db0fa5b8e2..0783063313 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index acca7f78bc..898ce8d7dd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index 44a4470021..b76c35ffda 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
index 39d66e3e0c..bb0f08662d 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
index 212aab7c53..da6c89c1c6 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
index 40ba2a16df..dca7011554 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
index dd99d403e0..6125545075 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
index b36090033f..d4057f6a00 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
index 73390b2a96..664f87c949 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
index 7b7404f143..c8e55d1b25 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg
index 6d08a69b50..427d382a81 100644
--- a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg
index 21c3e682b6..7f67716e5d 100644
--- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg
index 4945e6db85..8cf715ce83 100644
--- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fine
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg
new file mode 100644
index 0000000000..fbfe205957
--- /dev/null
+++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg
@@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Fine
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 4
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.1
diff --git a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg
index 6ff830eaec..8f6156a499 100644
--- a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Sprint
 definition = ultimaker_s5
 
diff --git a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg
index 633875275e..ccba251258 100644
--- a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extra Fast
 definition = ultimaker_s5
 
diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg
index 0de8c5143c..9181af08c5 100644
--- a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg
+++ b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Extreme
 definition = vertex_delta_k8800
 
diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg
index 33e65329e9..dfbb9333bd 100644
--- a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg
+++ b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = High
 definition = vertex_delta_k8800
 
diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg
index f6a6d8c8f3..0d32e6772b 100644
--- a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg
+++ b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = vertex_delta_k8800
 
diff --git a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg
index b2a27a7d38..a9e7a135d6 100644
--- a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg
index 77a513ceab..93ef0bfcbd 100644
--- a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg
index bb342715ba..d2b40aa3d6 100644
--- a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg
index ec51eb5cc2..fe1e98747d 100644
--- a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg
index d1aacd309f..e0b43cfd95 100644
--- a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg
index 998a457d4a..959f65469a 100644
--- a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg
index 8e53930c8d..14b9d50351 100644
--- a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fast
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg
index 07a70a7a5c..25f3aa45de 100644
--- a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Fine
 definition = zyyx_agile
 
diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg
index dc035605b1..3760781e54 100644
--- a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg
+++ b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg
@@ -1,5 +1,5 @@
 [general]
-version = 3
+version = 4
 name = Normal
 definition = zyyx_agile
 
diff --git a/resources/variants/felixtec4_0.25.inst.cfg b/resources/variants/felixtec4_0.25.inst.cfg
index c77875c105..5d815a6760 100644
--- a/resources/variants/felixtec4_0.25.inst.cfg
+++ b/resources/variants/felixtec4_0.25.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = 0.25 mm
-version = 3
+version = 4
 definition = felixtec4dual
 
 [metadata]
diff --git a/resources/variants/felixtec4_0.35.inst.cfg b/resources/variants/felixtec4_0.35.inst.cfg
index c6b02ba4d4..7ee372dfd0 100644
--- a/resources/variants/felixtec4_0.35.inst.cfg
+++ b/resources/variants/felixtec4_0.35.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = 0.35 mm
-version = 3
+version = 4
 definition = felixtec4dual
 
 [metadata]
diff --git a/resources/variants/felixtec4_0.50.inst.cfg b/resources/variants/felixtec4_0.50.inst.cfg
index d2c097522d..7a4eac65a3 100644
--- a/resources/variants/felixtec4_0.50.inst.cfg
+++ b/resources/variants/felixtec4_0.50.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = 0.50 mm
-version = 3
+version = 4
 definition = felixtec4dual
 
 [metadata]
diff --git a/resources/variants/felixtec4_0.70.inst.cfg b/resources/variants/felixtec4_0.70.inst.cfg
index db87a70cf4..21cf8421a3 100644
--- a/resources/variants/felixtec4_0.70.inst.cfg
+++ b/resources/variants/felixtec4_0.70.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = 0.70 mm
-version = 3
+version = 4
 definition = felixtec4dual
 
 [metadata]
diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
index 0a19c24964..819d80f097 100644
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = AA 0.25
-version = 3
+version = 4
 definition = ultimaker_s5
 
 [metadata]
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index 66e508b0be..71b1f2f003 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = AA 0.8
-version = 3
+version = 4
 definition = ultimaker_s5
 
 [metadata]
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
new file mode 100644
index 0000000000..9c3b5934ee
--- /dev/null
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -0,0 +1,42 @@
+[general]
+name = AA 0.4
+version = 4
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 4
+type = variant
+hardware_type = nozzle
+
+[values]
+brim_width = 7
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_id = AA 0.4
+machine_nozzle_tip_outer_diameter = 1.0
+raft_acceleration = =acceleration_print
+raft_airgap = 0.3
+raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
+raft_interface_line_spacing = =raft_interface_line_width + 0.2
+raft_interface_line_width = =line_width * 2
+raft_interface_thickness = =layer_height * 1.5
+raft_jerk = =jerk_print
+raft_margin = 15
+raft_surface_layers = 2
+retraction_amount = 6.5
+retraction_count_max = 25
+retraction_min_travel = =line_width * 2
+retraction_prime_speed = =retraction_speed
+skin_overlap = 15
+speed_print = 70
+speed_topbottom = =math.ceil(speed_print * 30 / 70)
+speed_wall = =math.ceil(speed_print * 30 / 70)
+support_angle = 60
+support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
+support_top_distance = =support_z_distance
+support_use_towers = True
+support_z_distance = =layer_height * 2
+switch_extruder_prime_speed = =switch_extruder_retraction_speeds
+switch_extruder_retraction_amount = =machine_heat_zone_length
+top_bottom_thickness = 1.2
+wall_thickness = 1.3
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index c9f4768401..0c77d42e7e 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = BB 0.8
-version = 3
+version = 4
 definition = ultimaker_s5
 
 [metadata]
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index fdd7e8c523..76b609249a 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 name = BB 0.4
-version = 3
+version = 4
 definition = ultimaker_s5
 
 [metadata]
diff --git a/resources/variants/ultimaker_s5_glass.inst.cfg b/resources/variants/ultimaker_s5_glass.inst.cfg
new file mode 100644
index 0000000000..42e47cf652
--- /dev/null
+++ b/resources/variants/ultimaker_s5_glass.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Glass
+version = 4
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 4
+type = variant
+hardware_type = buildplate
+
+[values]
+material_bed_temperature = =default_material_bed_temperature
+machine_buildplate_type = glass