diff --git a/ultimaker_abs.xml.fdm_material b/ultimaker_abs.xml.fdm_material
index cae54bd17..aa0f479a1 100644
--- a/ultimaker_abs.xml.fdm_material
+++ b/ultimaker_abs.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color ABS</label>
         </name>
         <GUID>94209c78-8d4d-4866-8a60-5e1f7adb0c36</GUID>
-        <version>5</version>
+        <version>6</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>
@@ -41,8 +41,8 @@
         <setting key="no load move factor">0.92</setting>
 
         <!-- print settings -->
-        <setting key="print temperature">230</setting>
-        <setting key="standby temperature">130</setting>
+        <setting key="print temperature">245</setting>
+        <setting key="standby temperature">145</setting>
         <setting key="heated bed temperature">80</setting>
         <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
@@ -55,9 +55,15 @@
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
+            <setting key="print temperature">230</setting>
+        </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
+            <setting key="print temperature">230</setting>
 
             <hotend id="0.25 mm" />
             <hotend id="0.4 mm" />
@@ -70,7 +76,6 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">225</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -109,7 +114,6 @@
             <setting key="heated bed temperature">85</setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">225</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -128,7 +132,6 @@
             <setting key="heated bed temperature">85</setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">225</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
diff --git a/ultimaker_cpe.xml.fdm_material b/ultimaker_cpe.xml.fdm_material
index b9478c2d0..7be432776 100644
--- a/ultimaker_cpe.xml.fdm_material
+++ b/ultimaker_cpe.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color CPE</label>
         </name>
         <GUID>3cf87e76-dae0-42cb-ae86-3d39918af2ad</GUID>
-        <version>5</version>
+        <version>6</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,8 +41,8 @@
         <setting key="no load move factor">0.92</setting>
 
         <!-- print settings -->
-        <setting key="print temperature">240</setting>
-        <setting key="standby temperature">140</setting>
+        <setting key="print temperature">245</setting>
+        <setting key="standby temperature">145</setting>
         <setting key="heated bed temperature">85</setting>
         <setting key="build volume temperature">37</setting>
         <setting key="adhesion tendency">0</setting>
@@ -53,9 +53,15 @@
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
+            <setting key="print temperature">240</setting>
+        </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
+            <setting key="print temperature">240</setting>
 
             <hotend id="0.25 mm" />
             <hotend id="0.4 mm" />
@@ -70,7 +76,6 @@
             <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="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -106,7 +111,6 @@
             <setting key="heated bed temperature">85</setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">230</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -127,7 +131,6 @@
 
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">230</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
diff --git a/ultimaker_cpe_plus.xml.fdm_material b/ultimaker_cpe_plus.xml.fdm_material
index ace61c551..ebc850161 100644
--- a/ultimaker_cpe_plus.xml.fdm_material
+++ b/ultimaker_cpe_plus.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color CPE+</label>
         </name>
         <GUID>4034cfaa-a512-4645-a07d-89a2dd4db91d</GUID>
-        <version>5</version>
+        <version>6</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,8 +41,8 @@
         <setting key="no load move factor">0.92</setting>
 
         <!-- print settings -->
-        <setting key="print temperature">260</setting>
-        <setting key="standby temperature">160</setting>
+        <setting key="print temperature">270</setting>
+        <setting key="standby temperature">170</setting>
         <setting key="heated bed temperature">107</setting>
         <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
@@ -54,9 +54,15 @@
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
+            <setting key="print temperature">260</setting>
+        </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
+            <setting key="print temperature">260</setting>
             <setting key="hardware compatible">yes</setting>
 
             <hotend id="0.4 mm" />
diff --git a/ultimaker_nylon.xml.fdm_material b/ultimaker_nylon.xml.fdm_material
index 74fa9285c..f75edc7ff 100644
--- a/ultimaker_nylon.xml.fdm_material
+++ b/ultimaker_nylon.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color Nylon</label>
         </name>
         <GUID>c6714ed4-9734-4266-b4e1-d90b8b0c2434</GUID>
-        <version>5</version>
+        <version>6</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,8 +41,8 @@
         <setting key="no load move factor">0.91</setting>
 
         <!-- print settings -->
-        <setting key="print temperature">245</setting>
-        <setting key="standby temperature">145</setting>
+        <setting key="print temperature">250</setting>
+        <setting key="standby temperature">150</setting>
         <setting key="heated bed temperature">60</setting>
         <setting key="build volume temperature">35</setting>
         <setting key="retraction amount">8</setting>
@@ -56,9 +56,15 @@
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
+            <setting key="print temperature">245</setting>
+        </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
+            <setting key="print temperature">245</setting>
 
             <hotend id="0.25 mm" />
             <hotend id="0.4 mm" />
@@ -74,7 +80,6 @@
 
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">230</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -113,7 +118,6 @@
 
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">230</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
@@ -136,7 +140,6 @@
 
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">230</setting>
                 <setting key="retraction amount">6.5</setting>
                 <setting key="retraction speed">45</setting>
             </hotend>
diff --git a/ultimaker_pc.xml.fdm_material b/ultimaker_pc.xml.fdm_material
index 5d799e600..27165f626 100644
--- a/ultimaker_pc.xml.fdm_material
+++ b/ultimaker_pc.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color PC</label>
         </name>
         <GUID>59675b16-d902-4cb3-a780-a539cae0b04d</GUID>
-        <version>5</version>
+        <version>6</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,8 +41,8 @@
         <setting key="no load move factor">0.92</setting>
 
         <!-- print settings -->
-        <setting key="print temperature">270</setting>
-        <setting key="standby temperature">170</setting>
+        <setting key="print temperature">280</setting>
+        <setting key="standby temperature">180</setting>
         <setting key="heated bed temperature">107</setting>
         <setting key="build volume temperature">41</setting>
         <setting key="adhesion tendency">0</setting>
@@ -54,9 +54,16 @@
         <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 Original"/>
+            <setting key="print temperature">270</setting>
+        </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
+            <setting key="print temperature">270</setting>
             <setting key="hardware compatible">yes</setting>
 
             <hotend id="0.25 mm" />
diff --git a/ultimaker_petg.xml.fdm_material b/ultimaker_petg.xml.fdm_material
index 2d17250e5..5e4a2a6f9 100644
--- a/ultimaker_petg.xml.fdm_material
+++ b/ultimaker_petg.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color PETG</label>
         </name>
         <GUID>91bd2402-1766-4cb0-9b21-6435e5095395</GUID>
-        <version>5</version>
+        <version>6</version>
         <color_code>#ff5086</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>
@@ -78,7 +78,6 @@
             <setting key="heated bed temperature">85</setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">230</setting>
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
@@ -97,7 +96,6 @@
             <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="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -122,7 +120,6 @@
             <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="retraction amount">6.5</setting>
             </hotend>
             <hotend id="AA 0.4">
diff --git a/ultimaker_tough_pla.xml.fdm_material b/ultimaker_tough_pla.xml.fdm_material
index 4927fbae2..b306478ff 100644
--- a/ultimaker_tough_pla.xml.fdm_material
+++ b/ultimaker_tough_pla.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color Tough PLA</label>
         </name>
         <GUID>2c31d5ae-a75c-4be6-83bf-377341fc6d24</GUID>
-        <version>5</version>
+        <version>6</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,8 +41,8 @@
         <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="print temperature">215</setting>
+        <setting key="standby temperature">115</setting>
         <setting key="heated bed temperature">60</setting>
         <setting key="build volume temperature">24</setting>
         <setting key="print cooling">100</setting>
diff --git a/ultimaker_tpu.xml.fdm_material b/ultimaker_tpu.xml.fdm_material
index ddbcdfbff..9fa9094c3 100644
--- a/ultimaker_tpu.xml.fdm_material
+++ b/ultimaker_tpu.xml.fdm_material
@@ -8,7 +8,7 @@
             <label>Any color TPU</label>
         </name>
         <GUID>bddeb098-9e1f-4d0b-be9f-e99f6f8277d8</GUID>
-        <version>5</version>
+        <version>6</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>
@@ -41,8 +41,8 @@
         <setting key="no load move factor">1.03</setting>
 
         <!-- print settings -->
-        <setting key="print temperature">228</setting>
-        <setting key="standby temperature">128</setting>
+        <setting key="print temperature">225</setting>
+        <setting key="standby temperature">125</setting>
         <setting key="heated bed temperature">0</setting>
         <setting key="build volume temperature">27</setting>
         <setting key="adhesion tendency">3</setting>
@@ -54,9 +54,15 @@
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
+            <setting key="print temperature">228</setting>
+        </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
+            <setting key="print temperature">228</setting>
             <setting key="hardware compatible">yes</setting>
 
             <hotend id="0.25 mm" />
@@ -70,7 +76,6 @@
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print temperature">223</setting>
 
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
@@ -105,7 +110,6 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3"/>
-            <setting key="print temperature">223</setting>
 
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
@@ -123,8 +127,6 @@
             <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="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print cooling">20</setting>