New Upstream Release - fdm-materials

Ready changes

Summary

Merged new upstream version: 5.4.0~beta.1 (was: 5.0.0).

Resulting package

Built on 2023-07-02T20:10 (took 9m17s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases fdm-materials

Lintian Result

Diff

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 0417782..0365456 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -10,6 +10,6 @@ jobs:
     - name: Checkout master
       uses: actions/checkout@v1.2.0
     - name: Install lxml
-      run: python -m pip install lxml==4.3.0
+      run: python -m pip install lxml==4.6.5
     - name:
-      run: python scripts/check_material_profiles_new_with_lxml.py
+      run: python scripts/check_material_profiles.py
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
new file mode 100644
index 0000000..6fbf90b
--- /dev/null
+++ b/.github/workflows/conan-package.yml
@@ -0,0 +1,57 @@
+---
+name: conan-package
+
+# Exports the recipe, sources and binaries for Mac, Windows and Linux and upload these to the server such that these can
+# be used downstream.
+#
+# It should run on pushes against main or CURA-* branches, but it will only create the binaries for main and release branches
+
+on:
+    workflow_dispatch:
+    push:
+        paths:
+            - '*.xml.*'
+            - '*.sig'
+            - 'conanfile.py'
+            - '.github/workflows/conan-package.yml'
+            - '.github/workflows/requirements*.txt'
+        branches:
+            - main
+            - master
+            - 'CURA-*'
+            - '[0-9].[0-9]*'
+        tags:
+            - '[1-9]+.[0-9]+.[0-9]*'
+            - '[1-9]+.[0-9]+.[0-9]'
+
+jobs:
+    conan-recipe-version:
+        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
+        with:
+            project_name: fdm_materials
+
+    conan-package-export-linux:
+        needs: [ conan-recipe-version ]
+        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
+        with:
+            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+            recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
+            runs_on: 'ubuntu-20.04'
+            python_version: '3.10.x'
+            conan_config_branch: 'master'
+            conan_logging_level: 'info'
+            conan_export_binaries: true
+        secrets: inherit
+
+    notify-export:
+        if: ${{ always() }}
+        needs: [ conan-recipe-version, conan-package-export-linux ]
+
+        uses: ultimaker/cura/.github/workflows/notify.yml@main
+        with:
+            success: ${{ contains(join(needs.*.result, ','), 'success') }}
+            success_title: "New Conan recipe exported in ${{ github.repository }}"
+            success_body: "Exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
+            failure_title: "Failed to export Conan Export in ${{ github.repository }}"
+            failure_body: "Failed to exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
+        secrets: inherit
diff --git a/.github/workflows/notify_on_print_profile_change.yml b/.github/workflows/notify_on_print_profile_change.yml
new file mode 100644
index 0000000..d03552f
--- /dev/null
+++ b/.github/workflows/notify_on_print_profile_change.yml
@@ -0,0 +1,27 @@
+name: notify_on_print_profile_change
+
+on:
+  push:
+    branches: [ "master" ]
+    paths:
+        - 'generic**'
+        - 'ultimaker**'
+  pull_request:
+    branches: [ "master" ]
+    paths:
+        - 'generic**'
+        - 'ultimaker**'
+jobs:
+    slackNotification:
+        name: Slack Notification
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Cura resources changed
+                uses: rtCamp/action-slack-notify@v2
+                env:
+                    SLACK_CHANNEL: profile-changes
+                    SLACK_USERNAME: ${{ github.repository }}
+                    SLACK_COLOR: '#006400'
+                    SLACK_TITLE: Print profiles changed
+                    MSG_MINIMAL: commit
+                    SLACK_WEBHOOK: ${{ secrets.SLACK_CURA_PPM_HOOK }}
\ No newline at end of file
diff --git a/.github/workflows/process-pull-request.yml b/.github/workflows/process-pull-request.yml
new file mode 100644
index 0000000..56fb015
--- /dev/null
+++ b/.github/workflows/process-pull-request.yml
@@ -0,0 +1,15 @@
+name: process-pull-request
+
+on:
+    pull_request_target:
+        types: [opened, reopened, edited, synchronize, review_requested, ready_for_review, assigned]
+
+jobs:
+    add_label:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: actions-ecosystem/action-add-labels@v1
+                if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
+                with:
+                    labels: 'PR: Community Contribution :crown:'
diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt
new file mode 100644
index 0000000..77d8d38
--- /dev/null
+++ b/.github/workflows/requirements-conan-package.txt
@@ -0,0 +1 @@
+conan
diff --git a/.gitignore b/.gitignore
index 57bb020..e65c2ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,8 @@ _build_armhf/*
 !cura_build/CMakeList.txt
 !jedi_build/CMakeList.txt
 !jedi_build/CPackConfig.cmake
+/conanbuildinfo.txt
+/graph_info.json
+
+*.bak
+*~
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89a2950..0e77e95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,6 @@
+# For MSVC flags, will be ignored on non-Windows OS's and this project in general. Only needed for cura-build-environment.
+cmake_policy(SET CMP0091 NEW)
+
 project(fdm-materials NONE)
 
 cmake_minimum_required(VERSION 2.8.12)
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 3449b48..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,22 +0,0 @@
-node('linux && cura') {
-    timeout(time: 5, unit: "MINUTES") {
-        // Prepare building
-        stage('Prepare') {
-            // Ensure we start with a clean build directory.
-            step([$class: 'WsCleanup'])
-
-            // Checkout whatever sources are linked to this pipeline.
-            checkout scm
-        }
-
-        // If any error occurs during building, we want to catch it and continue with the "finale" stage.
-        catchError {
-            // Perform sanity checks
-            stage('Sanity Checks') {
-                if (fileExists("scripts/check_material_profiles.py")) {
-                    sh "${env.CURA_ENVIRONMENT_PATH}/master/bin/python3 scripts/check_material_profiles.py"
-                }
-            }
-        }
-    }
-}
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..b2fce28
--- /dev/null
+++ b/README.md
@@ -0,0 +1,112 @@
+# fdm_materials
+
+<p align="center">
+    <a href="https://github.com/Ultimaker/fdm_materials/actions/workflows/cicd.yml" alt="Unit Tests">
+        <img src="https://github.com/Ultimaker/fdm_materials/actions/workflows/cicd.yml/badge.svg" /></a>
+    <a href="https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml" alt="Unit Tests">
+        <img src="https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg" /></a>
+    <a href="https://github.com/Ultimaker/fdm_materials/issues" alt="Open Issues">
+        <img src="https://img.shields.io/github/issues/ultimaker/fdm_materials" /></a>
+    <a href="https://github.com/Ultimaker/fdm_materials/issues?q=is%3Aissue+is%3Aclosed" alt="Closed Issues">
+        <img src="https://img.shields.io/github/issues-closed/ultimaker/fdm_materials?color=g" /></a>
+    <a href="https://github.com/Ultimaker/fdm_materials/pulls" alt="Pull Requests">
+        <img src="https://img.shields.io/github/issues-pr/ultimaker/fdm_materials" /></a>
+    <a href="https://github.com/Ultimaker/fdm_materials/graphs/contributors" alt="Contributors">
+        <img src="https://img.shields.io/github/contributors/ultimaker/fdm_materials" /></a>
+    <a href="https://github.com/Ultimaker/fdm_materials" alt="Repo Size">
+        <img src="https://img.shields.io/github/repo-size/ultimaker/fdm_materials?style=flat" /></a>
+    <a href="https://github.com/Ultimaker/fdm_materials/blob/master/LICENSE" alt="License">
+        <img src="https://img.shields.io/github/license/ultimaker/fdm_materials?style=flat" /></a>
+</p>
+
+
+FDM material database, used in Cura.
+
+## License
+
+![License](https://img.shields.io/github/license/ultimaker/fdm_materials?style=flat)  
+fdm_materials is released under terms of the CC0-1.0 License. Terms of the license can be found in the LICENSE file. Or at
+https://creativecommons.org/publicdomain/zero/1.0/
+
+> But in general it boils down to:  
+> **We waive all rights to the extend of the law. You can copy, modify, distribute as you like, even for commercial purposes**
+
+## System Requirements
+
+### Windows
+- Python 3.6 or higher
+
+### MacOs
+- Python 3.6 or higher
+
+### Linux
+- Python 3.6 or higher
+
+## How To Build
+
+> **Note:**  
+> We are currently in the process of switch our builds and pipelines to an approach which uses [Conan](https://conan.io/)
+> and pip to manage our dependencies, which are stored on our JFrog Artifactory server and in the pypi.org.
+> At the moment not everything is fully ported yet, so bare with us.
+
+If you want to develop Cura with fdm_materials see the Cura Wiki: [Running Cura from source](https://github.com/Ultimaker/Cura/wiki/Running-Cura-from-Source)
+
+If you have never used [Conan](https://conan.io/) read their [documentation](https://docs.conan.io/en/latest/index.html)
+which is quite extensive and well maintained. Conan is a Python program and can be installed using pip
+
+### 1. Configure Conan
+
+```bash
+pip install conan --upgrade
+conan config install https://github.com/ultimaker/conan-config.git
+conan profile new default --detect --force
+```
+
+Community developers would have to remove the Conan cura repository because it requires credentials. 
+
+Ultimaker developers need to request an account for our JFrog Artifactory server at IT
+```bash
+conan remote remove cura
+```
+
+### 2. Clone fdm_materials
+```bash
+git clone https://github.com/Ultimaker/fdm_materials.git
+cd fdm_materials
+```
+
+## Creating a new fdm_materials Conan package
+
+To create a new fdm_materials Conan package such that it can be used in Cura and Uranium, run the following command:
+
+```shell
+conan create . fdm_materials/<version>@<username>/<channel> --build=missing --update
+```
+
+This package will be stored in the local Conan cache (`~/.conan/data` or `C:\Users\username\.conan\data` ) and can be used in downstream
+projects, such as Cura and Uranium by adding it as a requirement in the `conanfile.py` or in `conandata.yml`.
+
+Note: Make sure that the used `<version>` is present in the conandata.yml in the fdm_materials root
+
+You can also specify the override at the commandline, to use the newly created package, when you execute the `conan install`
+command in the root of the consuming project, with:
+
+
+```shell
+conan install . -build=missing --update --require-override=fdm_materials/<version>@<username>/<channel>
+```
+
+## Developing fdm_materials In Editable Mode
+
+You can use your local development repository downsteam by adding it as an editable mode package.
+This means you can test this in a consuming project without creating a new package for this project every time.
+
+```bash
+    conan editable add . fdm_materials/<version>@<username>/<channel>
+```
+
+Then in your downsteam projects (Cura) root directory override the package with your editable mode package.  
+
+```shell
+conan install . -build=missing --update --require-override=fdm_materials/<version>@<username>/<channel>
+```
\ No newline at end of file
diff --git a/build_for_ultimaker.sh b/build_for_ultimaker.sh
index 47f5bfe..788f9ca 100755
--- a/build_for_ultimaker.sh
+++ b/build_for_ultimaker.sh
@@ -43,7 +43,7 @@ run_tests()
 {
     echo "Testing!"
     # These tests should never fail! See .gitlab-ci.yml
-    ./run_check_material_profiles_new_with_lxml.sh || echo "Material Profile Check with lxml Failed!"
+    ./run_check_material_profiles.sh || echo "Material Profile Check Failed!"
 }
 
 run_linters()
diff --git a/conanfile.py b/conanfile.py
new file mode 100644
index 0000000..f7d7c2c
--- /dev/null
+++ b/conanfile.py
@@ -0,0 +1,44 @@
+import os
+
+from conan import ConanFile
+from conan.tools.files import copy
+from conan.tools.scm import Version
+from conan.errors import ConanInvalidConfiguration
+
+required_conan_version = ">=1.56.0"
+
+
+class FDM_MaterialsConan(ConanFile):
+    name = "fdm_materials"
+    license = "LGPL-3.0"
+    author = "Ultimaker B.V."
+    url = "https://github.com/Ultimaker/fdm_materials"
+    description = "FDM Material database"
+    topics = ("conan", "profiles", "cura", "ultimaker", "filament")
+    build_policy = "missing"
+    exports = "LICENSE*"
+    settings = "os", "compiler", "build_type", "arch"
+    no_copy_source = True
+    
+    def set_version(self):
+        if not self.version:
+            self.version = "5.4.0-beta.1"
+
+    def export_sources(self):
+        copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder)
+        copy(self, "*.sig", self.recipe_folder, self.export_sources_folder)
+
+    def validate(self):
+        if Version(self.version) <= Version("4"):
+            raise ConanInvalidConfiguration("Only versions 5+ are support")
+
+    def package(self):
+        copy(self, "*.fdm_material", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
+        copy(self, "*.sig", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
+
+    def package_info(self):
+        self.cpp_info.includedirs = []
+        self.cpp_info.resdirs = ["res"]
+
+    def package_id(self):
+        self.info.clear()
diff --git a/debian/changelog b/debian/changelog
index b92faf6..699255c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fdm-materials (5.4.0~beta.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 02 Jul 2023 20:01:57 -0000
+
 fdm-materials (5.0.0-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/docker_env/Dockerfile b/docker_env/Dockerfile
index e800ec6..b683f7b 100644
--- a/docker_env/Dockerfile
+++ b/docker_env/Dockerfile
@@ -1,12 +1,12 @@
-FROM registry.hub.docker.com/library/debian:buster-slim
+FROM --platform=linux/amd64 registry.hub.docker.com/library/debian:buster
 
 LABEL Maintainer="software-embedded-platform@ultimaker.com" \
       Comment="Ultimaker update-tools filesystem"
 
-RUN apt-get update && apt-get -y install cmake make python3 python3-pip git
+RUN apt-get update && apt-get -y install cmake make python3 python3-pip git libxml2-dev libxslt-dev
 
 COPY docker_env/buildenv_check.sh buildenv_check.sh
 
 COPY fdm_requirements.txt fdm_requirements.txt
 
-RUN pip3 install -r fdm_requirements.txt
\ No newline at end of file
+RUN pip3 install -r fdm_requirements.txt
diff --git a/eSUN_PLA_PRO_Black.xml.fdm_material b/eSUN_PLA_PRO_Black.xml.fdm_material
index 2ce751b..76fa2cf 100644
--- a/eSUN_PLA_PRO_Black.xml.fdm_material
+++ b/eSUN_PLA_PRO_Black.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Black</color>
+            <label>PLA+ Black</label>
         </name>
         <color_code>#333333</color_code>
         <GUID>5c4e29a1-0722-4cfa-b147-338924afc075</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>
diff --git a/eSUN_PLA_PRO_Grey.xml.fdm_material b/eSUN_PLA_PRO_Grey.xml.fdm_material
index 12c9f67..5ccef3b 100644
--- a/eSUN_PLA_PRO_Grey.xml.fdm_material
+++ b/eSUN_PLA_PRO_Grey.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Grey</color>
+            <label>PLA+ Grey</label>
         </name>
         <color_code>#999999</color_code>
         <GUID>061cc7c6-77b1-4d76-996f-d049546b41d2</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>
diff --git a/eSUN_PLA_PRO_Purple.xml.fdm_material b/eSUN_PLA_PRO_Purple.xml.fdm_material
index 504ff6f..4585fe3 100644
--- a/eSUN_PLA_PRO_Purple.xml.fdm_material
+++ b/eSUN_PLA_PRO_Purple.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Purple</color>
+            <label>PLA+ Purple</label>
         </name>
         <color_code>#9900CC</color_code>
         <GUID>ae0c8895-b4b3-4a12-a5a5-3ae754940ced</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>
diff --git a/eSUN_PLA_PRO_White.xml.fdm_material b/eSUN_PLA_PRO_White.xml.fdm_material
index 7eed928..ed2d6ae 100644
--- a/eSUN_PLA_PRO_White.xml.fdm_material
+++ b/eSUN_PLA_PRO_White.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>White</color>
+            <label>PLA+ White</label>
         </name>
         <color_code>#EEEEEE</color_code>
         <GUID>832e163d-db99-4a58-80b9-f82073ae0a9b</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>
diff --git a/eryone_petg.xml.fdm_material b/eryone_petg.xml.fdm_material
index fa7b9a1..4448f38 100644
--- a/eryone_petg.xml.fdm_material
+++ b/eryone_petg.xml.fdm_material
@@ -25,5 +25,10 @@
     <setting key="retraction amount">4.5</setting>
     <setting key="retraction speed">45.0</setting>
     <setting key="standby temperature">175</setting>
+    <machine>
+      <machine_identifier manufacturer="Eryone" product="eryone_thinker_direct" />
+      <setting key="retraction amount">0.3</setting>
+      <setting key="retraction speed">35.0</setting>
+    </machine>
   </settings>
 </fdmmaterial>
diff --git a/eryone_pla.xml.fdm_material b/eryone_pla.xml.fdm_material
index 3bf3300..52530fe 100644
--- a/eryone_pla.xml.fdm_material
+++ b/eryone_pla.xml.fdm_material
@@ -25,5 +25,10 @@
     <setting key="retraction amount">6.5</setting>
     <setting key="retraction speed">45.0</setting>
     <setting key="standby temperature">175.0</setting>
+    <machine>
+      <machine_identifier manufacturer="Eryone" product="eryone_thinker_direct" />
+      <setting key="retraction amount">0.3</setting>
+      <setting key="retraction speed">35.0</setting>
+    </machine>
   </settings>
 </fdmmaterial>
diff --git a/eryone_pla_glow.xml.fdm_material b/eryone_pla_glow.xml.fdm_material
index b3133e7..9813e21 100644
--- a/eryone_pla_glow.xml.fdm_material
+++ b/eryone_pla_glow.xml.fdm_material
@@ -25,5 +25,10 @@
     <setting key="retraction amount">3.5</setting>
     <setting key="retraction speed">35.0</setting>
     <setting key="standby temperature">175</setting>
+    <machine>
+      <machine_identifier manufacturer="Eryone" product="eryone_thinker_direct" />
+      <setting key="retraction amount">0.25</setting>
+      <setting key="retraction speed">35.0</setting>
+    </machine>
   </settings>
 </fdmmaterial>
diff --git a/eryone_pla_matte.xml.fdm_material b/eryone_pla_matte.xml.fdm_material
index a787557..c11f215 100644
--- a/eryone_pla_matte.xml.fdm_material
+++ b/eryone_pla_matte.xml.fdm_material
@@ -25,5 +25,10 @@
     <setting key="retraction amount">3.5</setting>
     <setting key="retraction speed">45.0</setting>
     <setting key="standby temperature">175.0</setting>
+    <machine>
+      <machine_identifier manufacturer="Eryone" product="eryone_thinker_direct" />
+      <setting key="retraction amount">0.2</setting>
+      <setting key="retraction speed">35.0</setting>
+    </machine>
   </settings>
 </fdmmaterial>
diff --git a/eryone_pla_wood.xml.fdm_material b/eryone_pla_wood.xml.fdm_material
index 907e408..67b2339 100644
--- a/eryone_pla_wood.xml.fdm_material
+++ b/eryone_pla_wood.xml.fdm_material
@@ -25,5 +25,10 @@
     <setting key="retraction amount">4.5</setting>
     <setting key="retraction speed">45.0</setting>
     <setting key="standby temperature">175.0</setting>
+    <machine>
+      <machine_identifier manufacturer="Eryone" product="eryone_thinker_direct" />
+      <setting key="retraction amount">0.3</setting>
+      <setting key="retraction speed">35.0</setting>
+    </machine>
   </settings>
 </fdmmaterial>
diff --git a/eryone_tpu.xml.fdm_material b/eryone_tpu.xml.fdm_material
new file mode 100644
index 0000000..92da865
--- /dev/null
+++ b/eryone_tpu.xml.fdm_material
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+  <metadata>
+    <name>
+      <brand>Eryone</brand>
+      <material>TPU</material>
+      <color>Generic</color>
+      <label>TPU DD</label>
+    </name>
+    <version>8</version>
+    <GUID>ff52b30e-5740-4f70-a7b5-8c436fc9954f</GUID>
+    <color_code>#0055ff</color_code>
+    <description>Wear and tear resistant. Eryone TPU features a Shore hardness of 95A. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
+    <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
+  </metadata>
+  <properties>
+    <diameter>1.75</diameter>
+    <density>1.22</density>
+    <weight>500</weight>
+  </properties>
+  <settings>
+    <setting key="heated bed temperature">50.0</setting>
+    <setting key="print cooling">100.0</setting>
+    <setting key="print temperature">235</setting>
+    <setting key="retraction amount">6.0</setting>
+    <setting key="retraction speed">40.0</setting>
+    <setting key="standby temperature">175.0</setting>
+    <machine>
+      <machine_identifier manufacturer="Eryone" product="eryone_thinker_direct" />
+      <setting key="retraction amount">0.35</setting>
+      <setting key="retraction speed">35.0</setting>
+    </machine>
+  </settings>
+</fdmmaterial>
diff --git a/fdm_requirements.txt b/fdm_requirements.txt
index 86c871e..44a7558 100644
--- a/fdm_requirements.txt
+++ b/fdm_requirements.txt
@@ -1 +1 @@
-lxml
\ No newline at end of file
+lxml==4.6.5
diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material
index 8920e54..68536ea 100644
--- a/generic_abs.xml.fdm_material
+++ b/generic_abs.xml.fdm_material
@@ -10,13 +10,13 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID>
-        <version>26</version>
+        <version>34</version>
         <color_code>#8cb219</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
     </properties>
     <settings>
@@ -41,12 +41,13 @@ Generic ABS profile. The data in this file may not be correct for your specific
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -66,12 +67,9 @@ Generic ABS profile. The data in this file may not be correct for your specific
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -82,13 +80,14 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
-            <setting key="hardware compatible">yes</setting>
             <setting key="heated bed temperature">85</setting>
+            <setting key="hardware compatible">yes</setting>
             <hotend id="0.25 mm">
                 <setting key="print temperature">245</setting>
             </hotend>
@@ -100,61 +99,47 @@ Generic ABS profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_abs_175.xml.fdm_material b/generic_abs_175.xml.fdm_material
index fe4100a..1ee5b6b 100644
--- a/generic_abs_175.xml.fdm_material
+++ b/generic_abs_175.xml.fdm_material
@@ -10,22 +10,22 @@ Generic ABS 1.75mm profile. The data in this file may not be correct for your sp
             <color>Generic</color>
         </name>
         <GUID>2780b345-577b-4a24-a2c5-12e6aad3e690</GUID>
-        <version>7</version>
+        <version>10</version>
         <color_code>#8cb219</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
-        <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
+        <adhesion_info>No glue needed</adhesion_info>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>1.75</diameter>
     </properties>
     <settings>
         <setting key="print temperature">230</setting>
-        <setting key="heated bed temperature">80</setting>
         <setting key="standby temperature">200</setting>
+        <setting key="heated bed temperature">80</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">36</setting>
 
         <machine>
             <machine_identifier manufacturer="Cartesio bv" product="cartesio" />
@@ -93,5 +93,6 @@ Generic ABS 1.75mm profile. The data in this file may not be correct for your sp
             <setting key="print temperature">240</setting>
             <setting key="heated bed temperature">80</setting>
         </machine>
+
    </settings>
 </fdmmaterial>
diff --git a/generic_asa_175.xml.fdm_material b/generic_asa_175.xml.fdm_material
index b136156..1d4cf06 100644
--- a/generic_asa_175.xml.fdm_material
+++ b/generic_asa_175.xml.fdm_material
@@ -10,10 +10,10 @@ Generic ASA 1.75mm profile. The data in this file may not be correct for your sp
             <color>Generic</color>
         </name>
         <GUID>416eead4-0d8e-4f0b-8bfc-a91a519befa5</GUID>
-        <version>1</version>
+        <version>4</version>
         <color_code>#ffe92a</color_code>
-        <description>This is the baseline profile for ASA material for the Print Profile Assistant. ASA has been specially developed for industrial applications and is characterised by its high UV and weather resistance.</description>
-        <adhesion_info></adhesion_info>
+        <description>ASA combines the qualities of ABS with the added benefit of UV resistance and additional moisture resistance making it ideal for equipment exposed to sunlight and rain over long periods of time – such as products for the agriculture, transportation, and power and utility industries.</description>
+        <adhesion_info>No glue needed</adhesion_info>
     </metadata>
     <properties>
         <density>1.07</density>
@@ -21,12 +21,14 @@ Generic ASA 1.75mm profile. The data in this file may not be correct for your sp
     </properties>
     <settings>
         <setting key="print temperature">240</setting>
-        <setting key="heated bed temperature">90</setting>
         <setting key="standby temperature">200</setting>
+        <setting key="heated bed temperature">90</setting>
+        <setting key="build volume temperature">36</setting>
+        <setting key="print cooling">0</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">36</setting>
-        <setting key="print cooling">0.0</setting>
         <setting key="hardware compatible">yes</setting>
+
+
    </settings>
-</fdmmaterial>
\ No newline at end of file
+</fdmmaterial>
diff --git a/generic_bam.xml.fdm_material b/generic_bam.xml.fdm_material
index f08fb9a..fa85048 100644
--- a/generic_bam.xml.fdm_material
+++ b/generic_bam.xml.fdm_material
@@ -2,7 +2,7 @@
 <!--
 Generic break away support material profile. The data in this file may not be correct for your specific machine.
 -->
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Generic</brand>
@@ -10,7 +10,7 @@ Generic break away support material profile. The data in this file may not be co
             <color>Generic</color>
         </name>
         <GUID>7e6207c4-22ff-441a-b261-ff89f166d6a0</GUID>
-        <version>25</version>
+        <version>32</version>
         <color_code>#F1ECE1</color_code>
         <description>Breakaway Material. Breakaway is a matching support material for PLA, ABS, CPE, CPE+, and Nylon</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -41,78 +41,49 @@ Generic break away support material profile. The data in this file may not be co
 
         <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">100</setting>
         <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <!-- Define as unsoluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-            </hotend>
-            <hotend id="AA 0.8">
-                <setting key="hardware compatible">no</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="CC 0.6" />
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-            </hotend>
-            <hotend id="AA 0.8">
-                <setting key="hardware compatible">no</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
-            <hotend id="AA 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_bvoh_175.xml.fdm_material b/generic_bvoh_175.xml.fdm_material
index 98af3c3..fde18a7 100644
--- a/generic_bvoh_175.xml.fdm_material
+++ b/generic_bvoh_175.xml.fdm_material
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Generic BVOH profile. The data in this file may not be correct for your specific machine.
+Generic BVOH 1.75mm profile. The data in this file may not be correct for your specific machine.
 -->
 <fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
@@ -10,7 +10,7 @@ Generic BVOH profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>923e604c-8432-4b09-96aa-9bbbd42207f4</GUID>
-        <version>1</version>
+        <version>2</version>
         <color_code>#ffaaff</color_code>
         <description>This is the baseline profile for the Water soluble support material BVOH. BVOH is a matching support material for PLA, ABS, ASA, PET-G, Nylon, TPU.</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -20,6 +20,10 @@ Generic BVOH profile. The data in this file may not be correct for your specific
         <diameter>1.75</diameter>
     </properties>
     <settings>
+
+        <!-- Define as soluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <setting key="print temperature">205</setting>
         <setting key="standby temperature">150</setting>
         <setting key="heated bed temperature">60</setting>
diff --git a/generic_cffcpe.xml.fdm_material b/generic_cffcpe.xml.fdm_material
index 2dcb88c..32127d4 100644
--- a/generic_cffcpe.xml.fdm_material
+++ b/generic_cffcpe.xml.fdm_material
@@ -10,7 +10,7 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
             <color>Generic</color>
         </name>
         <GUID>f8e496d6-7599-4015-9fac-c7ce53f6633c</GUID>
-        <version>16</version>
+        <version>21</version>
         <color_code>#212F3D</color_code>
         <description>This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print Profile Assistant. This profile can also be used for other base materials (ABS, PP, etc)</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -20,6 +20,7 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
         <diameter>2.85</diameter>
     </properties>
     <settings>
+        <!-- Deprime settings -->
         <setting key="anti ooze retract position">-8</setting>
         <setting key="anti ooze retract speed">25</setting>
         <setting key="break preparation position">0</setting>
@@ -28,19 +29,23 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
         <setting key="break position">-50</setting>
         <setting key="break speed">25</setting>
         <setting key="break temperature">145</setting>
+
+        <!-- material station (un)loading settings -->
         <setting key="maximum park duration">7200</setting>
         <setting key="no load move factor">0.94</setting>
         <setting key="flush purge speed">0.5</setting>
         <setting key="end of filament purge speed">0.5</setting>
         <setting key="flush purge length">60</setting>
         <setting key="end of filament purge length">20</setting>
+
+        <!-- print settings -->
         <setting key="print temperature">265</setting>
+        <setting key="standby temperature">165</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -64,12 +69,12 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
@@ -78,6 +83,8 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -93,24 +100,18 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_cffpa.xml.fdm_material b/generic_cffpa.xml.fdm_material
index 87a1587..528c2c4 100644
--- a/generic_cffpa.xml.fdm_material
+++ b/generic_cffpa.xml.fdm_material
@@ -10,7 +10,7 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr
             <color>Generic</color>
         </name>
         <GUID>bd66b243-9d50-4e12-bfc3-51c874fca16a</GUID>
-        <version>16</version>
+        <version>21</version>
         <color_code>#212F3D</color_code>
         <description>This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Profile Assistant.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -20,6 +20,7 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr
         <diameter>2.85</diameter>
     </properties>
     <settings>
+        <!-- Deprime settings -->
         <setting key="anti ooze retract position">-8</setting>
         <setting key="anti ooze retract speed">25</setting>
         <setting key="break preparation position">0</setting>
@@ -28,19 +29,23 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr
         <setting key="break position">-50</setting>
         <setting key="break speed">25</setting>
         <setting key="break temperature">145</setting>
+
+        <!-- material station (un)loading settings -->
         <setting key="maximum park duration">7200</setting>
         <setting key="no load move factor">0.935</setting>
         <setting key="flush purge speed">0.5</setting>
         <setting key="end of filament purge speed">0.5</setting>
         <setting key="flush purge length">60</setting>
         <setting key="end of filament purge length">20</setting>
+
+        <!-- print settings -->
         <setting key="print temperature">265</setting>
+        <setting key="standby temperature">165</setting>
         <setting key="heated bed temperature">70</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">35</setting>
         <setting key="adhesion tendency">2</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">35</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -64,12 +69,12 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
@@ -78,6 +83,8 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -93,24 +100,18 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">1</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">1</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material
index 081919a..51d69ab 100644
--- a/generic_cpe.xml.fdm_material
+++ b/generic_cpe.xml.fdm_material
@@ -10,7 +10,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#159499</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -41,11 +41,11 @@ Generic CPE profile. The data in this file may not be correct for your specific
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -66,14 +66,10 @@ Generic CPE profile. The data in this file may not be correct for your specific
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -81,6 +77,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,46 +96,41 @@ Generic CPE profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -146,15 +138,10 @@ Generic CPE profile. The data in this file may not be correct for your specific
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_cpe_175.xml.fdm_material b/generic_cpe_175.xml.fdm_material
index 90f0201..f5e7952 100644
--- a/generic_cpe_175.xml.fdm_material
+++ b/generic_cpe_175.xml.fdm_material
@@ -10,7 +10,7 @@ Generic CPE 1.75mm profile. The data in this file may not be correct for your sp
             <color>Generic</color>
         </name>
         <GUID>da1872c1-b991-4795-80ad-bdac0f131726</GUID>
-        <version>4</version>
+        <version>5</version>
         <color_code>#159499</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -21,10 +21,10 @@ Generic CPE 1.75mm profile. The data in this file may not be correct for your sp
     </properties>
     <settings>
         <setting key="print temperature">240</setting>
-        <setting key="heated bed temperature">70</setting>
         <setting key="standby temperature">175</setting>
+        <setting key="heated bed temperature">70</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
     </settings>
 </fdmmaterial>
diff --git a/generic_cpe_plus.xml.fdm_material b/generic_cpe_plus.xml.fdm_material
index a62d607..3ac9628 100644
--- a/generic_cpe_plus.xml.fdm_material
+++ b/generic_cpe_plus.xml.fdm_material
@@ -10,7 +10,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>e2409626-b5a0-4025-b73e-b58070219259</GUID>
-        <version>28</version>
+        <version>37</version>
         <color_code>#3633F2</color_code>
         <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info>
@@ -41,12 +41,12 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
 
         <!-- print settings -->
         <setting key="print temperature">260</setting>
+        <setting key="standby temperature">160</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -58,9 +58,6 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
@@ -69,17 +66,13 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
+
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -92,67 +85,47 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <setting key="print temperature">260</setting>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
-            <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_gffcpe.xml.fdm_material b/generic_gffcpe.xml.fdm_material
index bc42baa..e987c1d 100644
--- a/generic_gffcpe.xml.fdm_material
+++ b/generic_gffcpe.xml.fdm_material
@@ -10,7 +10,7 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
             <color>Generic</color>
         </name>
         <GUID>d4b786bb-e5d2-481b-b3ab-0be976d36af8</GUID>
-        <version>16</version>
+        <version>23</version>
         <color_code>#D5D8DC</color_code>
         <description>This is the baseline profile for Glass Fiber Filled Copolyesters for the Print Profile Assistant. This profile can also be used for other base materials (ABS, PP, etc)</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -20,6 +20,7 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
         <diameter>2.85</diameter>
     </properties>
     <settings>
+        <!-- Deprime settings -->
         <setting key="anti ooze retract position">-8</setting>
         <setting key="anti ooze retract speed">25</setting>
         <setting key="break preparation position">0</setting>
@@ -28,19 +29,23 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
         <setting key="break position">-50</setting>
         <setting key="break speed">25</setting>
         <setting key="break temperature">145</setting>
-        <setting key="maximum park duration">7200</setting>
-        <setting key="no load move factor">0.94</setting>
         <setting key="flush purge speed">0.5</setting>
         <setting key="end of filament purge speed">0.5</setting>
         <setting key="flush purge length">60</setting>
         <setting key="end of filament purge length">20</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.94</setting>
+
+        <!-- print settings -->
         <setting key="print temperature">265</setting>
+        <setting key="standby temperature">165</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -64,12 +69,12 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
@@ -78,6 +83,8 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -93,24 +100,17 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_gffpa.xml.fdm_material b/generic_gffpa.xml.fdm_material
index bf89328..c21396d 100644
--- a/generic_gffpa.xml.fdm_material
+++ b/generic_gffpa.xml.fdm_material
@@ -10,7 +10,7 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro
             <color>Generic</color>
         </name>
         <GUID>837cf11b-6b1e-48dc-94dc-4a2b4888648e</GUID>
-        <version>16</version>
+        <version>23</version>
         <color_code>#D5D8DC</color_code>
         <description>This is the baseline profile for Glass Fiber Filled Polyamides for the Print Profile Assistant.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -20,6 +20,7 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro
         <diameter>2.85</diameter>
     </properties>
     <settings>
+        <!-- Deprime settings -->
         <setting key="anti ooze retract position">-8</setting>
         <setting key="anti ooze retract speed">25</setting>
         <setting key="break preparation position">0</setting>
@@ -28,19 +29,23 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro
         <setting key="break position">-50</setting>
         <setting key="break speed">25</setting>
         <setting key="break temperature">145</setting>
-        <setting key="maximum park duration">7200</setting>
-        <setting key="no load move factor">0.935</setting>
         <setting key="flush purge speed">0.5</setting>
         <setting key="end of filament purge speed">0.5</setting>
         <setting key="flush purge length">60</setting>
         <setting key="end of filament purge length">20</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.935</setting>
+
+        <!-- print settings -->
         <setting key="print temperature">265</setting>
+        <setting key="standby temperature">165</setting>
         <setting key="heated bed temperature">70</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">35</setting>
         <setting key="adhesion tendency">2</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">35</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -64,12 +69,12 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">50</setting>
                 <setting key="retraction amount">6.5</setting>
@@ -78,6 +83,8 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -93,24 +100,18 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro
             <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">1</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">1</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_hips.xml.fdm_material b/generic_hips.xml.fdm_material
index a93b308..d96033d 100644
--- a/generic_hips.xml.fdm_material
+++ b/generic_hips.xml.fdm_material
@@ -2,7 +2,7 @@
 <!--
 Generic HIPS profile. The data in this file may not be correct for your specific machine.
 -->
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Generic</brand>
@@ -10,14 +10,17 @@ Generic HIPS profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>b6f76172-bb0f-4326-bdbc-ee8f0e84b283</GUID>
-        <version>8</version>
+        <version>12</version>
         <color_code>#12f3e0</color_code>
+        <description>Support material.</description>
+        <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
     </metadata>
     <properties>
         <density>1.24</density>
         <diameter>2.85</diameter>
     </properties>
     <settings>
+        <!-- Deprime settings -->
         <setting key="anti ooze retract position">-8</setting>
         <setting key="anti ooze retract speed">25</setting>
         <setting key="break preparation position">0</setting>
@@ -32,13 +35,19 @@ Generic HIPS profile. The data in this file may not be correct for your specific
         <setting key="end of filament purge speed">0.5</setting>
         <setting key="flush purge length">60</setting>
         <setting key="end of filament purge length">20</setting>
+
+        <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">160</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
+
+        <!-- Define as soluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
   </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_hips_175.xml.fdm_material b/generic_hips_175.xml.fdm_material
index 9ddb234..7db37a3 100644
--- a/generic_hips_175.xml.fdm_material
+++ b/generic_hips_175.xml.fdm_material
@@ -2,7 +2,7 @@
 <!--
 Generic HIPS 1.75mm profile. The data in this file may not be correct for your specific machine.
 -->
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Generic</brand>
@@ -10,17 +10,23 @@ Generic HIPS 1.75mm profile. The data in this file may not be correct for your s
             <color>Generic</color>
         </name>
         <GUID>a468d86a-220c-47eb-99a5-bbb47e514eb0</GUID>
-        <version>2</version>
+        <version>5</version>
         <color_code>#12f3e0</color_code>
+        <description>Support material.</description>
+        <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
     </metadata>
     <properties>
         <density>1.24</density>
         <diameter>1.75</diameter>
     </properties>
     <settings>
+        <!-- print settings -->
         <setting key="print temperature">215</setting>
-        <setting key="heated bed temperature">60</setting>
         <setting key="standby temperature">160</setting>
+        <setting key="heated bed temperature">60</setting>
+
+        <!-- Define as soluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
 
         <machine>
             <machine_identifier manufacturer="Cartesio bv" product="cartesio" />
@@ -41,6 +47,7 @@ Generic HIPS 1.75mm profile. The data in this file may not be correct for your s
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">1.5</setting>
             </hotend>
-       </machine>
+        </machine>
+
     </settings>
 </fdmmaterial>
diff --git a/generic_nylon.xml.fdm_material b/generic_nylon.xml.fdm_material
index c541d39..09cc99a 100644
--- a/generic_nylon.xml.fdm_material
+++ b/generic_nylon.xml.fdm_material
@@ -10,7 +10,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
             <color>Generic</color>
         </name>
         <GUID>28fb4162-db74-49e1-9008-d05f1e8bef5c</GUID>
-        <version>25</version>
+        <version>31</version>
         <color_code>#3DF266</color_code>
         <description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -41,14 +41,14 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
 
         <!-- print settings -->
         <setting key="print temperature">245</setting>
+        <setting key="standby temperature">145</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">35</setting>
         <setting key="retraction amount">8</setting>
         <setting key="retraction speed">25</setting>
         <setting key="adhesion tendency">2</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">35</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -69,12 +69,11 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">40</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <setting key="heated bed temperature">40</setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -109,63 +108,49 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">40</setting>
+            <setting key="heated bed temperature">40</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">40</setting>
+            <setting key="heated bed temperature">40</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_nylon_175.xml.fdm_material b/generic_nylon_175.xml.fdm_material
index b9d6ccc..7a55887 100644
--- a/generic_nylon_175.xml.fdm_material
+++ b/generic_nylon_175.xml.fdm_material
@@ -10,7 +10,7 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your
             <color>Generic</color>
         </name>
         <GUID>283d439a-3490-4481-920c-c51d8cdecf9c</GUID>
-        <version>5</version>
+        <version>7</version>
         <color_code>#3DF266</color_code>
         <description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -21,14 +21,14 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your
     </properties>
     <settings>
         <setting key="print temperature">245</setting>
-        <setting key="heated bed temperature">60</setting>
         <setting key="standby temperature">175</setting>
+        <setting key="heated bed temperature">60</setting>
+        <setting key="build volume temperature">35</setting>
         <setting key="retraction amount">8</setting>
         <setting key="retraction speed">25</setting>
         <setting key="adhesion tendency">2</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">35</setting>
 
         <machine>
             <machine_identifier manufacturer="Cartesio bv" product="cartesio" />
@@ -49,6 +49,8 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">1.5</setting>
             </hotend>
-       </machine>
+        </machine>
+
+
     </settings>
 </fdmmaterial>
diff --git a/generic_pc.xml.fdm_material b/generic_pc.xml.fdm_material
index 34b3453..447cd2e 100644
--- a/generic_pc.xml.fdm_material
+++ b/generic_pc.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <color>Generic</color>
         </name>
         <GUID>98c05714-bf4e-4455-ba27-57d74fe331e4</GUID>
-        <version>27</version>
+        <version>34</version>
         <color_code>#F29030</color_code>
         <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>
@@ -41,18 +41,18 @@ Generic PC profile. The data in this file may not be correct for your specific m
 
         <!-- print settings -->
         <setting key="print temperature">270</setting>
+        <setting key="standby temperature">170</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
-
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
@@ -68,11 +68,8 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -85,7 +82,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-        </machine>
+         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
@@ -101,12 +98,8 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -122,14 +115,12 @@ Generic PC profile. The data in this file may not be correct for your specific m
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -142,14 +133,6 @@ Generic PC profile. The data in this file may not be correct for your specific m
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
 
         <machine>
@@ -171,6 +154,8 @@ Generic PC profile. The data in this file may not be correct for your specific m
                <setting key="hardware compatible">yes</setting>
                <setting key="retraction amount">1.5</setting>
            </hotend>
-       </machine>
+        </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_pc_175.xml.fdm_material b/generic_pc_175.xml.fdm_material
index 0318e89..7b3c6a6 100644
--- a/generic_pc_175.xml.fdm_material
+++ b/generic_pc_175.xml.fdm_material
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Generic PC profile. The data in this file may not be correct for your specific machine.
+Generic PC 1.75mm profile. The data in this file may not be correct for your specific machine.
 -->
 <fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
     <metadata>
@@ -10,7 +10,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <color>Generic</color>
         </name>
         <GUID>62414577-94d1-490d-b1e4-7ef3ec40db02</GUID>
-        <version>4</version>
+        <version>5</version>
         <color_code>#F29030</color_code>
         <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>
@@ -21,9 +21,10 @@ Generic PC profile. The data in this file may not be correct for your specific m
     </properties>
     <settings>
         <setting key="print temperature">270</setting>
-        <setting key="heated bed temperature">107</setting>
         <setting key="standby temperature">175</setting>
+        <setting key="heated bed temperature">107</setting>
         <setting key="build volume temperature">41</setting>
+        <setting key="print cooling">0</setting>
 
         <machine>
             <machine_identifier manufacturer="Cartesio bv" product="cartesio" />
@@ -45,5 +46,6 @@ Generic PC profile. The data in this file may not be correct for your specific m
                 <setting key="retraction amount">1.5</setting>
             </hotend>
         </machine>
+
     </settings>
 </fdmmaterial>
diff --git a/generic_petcf.xml.fdm_material b/generic_petcf.xml.fdm_material
new file mode 100644
index 0000000..bee7052
--- /dev/null
+++ b/generic_petcf.xml.fdm_material
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Generic PET-CF profile. The data in this file may not be correct for your specific machine.
+-->
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>Generic</brand>
+            <material>PET CF</material>
+            <color>Generic</color>
+        </name>
+        <GUID>64d44410-be10-428c-8891-f0ae47ea1734</GUID>
+        <version>23</version>
+        <color_code>#888888</color_code>
+        <description>Generic PET CF profile. The data in this file may not be correct for your specific machine.</description>
+        <adhesion_info>Print on bare glass.</adhesion_info>
+        <cura:pva_compatible>True</cura:pva_compatible>
+        <cura:breakaway_compatible>True</cura:breakaway_compatible>
+    </metadata>
+    <properties>
+        <density>1.39</density>
+        <diameter>2.85</diameter>
+    </properties>
+    <settings>
+        <!-- Deprime settings -->
+        <setting key="anti ooze retract position">-16</setting>
+        <setting key="anti ooze retract speed">50</setting>
+        <setting key="break preparation position">-16</setting>
+        <setting key="break preparation speed">50</setting>
+        <setting key="break preparation temperature">265</setting>
+        <setting key="break position">-50</setting>
+        <setting key="break speed">50</setting>
+        <setting key="break temperature">265</setting>
+        <setting key="pressure release dwell time">50</setting>
+        <setting key="dwell time before break preparation move">0</setting>
+        <setting key="end of print purge volume">0</setting>
+        <setting key="end of filament purge volume">0</setting>
+        <setting key="flush purge length">60</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.94</setting>
+
+        <!-- print settings -->
+        <setting key="print temperature">270</setting>
+        <setting key="standby temperature">165</setting>
+        <setting key="heated bed temperature">80</setting>
+        <setting key="build volume temperature">37</setting>
+        <setting key="print cooling">10</setting>
+        <setting key="retraction amount">10</setting>
+        <setting key="adhesion tendency">1</setting>
+        <setting key="surface energy">100</setting>
+        <cura:setting key="material_flow">95</cura:setting>
+
+        <!-- For material flow sensor -->
+        <setting key="relative extrusion">1.0</setting>
+        <setting key="flow sensor detection margin">0.8</setting>
+        <setting key="retract compensation">0</setting>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+
+    </settings>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_petg.xml.fdm_material b/generic_petg.xml.fdm_material
index 6c579ff..c1bd57f 100644
--- a/generic_petg.xml.fdm_material
+++ b/generic_petg.xml.fdm_material
@@ -10,12 +10,12 @@ Generic PETG profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>1cbfaeb3-1906-4b26-b2e7-6f777a8c197a</GUID>
-        <version>14</version>
+        <version>23</version>
         <color_code>#ff5086</color_code>
         <description>Generic PETG profile. The data in this file may not be correct for your specific machine.</description>
         <adhesion_info>Use glue.</adhesion_info>
     </metadata>
-<properties>
+    <properties>
         <density>1.27</density>
         <diameter>2.85</diameter>
     </properties>
@@ -41,11 +41,11 @@ Generic PETG profile. The data in this file may not be correct for your specific
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -61,6 +61,7 @@ Generic PETG profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -74,41 +75,35 @@ Generic PETG profile. The data in this file may not be correct for your specific
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -118,36 +113,31 @@ Generic PETG profile. The data in this file may not be correct for your specific
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
 </fdmmaterial>
\ No newline at end of file
diff --git a/generic_petg_175.xml.fdm_material b/generic_petg_175.xml.fdm_material
index 99e11b6..3b6d1e7 100644
--- a/generic_petg_175.xml.fdm_material
+++ b/generic_petg_175.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s
             <color>Generic</color>
         </name>
         <GUID>69386c85-5b6c-421a-bec5-aeb1fb33f060</GUID>
-        <version>3</version>
+        <version>5</version>
         <color_code>#f3a112</color_code>
         <description>Generic PETG profile. The data in this file may not be correct for your specific machine.</description>
         <adhesion_info>Set your prime speed to a low value (8mm/sec)</adhesion_info>
@@ -44,7 +44,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s
                 <setting key="retraction amount">1.5</setting>
             </hotend>
         </machine>
-        
+
         <machine>
             <machine_identifier manufacturer="CreawsomeMod" product="creality_base" />
             <machine_identifier manufacturer="Creality3D" product="creality_cr10" />
@@ -65,7 +65,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s
             <setting key="retraction amount">5</setting>
             <setting key="print temperature">240</setting>
         </machine>
-        <machine>
+       <machine>
             <machine_identifier manufacturer="Tronxy" product="tronxy_x" />
             <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa" />
             <machine_identifier manufacturer="Tronxy" product="tronxy_x5sa_400" />
@@ -80,5 +80,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s
             <setting key="print temperature">230</setting>
             <setting key="heated bed temperature">80</setting>
         </machine>
+
+
     </settings>
 </fdmmaterial>
diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material
index 90dc470..5ea9252 100644
--- a/generic_pla.xml.fdm_material
+++ b/generic_pla.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PLA profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID>
-        <version>25</version>
+        <version>34</version>
         <color_code>#ffc924</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -41,11 +41,12 @@ Generic PLA profile. The data in this file may not be correct for your specific
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -66,7 +67,6 @@ Generic PLA profile. The data in this file may not be correct for your specific
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -75,18 +75,14 @@ Generic PLA profile. The data in this file may not be correct for your specific
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -95,6 +91,7 @@ Generic PLA profile. The data in this file may not be correct for your specific
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -112,27 +109,17 @@ Generic PLA profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -140,31 +127,30 @@ Generic PLA profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -172,17 +158,22 @@ Generic PLA profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_pla_175.xml.fdm_material b/generic_pla_175.xml.fdm_material
index 488a6f1..c87ff59 100644
--- a/generic_pla_175.xml.fdm_material
+++ b/generic_pla_175.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp
             <color>Generic</color>
         </name>
         <GUID>0ff92885-617b-4144-a03c-9989872454bc</GUID>
-        <version>8</version>
+        <version>10</version>
         <color_code>#ffc924</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -21,11 +21,12 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp
     </properties>
     <settings>
         <setting key="print temperature">200</setting>
-        <setting key="heated bed temperature">60</setting>
         <setting key="standby temperature">175</setting>
+        <setting key="heated bed temperature">60</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <machine>
             <machine_identifier manufacturer="BIQU" product="biqu_b1" />
@@ -128,12 +129,13 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp
             <setting key="heated bed temperature">50</setting>
         </machine>
 
-	<machine>
+        <machine>
             <machine_identifier manufacturer="IMADE3D" product="IMADE3D JellyBOX"/>
             <setting key="print temperature">210</setting>
             <setting key="heated bed temperature">55</setting>
             <hotend id="0.4 mm" />
         </machine>
 
+
     </settings>
 </fdmmaterial>
diff --git a/generic_pp.xml.fdm_material b/generic_pp.xml.fdm_material
index 8646405..4b615f9 100644
--- a/generic_pp.xml.fdm_material
+++ b/generic_pp.xml.fdm_material
@@ -10,14 +10,14 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <color>Generic</color>
         </name>
         <GUID>aa22e9c7-421f-4745-afc2-81851694394a</GUID>
-        <version>28</version>
+        <version>41</version>
         <color_code>#85f9de</color_code>
         <description>Fatigue and chemical resistant. Polypropylene offers excellent temperature, chemical and fatigue resistance. Its toughness and low friction make it a perfect choice for prototyping and creating durable end-use models.</description>
         <adhesion_info>Adhesion sheets are required.</adhesion_info>
     </metadata>
     <properties>
-        <diameter>2.85</diameter>
         <density>0.89</density>
+        <diameter>2.85</diameter>
     </properties>
     <settings>
         <!-- Deprime settings -->
@@ -41,13 +41,14 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
 
         <!-- print settings -->
         <setting key="print temperature">220</setting>
+        <setting key="standby temperature">120</setting>
         <setting key="heated bed temperature">100</setting>
-        <setting key="standby temperature">185</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="print cooling">20</setting>
         <setting key="retraction speed">35</setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">41</setting>
+        <cura:setting key="adhesion_type">brim</cura:setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,9 +61,6 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
 
             <setting key="retraction amount">8</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
@@ -72,12 +70,9 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">25</setting>
             </hotend>
@@ -89,6 +84,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">10</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -97,9 +93,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <setting key="hardware compatible">yes</setting>
             <setting key="retraction amount">8</setting>
             <setting key="retraction speed">25</setting>
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
+
             <hotend id="0.4 mm">
                 <setting key="print temperature">220</setting>
             </hotend>
@@ -108,6 +102,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -115,12 +110,8 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
@@ -132,19 +123,17 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">10</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
@@ -156,15 +145,10 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">10</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_pva.xml.fdm_material b/generic_pva.xml.fdm_material
index 4c8812a..b6dc2ff 100644
--- a/generic_pva.xml.fdm_material
+++ b/generic_pva.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PVA profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>86a89ceb-4159-47f6-ab97-e9953803d70f</GUID>
-        <version>26</version>
+        <version>33</version>
         <color_code>#a32bcc</color_code>
         <description>Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon.</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -41,16 +41,20 @@ Generic PVA profile. The data in this file may not be correct for your specific
 
         <!-- print settings -->
         <setting key="print temperature">215</setting>
+        <setting key="standby temperature">115</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
-        <cura:setting key="material_crystallinity">true</cura:setting>
         <setting key="build volume temperature">35</setting>
+        <cura:setting key="material_crystallinity">true</cura:setting>
+        <cura:setting key="raft_airgap">0</cura:setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <!-- Define as soluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original+"/>
@@ -91,22 +95,27 @@ Generic PVA profile. The data in this file may not be correct for your specific
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
             <hotend id="CC 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="CC 0.6">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.4">
-                <setting key="hardware compatible">yes</setting>
-            </hotend>
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">yes</setting>
+            <hotend id="DD 0.4">
+                <setting key="hardware compatible">no</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -128,14 +137,9 @@ Generic PVA profile. The data in this file may not be correct for your specific
             <hotend id="CC 0.6">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+            <hotend id="DD 0.4">
                 <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+            </hotend>
         </machine>
 
         <machine>
@@ -158,5 +162,7 @@ Generic PVA profile. The data in this file may not be correct for your specific
                 <setting key="retraction amount">1.5</setting>
             </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_pva_175.xml.fdm_material b/generic_pva_175.xml.fdm_material
index 70d1840..7afa608 100644
--- a/generic_pva_175.xml.fdm_material
+++ b/generic_pva_175.xml.fdm_material
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Generic PVA profile. The data in this file may not be correct for your specific machine.
+Generic PVA 1.75mm profile. The data in this file may not be correct for your specific machine.
 -->
 <fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
@@ -10,7 +10,7 @@ Generic PVA profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>a4255da2-cb2a-4042-be49-4a83957a2f9a</GUID>
-        <version>5</version>
+        <version>7</version>
         <color_code>#a32bcc</color_code>
         <description>Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon.</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -20,10 +20,14 @@ Generic PVA profile. The data in this file may not be correct for your specific
         <diameter>1.75</diameter>
     </properties>
     <settings>
+        <!-- print settings -->
         <setting key="print temperature">215</setting>
         <setting key="standby temperature">175</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
 
+        <!-- Define as soluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <machine>
             <machine_identifier manufacturer="Cartesio bv" product="cartesio" />
             <setting key="print cooling">0.0</setting>
@@ -44,5 +48,7 @@ Generic PVA profile. The data in this file may not be correct for your specific
                 <setting key="retraction amount">1.5</setting>
             </hotend>
         </machine>
+
+
     </settings>
 </fdmmaterial>
diff --git a/generic_tough_pla.xml.fdm_material b/generic_tough_pla.xml.fdm_material
index 9101461..037cc46 100644
--- a/generic_tough_pla.xml.fdm_material
+++ b/generic_tough_pla.xml.fdm_material
@@ -2,7 +2,7 @@
 <!--
 Generic Tough PLA profile. The data in this file may not be correct for your specific machine.
 -->
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Generic</brand>
@@ -10,7 +10,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
             <color>Generic</color>
         </name>
         <GUID>9d5d2d7c-4e77-441c-85a0-e9eefd4aa68c</GUID>
-        <version>19</version>
+        <version>29</version>
         <color_code>#ffc9f0</color_code>
         <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -41,11 +41,12 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
 
         <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">24</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -56,11 +57,9 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -69,6 +68,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -86,18 +86,17 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -105,19 +104,20 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -125,17 +125,11 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_tpu.xml.fdm_material b/generic_tpu.xml.fdm_material
index 5dd4281..2788d20 100644
--- a/generic_tpu.xml.fdm_material
+++ b/generic_tpu.xml.fdm_material
@@ -10,7 +10,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <color>Generic</color>
         </name>
         <GUID>1d52b2be-a3a2-41de-a8b1-3bcdb5618695</GUID>
-        <version>28</version>
+        <version>34</version>
         <color_code>#B22744</color_code>
         <description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -30,7 +30,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
         <setting key="break speed">25</setting>
         <setting key="break temperature">195</setting>
         <setting key="pressure release dwell time">25</setting>
-        <setting key="dwell time before break preparation move">0</setting> 
+        <setting key="dwell time before break preparation move">0</setting>
         <setting key="end of print purge volume">0</setting>
         <setting key="end of filament purge volume">0</setting>
         <setting key="flush purge length">60</setting>
@@ -41,12 +41,12 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
 
         <!-- print settings -->
         <setting key="print temperature">228</setting>
+        <setting key="standby temperature">128</setting>
         <setting key="heated bed temperature">0</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">27</setting>
         <setting key="adhesion tendency">3</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">27</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -71,15 +71,11 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction speed">35</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -95,7 +91,9 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <setting key="retraction amount">10</setting>
 
             <hotend id="0.25 mm" />
-            <hotend id="0.4 mm" />
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">240</setting>
             </hotend>
@@ -108,15 +106,10 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -127,18 +120,15 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction amount">8</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -146,14 +136,8 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
                 <setting key="retraction speed">45</setting>
                 <setting key="print cooling">50</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/generic_tpu_175.xml.fdm_material b/generic_tpu_175.xml.fdm_material
index 3542bdd..70354de 100644
--- a/generic_tpu_175.xml.fdm_material
+++ b/generic_tpu_175.xml.fdm_material
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Generic TPU 95A profile. The data in this file may not be correct for your specific machine.
+Generic TPU 95A 1.75mm profile. The data in this file may not be correct for your specific machine.
 -->
 <fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
@@ -10,7 +10,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <color>Generic</color>
         </name>
         <GUID>19baa6a9-94ff-478b-b4a1-8157b74358d2</GUID>
-        <version>11</version>
+        <version>12</version>
         <color_code>#B22744</color_code>
         <description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -21,11 +21,12 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
     </properties>
     <settings>
         <setting key="print temperature">228</setting>
-        <setting key="heated bed temperature">0</setting>
         <setting key="standby temperature">175</setting>
+        <setting key="heated bed temperature">0</setting>
+        <setting key="build volume temperature">27</setting>
         <setting key="adhesion tendency">3</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">27</setting>
      </settings>
+
 </fdmmaterial>
diff --git a/ideagen3D_ToughPLA.xml.fdm_material b/ideagen3D_ToughPLA.xml.fdm_material
new file mode 100644
index 0000000..4f384c2
--- /dev/null
+++ b/ideagen3D_ToughPLA.xml.fdm_material
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+  <metadata>
+    <name>
+      <brand>ideagen3D</brand>
+      <material>Tough PLA</material>
+      <color>Black</color>
+      <label>ToughPLA</label>
+    </name>
+    <version>1</version>
+    <color_code>#333333</color_code>
+    <GUID>e0825104-a855-407d-a58d-a67a8ed7c24b</GUID>
+    <adhesion_info />
+    <description />
+  </metadata>
+  <properties>
+    <diameter>1.75</diameter>
+    <density>1.24</density>
+    <weight>1000</weight>
+  </properties>
+  <settings>
+    <setting key="standby temperature">195.0</setting>
+    <setting key="print cooling">100.0</setting>
+    <setting key="retraction amount">3.0</setting>
+    <setting key="print temperature">210.0</setting>
+    <setting key="heated bed temperature">60.0</setting>
+    <setting key="retraction speed">45.0</setting>
+  </settings>
+</fdmmaterial>
diff --git a/run_check_material_profiles.sh b/run_check_material_profiles.sh
new file mode 100755
index 0000000..54c822d
--- /dev/null
+++ b/run_check_material_profiles.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -eu
+
+. ./make_docker.sh
+
+run_in_docker python3 scripts/check_material_profiles.py || echo "Failed!"
+
+exit 0
diff --git a/run_check_material_profiles_new_with_lxml.sh b/run_check_material_profiles_new_with_lxml.sh
deleted file mode 100755
index c58103a..0000000
--- a/run_check_material_profiles_new_with_lxml.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-. ./make_docker.sh
-
-run_in_docker python3 scripts/check_material_profiles_new_with_lxml.py || echo "Failed!"
-
-exit 0
\ No newline at end of file
diff --git a/scripts/check_material_profiles.py b/scripts/check_material_profiles.py
index 43120c5..0f19104 100755
--- a/scripts/check_material_profiles.py
+++ b/scripts/check_material_profiles.py
@@ -1,89 +1,160 @@
-# This script is dedicated to the public domain under the terms of the CC0 license.
+#!/usr/bin/env python3
+"""
+Validation for `*.xml.fdm_material` Material Profile files, based on an XML Schema
+Definition.
 
-from collections import OrderedDict
+This script is dedicated to the public domain under the terms of the CC0 license.
+"""
+
+import logging
 import os
+from pathlib import Path
 import sys
-import re
-from typing import Optional
+from typing import Dict, Iterable, Optional, List
 
+from lxml import etree
 
-class MaterialProfilesValidator:
 
-    def __init__(self, root_dir: str) -> None:
-        self._repo_dir = os.path.abspath(root_dir)
-        self._materials_dir = self._repo_dir
-
-        self._guid_pattern = re.compile(r"<GUID>.*</GUID>")
-
-    def _get_guid(self, content: str) -> Optional[str]:
-        guid = None
-        for line in content.splitlines():
-            line = line.strip()
-            if self._guid_pattern.match(line):
-                guid = line.strip("<GUID>").strip("</GUID>")
-                break
-        return guid
-
-    def get_materials_dir(self, dirpath: str) -> str:
-        for root_dir, dirnames, filenames in os.walk(dirpath):
-            has_materials_file = any(fn.endswith(".xml.fdm_material") for fn in filenames)
-            if not has_materials_file:
-                for dirname in dirnames:
-                    full_dir_path = os.path.join(root_dir, dirname)
-                    return self.get_materials_dir(full_dir_path)
-
-            return dirpath
-
-    ##  Validates the preset settings files and returns ``True`` or ``False``
-    #   indicating whether there are invalid files.
-    def validate(self) -> bool:
-        # parse the definition file
-        guid_dict = OrderedDict()
-
-        materials_dir = self.get_materials_dir(self._materials_dir)
-
-        # go through all the preset settings files
-        for _, _, filenames in os.walk(materials_dir):
-            for filename in filenames:
-                file_path = os.path.join(materials_dir, filename)
-                if not filename.endswith(".xml.fdm_material"):
-                    continue
-
-                with open(file_path, "r", encoding = "utf-8") as f:
-                    content = f.read()
-
-                guid = self._get_guid(content)
-                if guid not in guid_dict:
-                    guid_dict[guid] = []
-
-                item_list = guid_dict[guid]
-                item_list.append({"file_name": filename,
-                                  "file_path": file_path})
-            break
-
-        has_invalid_files = False
-        for guid, file_item_list in guid_dict.items():
-            if len(file_item_list) <= 1:
-                continue
-            has_invalid_files = True
-
-            if guid is not None:
-                print("-> The following files contain the same GUID [%s]:" % guid)
-            else:
-                print("-> The following files DO NOT contain any GUID:")
-            for file_item in file_item_list:
-                print("    -- [%s]" % file_item["file_name"])
-            print("-> PLEASE make sure to generate unique GUIDs for each material.")
-
-        return not has_invalid_files
+NAMESPACES = {
+    "um": "http://www.ultimaker.com/material",
+    "cura": "http://www.ultimaker.com/cura",
+}
 
 
-if __name__ == "__main__":
-    script_dir = os.path.dirname(os.path.realpath(__file__))
-    root_dir = os.path.abspath(os.path.join(script_dir, ".."))
+class MaterialProfile:
+
+    def __init__(self, document: etree.Element, filename: Optional[Path]) -> None:
+        self.document = document
+        self.filename = filename
+
+    @classmethod
+    def fromFile(cls, p: Path) -> 'MaterialProfile':
+        with p.open("rb") as f:
+            return cls(etree.fromstring(f.read()), p)
+
+    @property
+    def brand(self) -> Optional[str]:
+        """Get the material brand name from the given lxml.etree root node.
 
-    validator = MaterialProfilesValidator(root_dir)
-    is_everything_validate = validator.validate()
+        @returns None if the brand cannot be found, otherwise the brand text.
+        """
+        node = self.document.xpath("./um:metadata/um:name/um:brand", namespaces=NAMESPACES)
+        return node[0].text if node else None
 
-    ret_code = 0 if is_everything_validate else 1
-    sys.exit(ret_code)
+    @property
+    def guid(self) -> Optional[str]:
+        node = self.document.xpath("./um:metadata/um:GUID", namespaces=NAMESPACES)
+        return node[0].text if node else None
+
+
+class MaterialProfilesValidator:
+    """Material Profile validator that validates against an XML Schema"""
+
+    class ValidationError(Exception):
+        pass
+
+    def __init__(self, xsd_file: Path) -> None:
+        self._schema = self.loadSchema(xsd_file)
+        self._guids_seen: Dict[str, Path] = dict()
+
+    @staticmethod
+    def loadSchema(xsd_file: Path) -> etree.XMLSchema:
+        xmlschema_doc = etree.parse(str(xsd_file))
+        return etree.XMLSchema(xmlschema_doc)
+
+    def validate(self, profile: MaterialProfile) -> None:
+        """Validate the given material profile file against the XML schema, plus additional rules
+
+        Additional rules:
+        - Only material profile files whose name starts with "generic_" are allowed to have
+          their brand set to "Generic".
+        - The GUID in each profile should be unique; no other profiles can use the same GUID.
+
+        @raises ValidationError if any problems are found.
+        """
+        # Validate the file content with the XSD file.
+        try:
+            self._schema.assertValid(profile.document)
+        except etree.DocumentInvalid as e:
+            raise self.ValidationError(f"{profile.filename} is not a valid FDM Material file:\n{e}")
+
+        # Make sure that only the material files such as "generic_<bla>" can have brand "Generic".
+        brand = profile.brand
+        if brand is None:
+            raise self.ValidationError(f"{profile.filename} is missing '<brand>' information")
+        elif len(brand) == 0:
+            raise self.ValidationError(f"{profile.filename} contains empty '<brand>' information")
+        elif brand.lower() == "generic" and not profile.filename.name.lower().startswith("generic_"):
+            raise self.ValidationError(
+                f"{profile.filename} contains a 'generic' brand, but only material profiles with a "
+                f"filename that starts with 'generic_' are allowed to have a generic brand set.")
+
+        # Check that we haven't seen this GUID before.
+        guid = profile.guid
+        if not guid:
+            raise self.ValidationError(f"{profile.filename} is missing '<GUID>' information")
+        if guid in self._guids_seen and self._guids_seen.get(guid) != profile.filename:
+            raise self.ValidationError(
+                f"{profile.filename} has duplicate GUID '{guid}', the same GUID is also "
+                f"used by: {self._guids_seen[guid]}")
+        self._guids_seen[guid] = profile.filename
+
+
+def validateFiles(xsd_file: Path, files_to_check: Iterable[Path]) -> bool:
+    """Validate a given list of FDM material profile files using the given XSD schema file
+
+    @returns Whether all files were validated successfully
+    """
+    validator = MaterialProfilesValidator(xsd_file)
+
+    n_success, n_fail = 0, 0
+
+    for f in files_to_check:
+        try:
+            logging.info(f"Checking {f.name}")
+            profile = MaterialProfile.fromFile(f)
+            validator.validate(profile)
+        except etree.XMLSyntaxError as e:
+            logging.error(f"{f} is not a valid XML file:\n{e}")
+            n_fail += 1
+        except MaterialProfilesValidator.ValidationError as e:
+            logging.error(str(e))
+            n_fail += 1
+        else:
+            n_success += 1
+
+    logging.info(f"Checked {n_success + n_fail} file(s): {n_success} OK, {n_fail} error(s)")
+    return (n_fail == 0)
+
+
+def main():
+    import argparse
+
+    SCRIPT_DIR = Path(__file__).parent.resolve()
+    PROJECT_DIR = SCRIPT_DIR.parent
+
+    parser = argparse.ArgumentParser(
+        description="Validator for Material Profile (*.xml.fdm_material) files")
+    parser.add_argument("-x", "--xsd", default=(SCRIPT_DIR / "fdmmaterial.xsd"),
+                        help="XML Schema Definition file to use for validation (default: fdmmaterial.xsd)")
+    parser.add_argument("file", metavar="FILE", nargs="*",
+                        help="One or more *.xml.fdm_material files to check. Default: all files in project root.")
+    parser.add_argument("-v", "--verbose", action="store_true",
+                        help="Increase output verbosity.")
+    args = parser.parse_args()
+
+    logging.basicConfig(
+        format="%(levelname)s %(message)s",
+        level=(logging.INFO if args.verbose else logging.WARNING))
+
+    if args.file:
+        files_to_check = [Path(_) for _ in args.file]
+    else:
+        files_to_check = sorted(list(PROJECT_DIR.glob("*.fdm_material")))
+
+    success = validateFiles(args.xsd, files_to_check)
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/check_material_profiles_new_with_lxml.py b/scripts/check_material_profiles_new_with_lxml.py
deleted file mode 100755
index 2052ab1..0000000
--- a/scripts/check_material_profiles_new_with_lxml.py
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/usr/bin/env python3
-# This script is dedicated to the public domain under the terms of the CC0 license.
-
-import os
-import sys
-import re
-from typing import Dict, Optional, List
-
-from lxml import etree
-
-
-##  This is a material profile validator that works with the lxml library.
-#
-#   This version is currently unused on our CI server because it was difficult
-#   to install lxml on that server. We store it here only as a back-up for when
-#   we migrate to a different CI system.
-class MaterialProfilesValidator:
-
-    __namespaces = {
-        "um": "http://www.ultimaker.com/material",
-        "cura": "http://www.ultimaker.com/cura",
-    }
-
-    def __init__(self) -> None:
-        self._guid_pattern = re.compile(r"<GUID>.*</GUID>")
-
-    def _getGuid(self, content: str) -> str:
-        guid = None
-        for line in content.splitlines():
-            line = line.strip()
-            if self._guid_pattern.match(line):
-                guid = line.strip("<GUID>").strip("</GUID>")
-                break
-        return guid
-
-    def _getMaterialsDir(self, dirpath: str) -> str:
-        for root_dir, dirnames, filenames in os.walk(dirpath):
-            has_materials_file = any(fn.endswith(".xml.fdm_material") for fn in filenames)
-            if not has_materials_file:
-                for dirname in dirnames:
-                    full_dir_path = os.path.join(root_dir, dirname)
-                    return self._getMaterialsDir(full_dir_path)
-
-            return dirpath
-
-    #   Find all material files in a given directory.
-    #   This returns a dictionary with filename as keys and it's loaded content as value.
-    def _getAllMaterialsContentsInDir(self, directory: str) -> Dict[str, Dict[str, str]]:
-        result = {}  # type: Dict[str, Dict[str, str]]
-        for _, _, filenames in os.walk(directory):
-            for filename in filenames:
-                file_path = os.path.join(directory, filename)
-                if not filename.endswith(".xml.fdm_material"):
-                    continue
-
-                result[filename] = {"content": "",
-                                    "error": ""}
-                try:
-                    with open(file_path, "r", encoding = "utf-8") as f:
-                        result[filename]["content"] = f.read()
-                except Exception as e:
-                    print("Failed to read file [%s] : %s", filename, e)
-                    result[filename]["error"] = str(e)
-            break
-        return result
-
-    # Gets the material brand name from the given lxml.etree root node. Return None if the brand cannot be found,
-    # otherwise the brand text.
-    def _getMaterialBrandName(self, root_node: "etree.Element") -> Optional[str]:
-        node = root_node.xpath("./um:metadata/um:name/um:brand", namespaces = self.__namespaces)
-        if not node:
-            return None
-
-        return node[0].text
-
-    def validateAll(self, repo_root_dir: str) -> bool:
-        repo_root_dir = os.path.abspath(repo_root_dir)
-
-        materials_dir = self._getMaterialsDir(repo_root_dir)
-        fdmmaterial_xsd_file_path = os.path.join(repo_root_dir, "scripts", "fdmmaterial.xsd")
-
-        material_content_dict = self._getAllMaterialsContentsInDir(materials_dir)
-    
-        # Store all the guid's linked with their filename. This is later used to find out if there are duplicate guids.
-        guid_dict = {}  # type: Dict[str, List[str]]
-        xmlschema_doc = etree.parse(fdmmaterial_xsd_file_path)
-        xmlschema = etree.XMLSchema(xmlschema_doc)
-        has_invalid_files = False
-
-        for file_name, file_info_dict in material_content_dict.items():
-            # Show error message if the file failed to load
-            if len(file_info_dict["error"]) > 0:
-                print("{file_name} failed to load, error: {error}".format(file_name = file_name,
-                                                                          error = file_info_dict["error"]))
-                has_invalid_files = True
-                continue
-
-            material_content = file_info_dict["content"]
-
-            try:
-                xml_doc = etree.fromstring(material_content.encode())
-            except etree.XMLSyntaxError as e:
-                print("{file_name} contains XML syntax error".format(file_name = file_name))
-                print(e)
-                has_invalid_files = True
-                continue
-
-            # Validate the file content with the XSD file.
-            guid = self._getGuid(material_content)
-            if guid not in guid_dict:
-                guid_dict[guid] = []
-            guid_dict[guid].append(file_name)
-            try:
-                xmlschema.assertValid(xml_doc)
-            except etree.DocumentInvalid as e:
-                has_invalid_files = True
-                print("{file_name} is not a valid fdm material".format(file_name = file_name))
-                print(e)
-                continue
-
-            # Make sure that only the material files such as "generic_<bla>" can have branch "Generic".
-            brand = self._getMaterialBrandName(xml_doc)
-            if brand is None:
-                has_invalid_files = True
-                print("{file_name} Could not find <brand>".format(file_name = file_name))
-                continue
-            if len(brand) == 0:
-                has_invalid_files = True
-                print("{file_name} contains an empty string for <brand>".format(file_name = file_name))
-                continue
-            if brand.lower() == "generic" and not file_name.lower().startswith("generic_"):
-                has_invalid_files = True
-                print("{file_name} has brand [{brand}] but only material files named as [generic*] can have brand [Generic]".format(
-                      file_name = file_name, brand = brand))
-                continue
-
-        # Check for duplicate GUIDs
-        for guid, file_item_list in guid_dict.items():
-            if len(file_item_list) <= 1:
-                continue
-            has_invalid_files = True
-
-            if guid is not None:
-                print("-> The following files contain the same GUID [%s]:" % guid)
-            else:
-                print("-> The following files DO NOT contain any GUID:")
-            for file_item in file_item_list:
-                print("    -- [%s]" % file_item)
-            print("-> PLEASE make sure to generate unique GUIDs for each material.")
-
-        return not has_invalid_files
-
-
-def main():
-    script_dir = os.path.dirname(os.path.realpath(__file__))
-    root_dir = os.path.abspath(os.path.join(script_dir, ".."))
-
-    validator = MaterialProfilesValidator()
-    is_everything_validated = validator.validateAll(root_dir)
-
-    if is_everything_validated:
-        print("All material profiles seem valid.")
-
-    ret_code = 0 if is_everything_validated else 1
-    sys.exit(ret_code)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/fdmmaterial.xsd b/scripts/fdmmaterial.xsd
index 9c8934e..3028761 100644
--- a/scripts/fdmmaterial.xsd
+++ b/scripts/fdmmaterial.xsd
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ultimaker.com/material"
             xmlns="http://www.ultimaker.com/material" elementFormDefault="qualified">
-    <!-- This XSD document is currently unused by CI, because lxml doesn't run on that server.
-         If you plan to use it, make sure that it is still up-to-date. -->
-
-
     <xsd:element name="fdmmaterial">
         <xsd:complexType>
             <xsd:sequence>
@@ -195,6 +191,8 @@
                     <xsd:enumeration value="end of print purge volume"/>
                     <xsd:enumeration value="pressure release dwell time"/>
                     <xsd:enumeration value="dwell time before break preparation move"/>
+                    <xsd:enumeration value="tainted print core max temperature"/>
+                    <xsd:enumeration value="recommend cleaning after n prints"/>
                 </xsd:restriction>
             </xsd:simpleType>
         </xsd:attribute>
diff --git a/ultimaker_abs_black.xml.fdm_material b/ultimaker_abs_black.xml.fdm_material
index 7b6afc9..9c6b073 100644
--- a/ultimaker_abs_black.xml.fdm_material
+++ b/ultimaker_abs_black.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>Black</color>
         </name>
         <GUID>2f9d2279-9b0e-4765-bf9b-d1e1e13f3c49</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#2a292a</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_blue.xml.fdm_material b/ultimaker_abs_blue.xml.fdm_material
index 8278fc2..299f9d8 100644
--- a/ultimaker_abs_blue.xml.fdm_material
+++ b/ultimaker_abs_blue.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>Blue</color>
         </name>
         <GUID>7c9575a6-c8d6-40ec-b3dd-18d7956bfaae</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#00387b</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_green.xml.fdm_material b/ultimaker_abs_green.xml.fdm_material
index 302502e..d3f2302 100644
--- a/ultimaker_abs_green.xml.fdm_material
+++ b/ultimaker_abs_green.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>Green</color>
         </name>
         <GUID>3400c0d1-a4e3-47de-a444-7b704f287171</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#61993b</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_grey.xml.fdm_material b/ultimaker_abs_grey.xml.fdm_material
index 9aa52ea..8413668 100644
--- a/ultimaker_abs_grey.xml.fdm_material
+++ b/ultimaker_abs_grey.xml.fdm_material
@@ -4,17 +4,17 @@
         <name>
             <brand>Ultimaker</brand>
             <material>ABS</material>
-            <color>Grey</color>
+            <color>Gray</color>
         </name>
         <GUID>8b75b775-d3f2-4d0f-8fb2-2a3dd53cf673</GUID>
-        <version>29</version>
+        <version>38</version>
         <color_code>#52595d</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_orange.xml.fdm_material b/ultimaker_abs_orange.xml.fdm_material
index a9bb7f0..d2376ed 100644
--- a/ultimaker_abs_orange.xml.fdm_material
+++ b/ultimaker_abs_orange.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>Orange</color>
         </name>
         <GUID>0b4ca6ef-eac8-4b23-b3ca-5f21af00e54f</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#ed6b21</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_pearl-gold.xml.fdm_material b/ultimaker_abs_pearl-gold.xml.fdm_material
index 698ea06..db0cc01 100644
--- a/ultimaker_abs_pearl-gold.xml.fdm_material
+++ b/ultimaker_abs_pearl-gold.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>Pearl Gold</color>
         </name>
         <GUID>7cbdb9ca-081a-456f-a6ba-f73e4e9cb856</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#80643f</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_red.xml.fdm_material b/ultimaker_abs_red.xml.fdm_material
index ac6d825..d0ae0c3 100644
--- a/ultimaker_abs_red.xml.fdm_material
+++ b/ultimaker_abs_red.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>Red</color>
         </name>
         <GUID>5df7afa6-48bd-4c19-b314-839fe9f08f1f</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#bb1e10</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_silver-metallic.xml.fdm_material b/ultimaker_abs_silver-metallic.xml.fdm_material
index 058e658..0d1c105 100644
--- a/ultimaker_abs_silver-metallic.xml.fdm_material
+++ b/ultimaker_abs_silver-metallic.xml.fdm_material
@@ -4,17 +4,17 @@
         <name>
             <brand>Ultimaker</brand>
             <material>ABS</material>
-            <color>Silver Metallic</color>
+            <color>Silver</color>
         </name>
         <GUID>763c926e-a5f7-4ba0-927d-b4e038ea2735</GUID>
-        <version>29</version>
+        <version>38</version>
         <color_code>#a1a1a0</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_white.xml.fdm_material b/ultimaker_abs_white.xml.fdm_material
index 8b1ec07..99d02f2 100644
--- a/ultimaker_abs_white.xml.fdm_material
+++ b/ultimaker_abs_white.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>White</color>
         </name>
         <GUID>5253a75a-27dc-4043-910f-753ae11bc417</GUID>
-        <version>29</version>
+        <version>40</version>
         <color_code>#ecece7</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_abs_yellow.xml.fdm_material b/ultimaker_abs_yellow.xml.fdm_material
index d827a7a..e26e953 100644
--- a/ultimaker_abs_yellow.xml.fdm_material
+++ b/ultimaker_abs_yellow.xml.fdm_material
@@ -7,14 +7,14 @@
             <color>Yellow</color>
         </name>
         <GUID>e873341d-d9b8-45f9-9a6f-5609e1bcff68</GUID>
-        <version>29</version>
+        <version>37</version>
         <color_code>#f7b500</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>Use glue, to avoid chipping of the glass.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,12 +40,13 @@
 
         <!-- print settings -->
         <setting key="print temperature">230</setting>
+        <setting key="standby temperature">130</setting>
         <setting key="heated bed temperature">80</setting>
-        <setting key="standby temperature">200</setting>
+        <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">36</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,12 +66,9 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -81,6 +79,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -99,61 +98,47 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
-
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
-                <setting key="standby temperature">85</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">2</setting>
-                <setting key="standby temperature">85</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_bam.xml.fdm_material b/ultimaker_bam.xml.fdm_material
index 68fe530..5abba9c 100644
--- a/ultimaker_bam.xml.fdm_material
+++ b/ultimaker_bam.xml.fdm_material
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Ultimaker</brand>
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>7e6207c4-22ff-441a-b261-ff89f166d5f9</GUID>
-        <version>29</version>
+        <version>36</version>
         <color_code>#F1ECE1</color_code>
         <description>Breakaway Material. Breakaway is a matching support material for PLA, ABS, CPE, CPE+, and Nylon</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -40,78 +40,49 @@
 
         <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">100</setting>
         <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <!-- Define as unsoluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-            </hotend>
-            <hotend id="AA 0.8">
-                <setting key="hardware compatible">no</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="CC 0.6" />
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-            </hotend>
-            <hotend id="AA 0.8">
-                <setting key="hardware compatible">no</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
-            <hotend id="AA 0.8">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_black.xml.fdm_material b/ultimaker_cpe_black.xml.fdm_material
index 6985234..f0168b4 100644
--- a/ultimaker_cpe_black.xml.fdm_material
+++ b/ultimaker_cpe_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>a8955dc3-9d7e-404d-8c03-0fd6fee7f22d</GUID>
-        <version>32</version>
+        <version>40</version>
         <color_code>#2a292a</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_blue.xml.fdm_material b/ultimaker_cpe_blue.xml.fdm_material
index c4953bc..cb1b257 100644
--- a/ultimaker_cpe_blue.xml.fdm_material
+++ b/ultimaker_cpe_blue.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Blue</color>
         </name>
         <GUID>4d816290-ce2e-40e0-8dc8-3f702243131e</GUID>
-        <version>32</version>
+        <version>40</version>
         <color_code>#00a3e0</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_dark-grey.xml.fdm_material b/ultimaker_cpe_dark-grey.xml.fdm_material
index 725e66e..265ca45 100644
--- a/ultimaker_cpe_dark-grey.xml.fdm_material
+++ b/ultimaker_cpe_dark-grey.xml.fdm_material
@@ -4,10 +4,10 @@
         <name>
             <brand>Ultimaker</brand>
             <material>CPE</material>
-            <color>Dark Grey</color>
+            <color>Dark Gray</color>
         </name>
         <GUID>10961c00-3caf-48e9-a598-fa805ada1e8d</GUID>
-        <version>32</version>
+        <version>41</version>
         <color_code>#4f5250</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_green.xml.fdm_material b/ultimaker_cpe_green.xml.fdm_material
index 8ec1785..3ec9033 100644
--- a/ultimaker_cpe_green.xml.fdm_material
+++ b/ultimaker_cpe_green.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Green</color>
         </name>
         <GUID>7ff6d2c8-d626-48cd-8012-7725fa537cc9</GUID>
-        <version>32</version>
+        <version>40</version>
         <color_code>#78be20</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_light-grey.xml.fdm_material b/ultimaker_cpe_light-grey.xml.fdm_material
index b5e7d02..67beb71 100644
--- a/ultimaker_cpe_light-grey.xml.fdm_material
+++ b/ultimaker_cpe_light-grey.xml.fdm_material
@@ -4,10 +4,10 @@
         <name>
             <brand>Ultimaker</brand>
             <material>CPE</material>
-            <color>Light Grey</color>
+            <color>Light Gray</color>
         </name>
         <GUID>173a7bae-5e14-470e-817e-08609c61e12b</GUID>
-        <version>32</version>
+        <version>41</version>
         <color_code>#c5c7c4</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_plus_black.xml.fdm_material b/ultimaker_cpe_plus_black.xml.fdm_material
index e209937..f5002b0 100644
--- a/ultimaker_cpe_plus_black.xml.fdm_material
+++ b/ultimaker_cpe_plus_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>1aca047a-42df-497c-abfb-0e9cb85ead52</GUID>
-        <version>30</version>
+        <version>42</version>
         <color_code>#0e0e10</color_code>
         <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info>
@@ -40,12 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">260</setting>
+        <setting key="standby temperature">160</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -57,9 +57,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
@@ -68,18 +65,13 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -92,68 +84,47 @@
             <setting key="print temperature">260</setting>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
-            <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="retraction amount">8</setting>
-                <setting key="retraction speed">40</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_plus_transparent.xml.fdm_material b/ultimaker_cpe_plus_transparent.xml.fdm_material
index d95450c..c67dd9c 100644
--- a/ultimaker_cpe_plus_transparent.xml.fdm_material
+++ b/ultimaker_cpe_plus_transparent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Transparent</color>
         </name>
         <GUID>a9c340fe-255f-4914-87f5-ec4fcb0c11ef</GUID>
-        <version>30</version>
+        <version>42</version>
         <color_code>#d0d0d0</color_code>
         <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info>
@@ -40,12 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">260</setting>
+        <setting key="standby temperature">160</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -57,65 +57,49 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
 
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
+            <cura:setting key="retraction_combing">all</cura:setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
         </machine>
 
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
             <setting key="print temperature">260</setting>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
-            <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
 
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
-            <cura:setting key="retraction_combing">all</cura:setting>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -125,35 +109,22 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="retraction amount">8</setting>
-                <setting key="retraction speed">40</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_plus_white.xml.fdm_material b/ultimaker_cpe_plus_white.xml.fdm_material
index f2ca181..28ba75a 100644
--- a/ultimaker_cpe_plus_white.xml.fdm_material
+++ b/ultimaker_cpe_plus_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>6df69b13-2d96-4a69-a297-aedba667e710</GUID>
-        <version>30</version>
+        <version>42</version>
         <color_code>#f1ece1</color_code>
         <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info>
@@ -40,12 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">260</setting>
+        <setting key="standby temperature">160</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -57,9 +57,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
@@ -68,18 +65,13 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -92,68 +84,47 @@
             <setting key="print temperature">260</setting>
             <setting key="hardware compatible">yes</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
-            <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">1</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">110</setting>
                 <setting key="retraction amount">8</setting>
-                <setting key="retraction speed">40</setting>
                 <setting key="print cooling">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_red.xml.fdm_material b/ultimaker_cpe_red.xml.fdm_material
index 3b1d3e9..4333c04 100644
--- a/ultimaker_cpe_red.xml.fdm_material
+++ b/ultimaker_cpe_red.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Red</color>
         </name>
         <GUID>00181d6c-7024-479a-8eb7-8a2e38a2619a</GUID>
-        <version>32</version>
+        <version>40</version>
         <color_code>#c8102e</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_transparent.xml.fdm_material b/ultimaker_cpe_transparent.xml.fdm_material
index a587835..3443ddb 100644
--- a/ultimaker_cpe_transparent.xml.fdm_material
+++ b/ultimaker_cpe_transparent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Transparent</color>
         </name>
         <GUID>bd0d9eb3-a920-4632-84e8-dcd6086746c5</GUID>
-        <version>32</version>
+        <version>40</version>
         <color_code>#d0d0d0</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_white.xml.fdm_material b/ultimaker_cpe_white.xml.fdm_material
index 84db84f..de9f262 100644
--- a/ultimaker_cpe_white.xml.fdm_material
+++ b/ultimaker_cpe_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>881c888e-24fb-4a64-a4ac-d5c95b096cd7</GUID>
-        <version>32</version>
+        <version>40</version>
         <color_code>#f1ece1</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_cpe_yellow.xml.fdm_material b/ultimaker_cpe_yellow.xml.fdm_material
index e8ffa07..9e3f67f 100644
--- a/ultimaker_cpe_yellow.xml.fdm_material
+++ b/ultimaker_cpe_yellow.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Yellow</color>
         </name>
         <GUID>b9176a2a-7a0f-4821-9f29-76d882a88682</GUID>
-        <version>32</version>
+        <version>40</version>
         <color_code>#f6b600</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,14 +65,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <cura:setting key="retraction_combing_max_distance">40</cura:setting>
             <cura:setting key="retraction_combing">all</cura:setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -80,6 +76,7 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -98,46 +95,41 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
             </hotend>
@@ -145,15 +137,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">40</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_nylon_black.xml.fdm_material b/ultimaker_nylon_black.xml.fdm_material
index 5afbf82..d2c1f73 100644
--- a/ultimaker_nylon_black.xml.fdm_material
+++ b/ultimaker_nylon_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>c64c2dbe-5691-4363-a7d9-66b2dc12837f</GUID>
-        <version>28</version>
+        <version>34</version>
         <color_code>#27292b</color_code>
         <description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,14 +40,14 @@
 
         <!-- print settings -->
         <setting key="print temperature">245</setting>
+        <setting key="standby temperature">145</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">35</setting>
         <setting key="retraction amount">8</setting>
         <setting key="retraction speed">25</setting>
         <setting key="adhesion tendency">2</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">35</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -68,12 +68,11 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">40</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <setting key="heated bed temperature">40</setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -108,63 +107,49 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">40</setting>
+            <setting key="heated bed temperature">40</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">40</setting>
+            <setting key="heated bed temperature">40</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_nylon_transparent.xml.fdm_material b/ultimaker_nylon_transparent.xml.fdm_material
index 3bb7ff8..8b7a2d2 100644
--- a/ultimaker_nylon_transparent.xml.fdm_material
+++ b/ultimaker_nylon_transparent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Transparent</color>
         </name>
         <GUID>e256615d-a04e-4f53-b311-114b90560af9</GUID>
-        <version>28</version>
+        <version>34</version>
         <color_code>#d0d0d0</color_code>
         <description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,14 +40,14 @@
 
         <!-- print settings -->
         <setting key="print temperature">245</setting>
+        <setting key="standby temperature">145</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">35</setting>
         <setting key="retraction amount">8</setting>
         <setting key="retraction speed">25</setting>
         <setting key="adhesion tendency">2</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">35</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -68,12 +68,11 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">40</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <setting key="heated bed temperature">40</setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -108,63 +107,49 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">40</setting>
+            <setting key="heated bed temperature">40</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
-               <setting key="retraction speed">45</setting>
+                <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">40</setting>
+            <setting key="heated bed temperature">40</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="heated bed temperature">70</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pc_black.xml.fdm_material b/ultimaker_pc_black.xml.fdm_material
index 67c4663..a1d774f 100644
--- a/ultimaker_pc_black.xml.fdm_material
+++ b/ultimaker_pc_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>e92b1f0b-a069-4969-86b4-30127cfb6f7b</GUID>
-        <version>30</version>
+        <version>37</version>
         <color_code>#0e0e10</color_code>
         <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>
@@ -40,18 +40,18 @@
 
         <!-- print settings -->
         <setting key="print temperature">270</setting>
+        <setting key="standby temperature">170</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
-
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
@@ -67,11 +67,8 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -84,7 +81,7 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-        </machine>
+         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
@@ -100,12 +97,8 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -121,14 +114,12 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -141,14 +132,9 @@
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pc_transparent.xml.fdm_material b/ultimaker_pc_transparent.xml.fdm_material
index 35ccfb5..7ddf639 100644
--- a/ultimaker_pc_transparent.xml.fdm_material
+++ b/ultimaker_pc_transparent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Transparent</color>
         </name>
         <GUID>8a38a3e9-ecf7-4a7d-a6a9-e7ac35102968</GUID>
-        <version>30</version>
+        <version>37</version>
         <color_code>#d0d0d0</color_code>
         <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>
@@ -40,18 +40,18 @@
 
         <!-- print settings -->
         <setting key="print temperature">270</setting>
+        <setting key="standby temperature">170</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
-
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
@@ -67,11 +67,8 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -84,7 +81,7 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-        </machine>
+         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
@@ -100,12 +97,8 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -121,14 +114,12 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -141,14 +132,9 @@
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pc_white.xml.fdm_material b/ultimaker_pc_white.xml.fdm_material
index 0be2b64..e9dade6 100644
--- a/ultimaker_pc_white.xml.fdm_material
+++ b/ultimaker_pc_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>5e786b05-a620-4a87-92d0-f02becc1ff98</GUID>
-        <version>30</version>
+        <version>37</version>
         <color_code>#ecece7</color_code>
         <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>
@@ -40,18 +40,18 @@
 
         <!-- print settings -->
         <setting key="print temperature">270</setting>
+        <setting key="standby temperature">170</setting>
         <setting key="heated bed temperature">107</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">65</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
-
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
@@ -67,11 +67,8 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -84,7 +81,7 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-        </machine>
+         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
@@ -100,12 +97,8 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -121,14 +114,12 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="heated bed temperature">110</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -141,14 +132,9 @@
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">5</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petcf_black.xml.fdm_material b/ultimaker_petcf_black.xml.fdm_material
new file mode 100644
index 0000000..6e1ad78
--- /dev/null
+++ b/ultimaker_petcf_black.xml.fdm_material
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>Ultimaker</brand>
+            <material>PET CF</material>
+            <color>Black</color>
+        </name>
+        <GUID>a6f8d4f1-7205-40cc-b9e5-3bad20bc8011</GUID>
+        <version>19</version>
+        <color_code>#1e1e1e</color_code>
+        <description>Ultimaker PET-CF.</description>
+        <adhesion_info>Print on bare glass.</adhesion_info>
+        <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-pet-cf/printing-guidelines</instruction_link>
+        <cura:pva_compatible>True</cura:pva_compatible>
+        <cura:breakaway_compatible>True</cura:breakaway_compatible>
+    </metadata>
+    <properties>
+        <density>1.33</density>
+        <diameter>2.85</diameter>
+        <weight>750</weight>
+    </properties>
+    <settings>
+        <!-- Deprime settings -->
+        <setting key="anti ooze retract position">-16</setting>
+        <setting key="anti ooze retract speed">50</setting>
+        <setting key="break preparation position">-16</setting>
+        <setting key="break preparation speed">50</setting>
+        <setting key="break preparation temperature">265</setting>
+        <setting key="break position">-50</setting>
+        <setting key="break speed">50</setting>
+        <setting key="break temperature">265</setting>
+        <setting key="pressure release dwell time">50</setting>
+        <setting key="dwell time before break preparation move">0</setting>
+        <setting key="end of print purge volume">0</setting>
+        <setting key="end of filament purge volume">0</setting>
+        <setting key="flush purge length">60</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.94</setting>
+
+        <!-- print settings -->
+        <setting key="print temperature">270</setting>
+        <setting key="standby temperature">165</setting>
+        <setting key="heated bed temperature">80</setting>
+        <setting key="build volume temperature">37</setting>
+        <setting key="print cooling">10</setting>
+        <setting key="retraction amount">10</setting>
+        <setting key="adhesion tendency">1</setting>
+        <setting key="surface energy">100</setting>
+        <cura:setting key="material_flow">95</cura:setting>
+
+        <!-- For material flow sensor -->
+        <setting key="relative extrusion">1.0</setting>
+        <setting key="flow sensor detection margin">0.8</setting>
+        <setting key="retract compensation">0</setting>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+
+    </settings>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petcf_blue.xml.fdm_material b/ultimaker_petcf_blue.xml.fdm_material
new file mode 100644
index 0000000..b67b65b
--- /dev/null
+++ b/ultimaker_petcf_blue.xml.fdm_material
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>Ultimaker</brand>
+            <material>PET CF</material>
+            <color>Blue</color>
+        </name>
+        <GUID>81555f45-354b-42e0-bc0d-e0357cb56dd4</GUID>
+        <version>19</version>
+        <color_code>#025669</color_code>
+        <description>Ultimaker PET-CF.</description>
+        <adhesion_info>Print on bare glass.</adhesion_info>
+        <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-pet-cf/printing-guidelines</instruction_link>
+        <cura:pva_compatible>True</cura:pva_compatible>
+        <cura:breakaway_compatible>True</cura:breakaway_compatible>
+    </metadata>
+    <properties>
+        <density>1.39</density>
+        <diameter>2.85</diameter>
+        <weight>750</weight>
+    </properties>
+    <settings>
+        <!-- Deprime settings -->
+        <setting key="anti ooze retract position">-16</setting>
+        <setting key="anti ooze retract speed">50</setting>
+        <setting key="break preparation position">-16</setting>
+        <setting key="break preparation speed">50</setting>
+        <setting key="break preparation temperature">265</setting>
+        <setting key="break position">-50</setting>
+        <setting key="break speed">50</setting>
+        <setting key="break temperature">265</setting>
+        <setting key="pressure release dwell time">50</setting>
+        <setting key="dwell time before break preparation move">0</setting>
+        <setting key="end of print purge volume">0</setting>
+        <setting key="end of filament purge volume">0</setting>
+        <setting key="flush purge length">60</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.94</setting>
+
+        <!-- print settings -->
+        <setting key="print temperature">270</setting>
+        <setting key="standby temperature">165</setting>
+        <setting key="heated bed temperature">80</setting>
+        <setting key="build volume temperature">37</setting>
+        <setting key="print cooling">10</setting>
+        <setting key="retraction amount">10</setting>
+        <setting key="adhesion tendency">1</setting>
+        <setting key="surface energy">100</setting>
+        <cura:setting key="material_flow">95</cura:setting>
+
+        <!-- For material flow sensor -->
+        <setting key="relative extrusion">1.0</setting>
+        <setting key="flow sensor detection margin">0.8</setting>
+        <setting key="retract compensation">0</setting>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+
+    </settings>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petcf_gray.xml.fdm_material b/ultimaker_petcf_gray.xml.fdm_material
new file mode 100644
index 0000000..6d97646
--- /dev/null
+++ b/ultimaker_petcf_gray.xml.fdm_material
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>Ultimaker</brand>
+            <material>PET CF</material>
+            <color>Gray</color>
+        </name>
+        <GUID>98896281-3972-4dc5-8d6d-76ed417b10ea</GUID>
+        <version>19</version>
+        <color_code>#8d948d</color_code>
+        <description>Ultimaker PET-CF.</description>
+        <adhesion_info>Print on bare glass.</adhesion_info>
+        <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-pet-cf/printing-guidelines</instruction_link>
+        <cura:pva_compatible>True</cura:pva_compatible>
+        <cura:breakaway_compatible>True</cura:breakaway_compatible>
+    </metadata>
+    <properties>
+        <density>1.45</density>
+        <diameter>2.85</diameter>
+        <weight>750</weight>
+    </properties>
+    <settings>
+        <!-- Deprime settings -->
+        <setting key="anti ooze retract position">-16</setting>
+        <setting key="anti ooze retract speed">50</setting>
+        <setting key="break preparation position">-16</setting>
+        <setting key="break preparation speed">50</setting>
+        <setting key="break preparation temperature">265</setting>
+        <setting key="break position">-50</setting>
+        <setting key="break speed">50</setting>
+        <setting key="break temperature">265</setting>
+        <setting key="pressure release dwell time">50</setting>
+        <setting key="dwell time before break preparation move">0</setting>
+        <setting key="end of print purge volume">0</setting>
+        <setting key="end of filament purge volume">0</setting>
+        <setting key="flush purge length">60</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.94</setting>
+
+        <!-- print settings -->
+        <setting key="print temperature">270</setting>
+        <setting key="standby temperature">165</setting>
+        <setting key="heated bed temperature">80</setting>
+        <setting key="build volume temperature">37</setting>
+        <setting key="print cooling">10</setting>
+        <setting key="retraction amount">10</setting>
+        <setting key="adhesion tendency">1</setting>
+        <setting key="surface energy">100</setting>
+        <cura:setting key="material_flow">95</cura:setting>
+
+        <!-- For material flow sensor -->
+        <setting key="relative extrusion">1.0</setting>
+        <setting key="flow sensor detection margin">0.8</setting>
+        <setting key="retract compensation">0</setting>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="CC 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+
+    </settings>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_black.xml.fdm_material b/ultimaker_petg_black.xml.fdm_material
index b3ec1ac..26d9998 100644
--- a/ultimaker_petg_black.xml.fdm_material
+++ b/ultimaker_petg_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>5f9f3de0-045b-48d9-84ec-19db92be7603</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#2a292a</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-	
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_blue.xml.fdm_material b/ultimaker_petg_blue.xml.fdm_material
index 07b3f69..5332fb9 100644
--- a/ultimaker_petg_blue.xml.fdm_material
+++ b/ultimaker_petg_blue.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Blue</color>
         </name>
         <GUID>2257ab94-fb27-42e6-865c-05aa6717504b</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#005387</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_blue_translucent.xml.fdm_material b/ultimaker_petg_blue_translucent.xml.fdm_material
index b5c03d7..b307650 100644
--- a/ultimaker_petg_blue_translucent.xml.fdm_material
+++ b/ultimaker_petg_blue_translucent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Blue Translucent</color>
         </name>
         <GUID>e0af2080-29fc-4b18-a5c0-42ca112f507f</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#0033A0</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_green.xml.fdm_material b/ultimaker_petg_green.xml.fdm_material
index 71c97fa..d543014 100644
--- a/ultimaker_petg_green.xml.fdm_material
+++ b/ultimaker_petg_green.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Green</color>
         </name>
         <GUID>c8e4a85e-b256-4468-8516-0aa98c69c7d7</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#008351</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_green_translucent.xml.fdm_material b/ultimaker_petg_green_translucent.xml.fdm_material
index acf1654..baf5034 100644
--- a/ultimaker_petg_green_translucent.xml.fdm_material
+++ b/ultimaker_petg_green_translucent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Green Translucent</color>
         </name>
         <GUID>1f3c3be1-2e60-4343-b35d-cb383958d992</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#006341</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_grey.xml.fdm_material b/ultimaker_petg_grey.xml.fdm_material
index aa2d57b..9ad2dde 100644
--- a/ultimaker_petg_grey.xml.fdm_material
+++ b/ultimaker_petg_grey.xml.fdm_material
@@ -4,10 +4,10 @@
         <name>
             <brand>Ultimaker</brand>
             <material>PETG</material>
-            <color>Grey</color>
+            <color>Gray</color>
         </name>
         <GUID>c8394116-30ba-4112-b4d9-8b2394278cb3</GUID>
-        <version>31</version>
+        <version>41</version>
         <color_code>#575d5e</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_orange.xml.fdm_material b/ultimaker_petg_orange.xml.fdm_material
index d12db65..1d41586 100644
--- a/ultimaker_petg_orange.xml.fdm_material
+++ b/ultimaker_petg_orange.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Orange</color>
         </name>
         <GUID>a02a3978-eb33-47ca-b32b-d08b92b58638</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#FC4C02</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_red.xml.fdm_material b/ultimaker_petg_red.xml.fdm_material
index 371fb6e..4325767 100644
--- a/ultimaker_petg_red.xml.fdm_material
+++ b/ultimaker_petg_red.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Red</color>
         </name>
         <GUID>9680dff6-7aa5-400b-982c-40a0de06a718</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#bb1e10</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_red_translucent.xml.fdm_material b/ultimaker_petg_red_translucent.xml.fdm_material
index dae2421..b327296 100644
--- a/ultimaker_petg_red_translucent.xml.fdm_material
+++ b/ultimaker_petg_red_translucent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Red Translucent</color>
         </name>
         <GUID>c8639119-5cae-4f56-9bcf-3bb00e8225fd</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#93272C</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_silver.xml.fdm_material b/ultimaker_petg_silver.xml.fdm_material
index a96fc1c..b3d1ce4 100644
--- a/ultimaker_petg_silver.xml.fdm_material
+++ b/ultimaker_petg_silver.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Silver</color>
         </name>
         <GUID>40a273c6-0e15-4db5-a278-8eb0b4a9e293</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#a1a1a0</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_transparent.xml.fdm_material b/ultimaker_petg_transparent.xml.fdm_material
index e99d42c..f1f451f 100644
--- a/ultimaker_petg_transparent.xml.fdm_material
+++ b/ultimaker_petg_transparent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Transparent</color>
         </name>
         <GUID>7418eca4-e2c4-45b1-a022-37180861fd39</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#d0d0d0</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
+
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
@@ -59,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -72,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -116,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_white.xml.fdm_material b/ultimaker_petg_white.xml.fdm_material
index 616a138..95e0916 100644
--- a/ultimaker_petg_white.xml.fdm_material
+++ b/ultimaker_petg_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>61eb5c6c-0110-49de-9756-13b8c7cc2ff1</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#ecece7</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_yellow.xml.fdm_material b/ultimaker_petg_yellow.xml.fdm_material
index 4e9f747..c0d77fe 100644
--- a/ultimaker_petg_yellow.xml.fdm_material
+++ b/ultimaker_petg_yellow.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Yellow</color>
         </name>
         <GUID>218379df-4a67-4668-b5f8-2a14c92bce96</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#f1dd38</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_petg_yellow_fluorescent.xml.fdm_material b/ultimaker_petg_yellow_fluorescent.xml.fdm_material
index 6b6a79a..ea67aef 100644
--- a/ultimaker_petg_yellow_fluorescent.xml.fdm_material
+++ b/ultimaker_petg_yellow_fluorescent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Yellow Fluorescent</color>
         </name>
         <GUID>d67a3ccb-6b51-4013-bdac-4c59e952aaf4</GUID>
-        <version>31</version>
+        <version>40</version>
         <color_code>#B1D600</color_code>
         <description>Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -40,11 +40,11 @@
 
         <!-- print settings -->
         <setting key="print temperature">240</setting>
+        <setting key="standby temperature">140</setting>
         <setting key="heated bed temperature">85</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
-        <setting key="build volume temperature">37</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -60,6 +60,7 @@
             </hotend>
             <hotend id="0.4 mm">
                 <setting key="print temperature">245</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">250</setting>
@@ -73,41 +74,35 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="heated bed temperature">85</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
             </hotend>
         </machine>
-		
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -117,36 +112,31 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <cura:setting key="material_shrinkage_percentage">100.5</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="print temperature">230</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
                 <setting key="retraction amount">8</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_black.xml.fdm_material b/ultimaker_pla_black.xml.fdm_material
index e555e1f..ae4be9f 100644
--- a/ultimaker_pla_black.xml.fdm_material
+++ b/ultimaker_pla_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>3ee70a86-77d8-4b87-8005-e4a1bc57d2ce</GUID>
-        <version>27</version>
+        <version>36</version>
         <color_code>#0e0e10</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_blue.xml.fdm_material b/ultimaker_pla_blue.xml.fdm_material
index 35a0609..4551005 100644
--- a/ultimaker_pla_blue.xml.fdm_material
+++ b/ultimaker_pla_blue.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Blue</color>
         </name>
         <GUID>44a029e6-e31b-4c9e-a12f-9282e29a92ff</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#00387b</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_green.xml.fdm_material b/ultimaker_pla_green.xml.fdm_material
index b402c64..266ee7b 100644
--- a/ultimaker_pla_green.xml.fdm_material
+++ b/ultimaker_pla_green.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Green</color>
         </name>
         <GUID>2433b8fb-dcd6-4e36-9cd5-9f4ee551c04c</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#61993b</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_magenta.xml.fdm_material b/ultimaker_pla_magenta.xml.fdm_material
index b8ea1c7..f17157d 100644
--- a/ultimaker_pla_magenta.xml.fdm_material
+++ b/ultimaker_pla_magenta.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Magenta</color>
         </name>
         <GUID>fe3982c8-58f4-4d86-9ac0-9ff7a3ab9cbc</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#bc4077</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_orange.xml.fdm_material b/ultimaker_pla_orange.xml.fdm_material
index b89f9c4..4c9a2c2 100644
--- a/ultimaker_pla_orange.xml.fdm_material
+++ b/ultimaker_pla_orange.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Orange</color>
         </name>
         <GUID>d9549dba-b9df-45b9-80a5-f7140a9a2f34</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#ed6b21</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_pearl-white.xml.fdm_material b/ultimaker_pla_pearl-white.xml.fdm_material
index 52de7e8..2fa3409 100644
--- a/ultimaker_pla_pearl-white.xml.fdm_material
+++ b/ultimaker_pla_pearl-white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Pearl-White</color>
         </name>
         <GUID>d9fc79db-82c3-41b5-8c99-33b3747b8fb3</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#e3d9c6</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_red.xml.fdm_material b/ultimaker_pla_red.xml.fdm_material
index 4e72323..520123d 100644
--- a/ultimaker_pla_red.xml.fdm_material
+++ b/ultimaker_pla_red.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Red</color>
         </name>
         <GUID>9cfe5bf1-bdc5-4beb-871a-52c70777842d</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#bb1e10</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_silver-metallic.xml.fdm_material b/ultimaker_pla_silver-metallic.xml.fdm_material
index 0e12b0a..f550df2 100644
--- a/ultimaker_pla_silver-metallic.xml.fdm_material
+++ b/ultimaker_pla_silver-metallic.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Silver Metallic</color>
         </name>
         <GUID>0e01be8c-e425-4fb1-b4a3-b79f255f1db9</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#a1a1a0</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_transparent.xml.fdm_material b/ultimaker_pla_transparent.xml.fdm_material
index 1ef2183..b3bf3e4 100644
--- a/ultimaker_pla_transparent.xml.fdm_material
+++ b/ultimaker_pla_transparent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Transparent</color>
         </name>
         <GUID>532e8b3d-5fd4-4149-b936-53ada9bd6b85</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#d0d0d0</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_white.xml.fdm_material b/ultimaker_pla_white.xml.fdm_material
index c34c007..073bbf1 100644
--- a/ultimaker_pla_white.xml.fdm_material
+++ b/ultimaker_pla_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>e509f649-9fe6-4b14-ac45-d441438cb4ef</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#f1ece1</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pla_yellow.xml.fdm_material b/ultimaker_pla_yellow.xml.fdm_material
index d46ea0b..76cb0c8 100644
--- a/ultimaker_pla_yellow.xml.fdm_material
+++ b/ultimaker_pla_yellow.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Yellow</color>
         </name>
         <GUID>9c1959d0-f597-46ec-9131-34020c7a54fc</GUID>
-        <version>27</version>
+        <version>39</version>
         <color_code>#f9a800</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">200</setting>
+        <setting key="standby temperature">100</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">28</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">28</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -65,7 +66,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Go"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended"/>
-            <setting key="standby temperature">150</setting>
             <setting key="processing temperature graph">
                 <point flow="2" temperature="180"/>
                 <point flow="10" temperature="230"/>
@@ -74,18 +74,14 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
-            <setting key="standby temperature">150</setting>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -94,6 +90,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -111,27 +108,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
-            <hotend id ="CC 0.4">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
-                <setting key="retraction amount">6.5</setting>
-            </hotend>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -139,31 +126,30 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-        </machine>
-
-        <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
-            <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
             </hotend>
-            <hotend id="CC 0.4">
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
-                <cura:setting key="material_crystallinity">true</cura:setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
+
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -171,17 +157,22 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
+            <hotend id="CC 0.4">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
+            <hotend id="CC 0.6">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+                <setting key="retraction amount">6.5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+                <cura:setting key="material_crystallinity">true</cura:setting>
+            </hotend>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pp_transparent.xml.fdm_material b/ultimaker_pp_transparent.xml.fdm_material
index dc13a48..111da74 100644
--- a/ultimaker_pp_transparent.xml.fdm_material
+++ b/ultimaker_pp_transparent.xml.fdm_material
@@ -7,15 +7,15 @@
             <color>Transparent</color>
         </name>
         <GUID>c7005925-2a41-4280-8cdd-4029e3fe5253</GUID>
-        <version>31</version>
+        <version>44</version>
         <color_code>#d0d0d0</color_code>
         <description>Fatigue and chemical resistant. Polypropylene offers excellent temperature, chemical and fatigue resistance. Its toughness and low friction make it a perfect choice for prototyping and creating durable end-use models.</description>
         <adhesion_info>Adhesion sheets are required.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-pp/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <diameter>2.85</diameter>
         <density>0.89</density>
+        <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
     <settings>
@@ -40,12 +40,14 @@
 
         <!-- print settings -->
         <setting key="print temperature">220</setting>
+        <setting key="standby temperature">120</setting>
         <setting key="heated bed temperature">100</setting>
-        <setting key="standby temperature">185</setting>
+        <setting key="build volume temperature">41</setting>
         <setting key="print cooling">20</setting>
         <setting key="retraction speed">35</setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
-        <setting key="build volume temperature">41</setting>
+        <cura:setting key="material_crystallinity">true</cura:setting>
+        <cura:setting key="adhesion_type">brim</cura:setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -58,9 +60,6 @@
 
             <setting key="retraction amount">8</setting>
 
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="0.4 mm" />
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
@@ -70,12 +69,9 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">85</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">25</setting>
             </hotend>
@@ -87,6 +83,7 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">10</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -95,9 +92,7 @@
             <setting key="hardware compatible">yes</setting>
             <setting key="retraction amount">8</setting>
             <setting key="retraction speed">25</setting>
-            <hotend id="0.25 mm">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
+
             <hotend id="0.4 mm">
                 <setting key="print temperature">220</setting>
             </hotend>
@@ -106,6 +101,7 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">240</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -113,12 +109,8 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="heated bed temperature">85</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
@@ -130,19 +122,17 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">7</setting>
                 <setting key="print cooling">10</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
             <setting key="heated bed temperature">85</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
@@ -154,15 +144,10 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">8</setting>
                 <setting key="print cooling">10</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_pva.xml.fdm_material b/ultimaker_pva.xml.fdm_material
index 396cf1d..2714101 100644
--- a/ultimaker_pva.xml.fdm_material
+++ b/ultimaker_pva.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Natural</color>
         </name>
         <GUID>fe15ed8a-33c3-4f57-a2a7-b4b78a38c3cb</GUID>
-        <version>30</version>
+        <version>37</version>
         <color_code>#f5f2d1</color_code>
         <description>Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon.</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -41,7 +41,7 @@
         <EAN>87 10400 31118 0</EAN>
     </metadata>
     <properties>
-        <density>1.23</density><!-- Unknown if this is correct -->
+        <density>1.23</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -67,16 +67,20 @@
 
         <!-- print settings -->
         <setting key="print temperature">215</setting>
+        <setting key="standby temperature">115</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
-        <cura:setting key="material_crystallinity">true</cura:setting>
         <setting key="build volume temperature">35</setting>
+        <cura:setting key="material_crystallinity">true</cura:setting>
+        <cura:setting key="raft_airgap">0</cura:setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <!-- Define as soluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original+"/>
@@ -117,22 +121,27 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
+            <hotend id="BB 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="BB 0.8">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
             <hotend id="CC 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="CC 0.6">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.4">
-                <setting key="hardware compatible">yes</setting>
-            </hotend>
-            <hotend id="BB 0.8">
-                <setting key="hardware compatible">yes</setting>
+            <hotend id="DD 0.4">
+                <setting key="hardware compatible">no</setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -154,14 +163,12 @@
             <hotend id="CC 0.6">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
+            <hotend id="DD 0.4">
                 <setting key="hardware compatible">no</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
+            </hotend>
         </machine>
+
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tough_pla_black.xml.fdm_material b/ultimaker_tough_pla_black.xml.fdm_material
index 7a2efcc..8e06804 100644
--- a/ultimaker_tough_pla_black.xml.fdm_material
+++ b/ultimaker_tough_pla_black.xml.fdm_material
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Ultimaker</brand>
@@ -7,14 +7,14 @@
             <color>Black</color>
         </name>
         <GUID>03f24266-0291-43c2-a6da-5211892a2699</GUID>
-        <version>22</version>
+        <version>32</version>
         <color_code>#2a292a</color_code>
         <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-tough-pla/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.22</density>
+        <density>1.24</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">24</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -55,11 +56,9 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -68,6 +67,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -85,18 +85,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -104,19 +103,20 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -124,17 +124,11 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tough_pla_blue.xml.fdm_material b/ultimaker_tough_pla_blue.xml.fdm_material
new file mode 100644
index 0000000..9f1b8dc
--- /dev/null
+++ b/ultimaker_tough_pla_blue.xml.fdm_material
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>Ultimaker</brand>
+            <material>Tough PLA</material>
+            <color>Blue</color>
+        </name>
+        <GUID>4b049931-6ee9-408c-8588-ddd4673467d1</GUID>
+        <version>11</version>
+        <color_code>#1B5583</color_code>
+        <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
+        <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
+        <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-tough-pla/printing-guidelines</instruction_link>
+    </metadata>
+    <properties>
+        <density>1.24</density>
+        <diameter>2.85</diameter>
+        <weight>750</weight>
+    </properties>
+    <settings>
+        <!-- Deprime settings -->
+        <setting key="anti ooze retract position">-4</setting>
+        <setting key="anti ooze retract speed">50</setting>
+        <setting key="break preparation position">-14</setting>
+        <setting key="break preparation speed">50</setting>
+        <setting key="break preparation temperature">230</setting>
+        <setting key="break position">-50</setting>
+        <setting key="break speed">25</setting>
+        <setting key="break temperature">60</setting>
+        <setting key="pressure release dwell time">25</setting>
+        <setting key="dwell time before break preparation move">4</setting>
+        <setting key="end of print purge volume">0</setting>
+        <setting key="end of filament purge volume">0</setting>
+        <setting key="flush purge length">60</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.93</setting>
+
+        <!-- print settings -->
+        <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
+        <setting key="heated bed temperature">60</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
+        <setting key="adhesion tendency">0</setting>
+        <setting key="surface energy">100</setting>
+
+        <!-- For material flow sensor -->
+        <setting key="relative extrusion">1.0</setting>
+        <setting key="flow sensor detection margin">0.8</setting>
+        <setting key="retract compensation">0</setting>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
+            <setting key="print cooling">100</setting>
+
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
+
+            <hotend id="0.25 mm">
+                <setting key="print temperature">210</setting>
+            </hotend>
+            <hotend id="0.4 mm">
+                <setting key="print temperature">225</setting>
+            </hotend>
+            <hotend id="0.6 mm">
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="0.8 mm">
+                <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+
+    </settings>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tough_pla_gray.xml.fdm_material b/ultimaker_tough_pla_gray.xml.fdm_material
new file mode 100644
index 0000000..e5201d8
--- /dev/null
+++ b/ultimaker_tough_pla_gray.xml.fdm_material
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>Ultimaker</brand>
+            <material>Tough PLA</material>
+            <color>Gray</color>
+        </name>
+        <GUID>6660eb2e-aa40-49ad-ac9b-ada979f3de9b</GUID>
+        <version>11</version>
+        <color_code>#78858B</color_code>
+        <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
+        <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
+        <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-tough-pla/printing-guidelines</instruction_link>
+    </metadata>
+    <properties>
+        <density>1.24</density>
+        <diameter>2.85</diameter>
+        <weight>750</weight>
+    </properties>
+    <settings>
+        <!-- Deprime settings -->
+        <setting key="anti ooze retract position">-4</setting>
+        <setting key="anti ooze retract speed">50</setting>
+        <setting key="break preparation position">-14</setting>
+        <setting key="break preparation speed">50</setting>
+        <setting key="break preparation temperature">230</setting>
+        <setting key="break position">-50</setting>
+        <setting key="break speed">25</setting>
+        <setting key="break temperature">60</setting>
+        <setting key="pressure release dwell time">25</setting>
+        <setting key="dwell time before break preparation move">4</setting>
+        <setting key="end of print purge volume">0</setting>
+        <setting key="end of filament purge volume">0</setting>
+        <setting key="flush purge length">60</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.93</setting>
+
+        <!-- print settings -->
+        <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
+        <setting key="heated bed temperature">60</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
+        <setting key="adhesion tendency">0</setting>
+        <setting key="surface energy">100</setting>
+
+        <!-- For material flow sensor -->
+        <setting key="relative extrusion">1.0</setting>
+        <setting key="flow sensor detection margin">0.8</setting>
+        <setting key="retract compensation">0</setting>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
+            <setting key="print cooling">100</setting>
+
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
+
+            <hotend id="0.25 mm">
+                <setting key="print temperature">210</setting>
+            </hotend>
+            <hotend id="0.4 mm">
+                <setting key="print temperature">225</setting>
+            </hotend>
+            <hotend id="0.6 mm">
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="0.8 mm">
+                <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+
+    </settings>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tough_pla_green.xml.fdm_material b/ultimaker_tough_pla_green.xml.fdm_material
index 7d88d4f..e1fb032 100644
--- a/ultimaker_tough_pla_green.xml.fdm_material
+++ b/ultimaker_tough_pla_green.xml.fdm_material
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Ultimaker</brand>
@@ -7,14 +7,14 @@
             <color>Green</color>
         </name>
         <GUID>6d71f4ad-29ab-4b50-8f65-22d99af294dd</GUID>
-        <version>22</version>
+        <version>32</version>
         <color_code>#00a95c</color_code>
         <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
         <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-tough-pla/printing-guidelines</instruction_link>
     </metadata>
     <properties>
-        <density>1.22</density>
+        <density>1.24</density>
         <diameter>2.85</diameter>
         <weight>750</weight>
     </properties>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">24</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -55,11 +56,9 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -68,6 +67,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -85,18 +85,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -104,19 +103,20 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -124,17 +124,11 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tough_pla_red.xml.fdm_material b/ultimaker_tough_pla_red.xml.fdm_material
index 090142b..87bf777 100644
--- a/ultimaker_tough_pla_red.xml.fdm_material
+++ b/ultimaker_tough_pla_red.xml.fdm_material
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Ultimaker</brand>
@@ -7,7 +7,7 @@
             <color>Red</color>
         </name>
         <GUID>2db25566-9a91-4145-84a5-46c90ed22bdf</GUID>
-        <version>22</version>
+        <version>32</version>
         <color_code>#de4343</color_code>
         <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">24</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -55,11 +56,9 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -68,6 +67,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -85,18 +85,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -104,19 +103,20 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -124,17 +124,11 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tough_pla_white.xml.fdm_material b/ultimaker_tough_pla_white.xml.fdm_material
index 10e7bff..deb7561 100644
--- a/ultimaker_tough_pla_white.xml.fdm_material
+++ b/ultimaker_tough_pla_white.xml.fdm_material
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Ultimaker</brand>
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>851427a0-0c9a-4d7c-a9a8-5cc92f84af1f</GUID>
-        <version>22</version>
+        <version>32</version>
         <color_code>#ecece7</color_code>
         <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -40,11 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">60</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">100</setting>
-        <setting key="build volume temperature">24</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -55,11 +56,9 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -68,6 +67,7 @@
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -85,18 +85,17 @@
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -104,19 +103,20 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print cooling">100</setting>
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -124,17 +124,11 @@
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="standby temperature">100</setting>
                 <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tough_pla_yellow.xml.fdm_material b/ultimaker_tough_pla_yellow.xml.fdm_material
new file mode 100644
index 0000000..cc445b7
--- /dev/null
+++ b/ultimaker_tough_pla_yellow.xml.fdm_material
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>Ultimaker</brand>
+            <material>Tough PLA</material>
+            <color>Yellow</color>
+        </name>
+        <GUID>bfdb0787-032d-4cf5-9975-964132bd641c</GUID>
+        <version>11</version>
+        <color_code>#F8F32B</color_code>
+        <description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
+        <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
+        <instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-tough-pla/printing-guidelines</instruction_link>
+    </metadata>
+    <properties>
+        <density>1.24</density>
+        <diameter>2.85</diameter>
+        <weight>750</weight>
+    </properties>
+    <settings>
+        <!-- Deprime settings -->
+        <setting key="anti ooze retract position">-4</setting>
+        <setting key="anti ooze retract speed">50</setting>
+        <setting key="break preparation position">-14</setting>
+        <setting key="break preparation speed">50</setting>
+        <setting key="break preparation temperature">230</setting>
+        <setting key="break position">-50</setting>
+        <setting key="break speed">25</setting>
+        <setting key="break temperature">60</setting>
+        <setting key="pressure release dwell time">25</setting>
+        <setting key="dwell time before break preparation move">4</setting>
+        <setting key="end of print purge volume">0</setting>
+        <setting key="end of filament purge volume">0</setting>
+        <setting key="flush purge length">60</setting>
+
+        <!-- material station (un)loading settings -->
+        <setting key="maximum park duration">7200</setting>
+        <setting key="no load move factor">0.93</setting>
+
+        <!-- print settings -->
+        <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
+        <setting key="heated bed temperature">60</setting>
+        <setting key="build volume temperature">24</setting>
+        <setting key="print cooling">100</setting>
+        <setting key="adhesion tendency">0</setting>
+        <setting key="surface energy">100</setting>
+
+        <!-- For material flow sensor -->
+        <setting key="relative extrusion">1.0</setting>
+        <setting key="flow sensor detection margin">0.8</setting>
+        <setting key="retract compensation">0</setting>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
+            <setting key="print cooling">100</setting>
+
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+ Connect"/>
+
+            <hotend id="0.25 mm">
+                <setting key="print temperature">210</setting>
+            </hotend>
+            <hotend id="0.4 mm">
+                <setting key="print temperature">225</setting>
+            </hotend>
+            <hotend id="0.6 mm">
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="0.8 mm">
+                <setting key="print temperature">255</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
+            <setting key="print cooling">100</setting>
+            <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>
+            <cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>
+            <hotend id="AA 0.25">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">6.5</setting>
+            </hotend>
+            <hotend id="AA 0.4">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+            <hotend id="AA 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">5</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
+            </hotend>
+        </machine>
+
+
+    </settings>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tpu_black.xml.fdm_material b/ultimaker_tpu_black.xml.fdm_material
index 17b6682..4d077a1 100644
--- a/ultimaker_tpu_black.xml.fdm_material
+++ b/ultimaker_tpu_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>eff40bcf-588d-420d-a3bc-a5ffd8c7f4b3</GUID>
-        <version>31</version>
+        <version>37</version>
         <color_code>#0e0e10</color_code>
         <description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -29,7 +29,7 @@
         <setting key="break speed">25</setting>
         <setting key="break temperature">195</setting>
         <setting key="pressure release dwell time">25</setting>
-        <setting key="dwell time before break preparation move">0</setting> 
+        <setting key="dwell time before break preparation move">0</setting>
         <setting key="end of print purge volume">0</setting>
         <setting key="end of filament purge volume">0</setting>
         <setting key="flush purge length">60</setting>
@@ -40,12 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">228</setting>
+        <setting key="standby temperature">128</setting>
         <setting key="heated bed temperature">0</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">27</setting>
         <setting key="adhesion tendency">3</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">27</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -70,15 +70,11 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction speed">35</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -94,7 +90,9 @@
             <setting key="retraction amount">10</setting>
 
             <hotend id="0.25 mm" />
-            <hotend id="0.4 mm" />
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">240</setting>
             </hotend>
@@ -107,15 +105,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -126,18 +119,15 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction amount">8</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -145,14 +135,8 @@
                 <setting key="retraction speed">45</setting>
                 <setting key="print cooling">50</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tpu_blue.xml.fdm_material b/ultimaker_tpu_blue.xml.fdm_material
index f42ab4f..fa594d7 100644
--- a/ultimaker_tpu_blue.xml.fdm_material
+++ b/ultimaker_tpu_blue.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Blue</color>
         </name>
         <GUID>5f4a826c-7bfe-460f-8650-a9178b180d34</GUID>
-        <version>31</version>
+        <version>37</version>
         <color_code>#00387b</color_code>
         <description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -29,7 +29,7 @@
         <setting key="break speed">25</setting>
         <setting key="break temperature">195</setting>
         <setting key="pressure release dwell time">25</setting>
-        <setting key="dwell time before break preparation move">0</setting> 
+        <setting key="dwell time before break preparation move">0</setting>
         <setting key="end of print purge volume">0</setting>
         <setting key="end of filament purge volume">0</setting>
         <setting key="flush purge length">60</setting>
@@ -40,12 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">228</setting>
+        <setting key="standby temperature">128</setting>
         <setting key="heated bed temperature">0</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">27</setting>
         <setting key="adhesion tendency">3</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">27</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -70,15 +70,11 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction speed">35</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -94,7 +90,9 @@
             <setting key="retraction amount">10</setting>
 
             <hotend id="0.25 mm" />
-            <hotend id="0.4 mm" />
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">240</setting>
             </hotend>
@@ -107,15 +105,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -126,18 +119,15 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction amount">8</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -145,14 +135,8 @@
                 <setting key="retraction speed">45</setting>
                 <setting key="print cooling">50</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tpu_red.xml.fdm_material b/ultimaker_tpu_red.xml.fdm_material
index 36b0eb9..3dc3b9e 100644
--- a/ultimaker_tpu_red.xml.fdm_material
+++ b/ultimaker_tpu_red.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Red</color>
         </name>
         <GUID>07a4547f-d21f-41a0-8eee-bc92125221b3</GUID>
-        <version>31</version>
+        <version>37</version>
         <color_code>#a63437</color_code>
         <description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -29,7 +29,7 @@
         <setting key="break speed">25</setting>
         <setting key="break temperature">195</setting>
         <setting key="pressure release dwell time">25</setting>
-        <setting key="dwell time before break preparation move">0</setting> 
+        <setting key="dwell time before break preparation move">0</setting>
         <setting key="end of print purge volume">0</setting>
         <setting key="end of filament purge volume">0</setting>
         <setting key="flush purge length">60</setting>
@@ -40,12 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">228</setting>
+        <setting key="standby temperature">128</setting>
         <setting key="heated bed temperature">0</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">27</setting>
         <setting key="adhesion tendency">3</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">27</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -70,15 +70,11 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction speed">35</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -94,7 +90,9 @@
             <setting key="retraction amount">10</setting>
 
             <hotend id="0.25 mm" />
-            <hotend id="0.4 mm" />
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">240</setting>
             </hotend>
@@ -107,15 +105,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -126,18 +119,15 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction amount">8</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -145,14 +135,8 @@
                 <setting key="retraction speed">45</setting>
                 <setting key="print cooling">50</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/ultimaker_tpu_white.xml.fdm_material b/ultimaker_tpu_white.xml.fdm_material
index a3547e0..8bf6335 100644
--- a/ultimaker_tpu_white.xml.fdm_material
+++ b/ultimaker_tpu_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>6a2573e6-c8ee-4c66-8029-3ebb3d5adc5b</GUID>
-        <version>31</version>
+        <version>37</version>
         <color_code>#f1ece1</color_code>
         <description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -29,7 +29,7 @@
         <setting key="break speed">25</setting>
         <setting key="break temperature">195</setting>
         <setting key="pressure release dwell time">25</setting>
-        <setting key="dwell time before break preparation move">0</setting> 
+        <setting key="dwell time before break preparation move">0</setting>
         <setting key="end of print purge volume">0</setting>
         <setting key="end of filament purge volume">0</setting>
         <setting key="flush purge length">60</setting>
@@ -40,12 +40,12 @@
 
         <!-- print settings -->
         <setting key="print temperature">228</setting>
+        <setting key="standby temperature">128</setting>
         <setting key="heated bed temperature">0</setting>
-        <setting key="standby temperature">175</setting>
+        <setting key="build volume temperature">27</setting>
         <setting key="adhesion tendency">3</setting>
         <setting key="surface energy">100</setting>
         <cura:setting key="material_crystallinity">true</cura:setting>
-        <setting key="build volume temperature">27</setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
@@ -70,15 +70,11 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction speed">35</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -94,7 +90,9 @@
             <setting key="retraction amount">10</setting>
 
             <hotend id="0.25 mm" />
-            <hotend id="0.4 mm" />
+            <hotend id="0.4 mm">
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
+            </hotend>
             <hotend id="0.6 mm">
                 <setting key="print temperature">240</setting>
             </hotend>
@@ -107,15 +105,10 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -126,18 +119,15 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7"/>
+
             <setting key="print temperature">223</setting>
 
-            <hotend id="BB 0.4" />
-            <hotend id="BB 0.8" />
-            <hotend id="CC 0.6" />
-            <hotend id="AA 0.25">
-                <setting key="hardware compatible">no</setting>
-            </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>
                 <setting key="retraction amount">8</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
@@ -145,14 +135,8 @@
                 <setting key="retraction speed">45</setting>
                 <setting key="print cooling">50</setting>
             </hotend>
-            <buildplate id="Glass">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">yes</setting>
-            </buildplate>
-            <buildplate id="Aluminum">
-                <setting key="hardware compatible">yes</setting>
-                <setting key="hardware recommended">no</setting>
-            </buildplate>
         </machine>
+
+
     </settings>
-</fdmmaterial>
+</fdmmaterial>
\ No newline at end of file
diff --git a/xyzprinting_pahtcf15.xml.fdm_material b/xyzprinting_pahtcf15.xml.fdm_material
new file mode 100644
index 0000000..507915b
--- /dev/null
+++ b/xyzprinting_pahtcf15.xml.fdm_material
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fdmmaterial version="1.3" xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura">
+  <metadata>
+    <name>
+      <brand>XYZprinting</brand>
+      <material>PAHT</material>
+      <color>Nature White</color>
+      <label>PAHT CF15</label>
+    </name>
+    <adhesion_info />
+    <GUID>c35c2e96-ef48-7c82-1671-08559df94d1b</GUID>
+    <description>PAHT CF15 is a tough, wear-resistant and oil-resistant wire with high strength and high density, which can show excellent surface quality and is not easy to warp during printing.</description>
+    <color_code>#ffffff</color_code>
+    <version>5</version>
+  </metadata>
+  <properties>
+    <density>1.15</density>
+    <diameter>1.75</diameter>
+    <weight>1000</weight>
+  </properties>
+  <settings>
+    <setting key="print cooling">100.0</setting>
+    <setting key="print temperature">260.0</setting>
+    <setting key="heated bed temperature">70</setting>
+    <setting key="standby temperature">260</setting>
+  </settings>
+</fdmmaterial>
diff --git a/xyzprinting_pc.xml.fdm_material b/xyzprinting_pc.xml.fdm_material
new file mode 100644
index 0000000..179a9d5
--- /dev/null
+++ b/xyzprinting_pc.xml.fdm_material
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fdmmaterial version="1.3" xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura">
+  <metadata>
+    <name>
+      <brand>XYZprinting</brand>
+      <material>PC</material>
+      <color>Black</color>
+      <label>PC</label>
+    </name>
+    <adhesion_info />
+    <GUID>bd60253b-6d27-5cc3-399d-fe94fe9b4cb0</GUID>
+    <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ยบC, mechanical strength and toughness.</description>
+    <color_code>#0e0e10</color_code>
+    <version>5</version>
+  </metadata>
+  <properties>
+    <density>1.19</density>
+    <diameter>1.75</diameter>
+    <weight>1000</weight>
+  </properties>
+  <settings>
+    <setting key="print cooling">100.0</setting>
+    <setting key="print temperature">250.0</setting>
+    <setting key="heated bed temperature">90</setting>
+    <setting key="standby temperature">250</setting>
+  </settings>
+</fdmmaterial>
diff --git a/xyzprinting_petcf15.xml.fdm_material b/xyzprinting_petcf15.xml.fdm_material
new file mode 100644
index 0000000..c56a7a4
--- /dev/null
+++ b/xyzprinting_petcf15.xml.fdm_material
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fdmmaterial version="1.3" xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura">
+  <metadata>
+    <name>
+      <brand>XYZprinting</brand>
+      <material>PET</material>
+      <color>Nature White</color>
+      <label>PET CF15</label>
+    </name>
+    <adhesion_info />
+    <GUID>b5c963c1-2663-9737-7013-05df4e3c51a5</GUID>
+    <description>PET CF15 is a kind of wire with good toughness and good gloss, which can withstand high impact force to prevent breakage, suitable for printing card fasteners.</description>
+    <color_code>#ffffff</color_code>
+    <version>5</version>
+  </metadata>
+  <properties>
+    <density>1.27</density>
+    <diameter>1.75</diameter>
+    <weight>1000</weight>
+  </properties>
+  <settings>
+    <setting key="print cooling">100.0</setting>
+    <setting key="print temperature">260.0</setting>
+    <setting key="heated bed temperature">70</setting>
+    <setting key="standby temperature">260</setting>
+  </settings>
+</fdmmaterial>
diff --git a/xyzprinting_ppgf30.xml.fdm_material b/xyzprinting_ppgf30.xml.fdm_material
new file mode 100644
index 0000000..f649a0f
--- /dev/null
+++ b/xyzprinting_ppgf30.xml.fdm_material
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<fdmmaterial version="1.3" xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura">
+  <metadata>
+    <name>
+      <brand>XYZprinting</brand>
+      <material>PP</material>
+      <color>Nature White</color>
+      <label>PP GF30</label>
+    </name>
+    <adhesion_info />
+    <GUID>83db87f5-092a-8acd-38e0-9466ba51cd93</GUID>
+    <description>PP is a semi-rigid and lightweight material. Its semi-crystalline structure causes 3D printed parts to warp easily when cooled. PP is tough and has good fatigue resistance, suitable for low-strength applications such as living hinges and belts.</description>
+    <color_code>#ffffff</color_code>
+    <version>5</version>
+  </metadata>
+  <properties>
+    <density>0.9</density>
+    <diameter>1.75</diameter>
+    <weight>1000</weight>
+  </properties>
+  <settings>
+    <setting key="print cooling">100.0</setting>
+    <setting key="print temperature">240.0</setting>
+    <setting key="heated bed temperature">90</setting>
+    <setting key="standby temperature">240</setting>
+  </settings>
+</fdmmaterial>

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/share/cura/resources/materials/eryone_tpu.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/generic_petcf.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/ideagen3D_ToughPLA.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/ultimaker_petcf_black.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/ultimaker_petcf_blue.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/ultimaker_petcf_gray.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/ultimaker_tough_pla_blue.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/ultimaker_tough_pla_gray.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/ultimaker_tough_pla_yellow.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/xyzprinting_pahtcf15.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/xyzprinting_pc.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/xyzprinting_petcf15.xml.fdm_material
-rw-r--r--  root/root   /usr/share/cura/resources/materials/xyzprinting_ppgf30.xml.fdm_material

No differences were encountered in the control files

More details

Full run details