diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material
index c093ea8d3..44384a9ba 100644
--- a/generic_abs.xml.fdm_material
+++ b/generic_abs.xml.fdm_material
@@ -10,7 +10,7 @@ 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>39</version>
+        <version>40</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>
@@ -170,7 +170,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material
index 1e42c2f6a..a271140f0 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>41</version>
+        <version>42</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>
@@ -171,7 +171,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_cpe_plus.xml.fdm_material b/generic_cpe_plus.xml.fdm_material
index 218b5d3a0..4bcdab98d 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>41</version>
+        <version>42</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>
@@ -155,7 +155,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_gffcpe.xml.fdm_material b/generic_gffcpe.xml.fdm_material
index 560a91e6b..9e8161f1b 100644
--- a/generic_gffcpe.xml.fdm_material
+++ b/generic_gffcpe.xml.fdm_material
@@ -119,6 +119,7 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
             <setting key="print cooling">1</setting>
             <setting key="anti ooze retract position">-6</setting>
             <setting key="no load move factor">1</setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
diff --git a/generic_nylon.xml.fdm_material b/generic_nylon.xml.fdm_material
index f525a880f..58ecdd500 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>35</version>
+        <version>36</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>
@@ -179,7 +179,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_pc.xml.fdm_material b/generic_pc.xml.fdm_material
index 121ce70a3..d96bda990 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>38</version>
+        <version>39</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>
@@ -163,7 +163,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_petcf.xml.fdm_material b/generic_petcf.xml.fdm_material
index 27caa3603..fd4a85383 100644
--- a/generic_petcf.xml.fdm_material
+++ b/generic_petcf.xml.fdm_material
@@ -58,6 +58,7 @@ Generic PET-CF profile. The data in this file may not be correct for your specif
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
diff --git a/generic_petg.xml.fdm_material b/generic_petg.xml.fdm_material
index fa2a057d3..c59c18c46 100644
--- a/generic_petg.xml.fdm_material
+++ b/generic_petg.xml.fdm_material
@@ -10,7 +10,7 @@ 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>27</version>
+        <version>28</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>
@@ -158,7 +158,7 @@ Generic PETG profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_pp.xml.fdm_material b/generic_pp.xml.fdm_material
index bf4ad627d..8996bd615 100644
--- a/generic_pp.xml.fdm_material
+++ b/generic_pp.xml.fdm_material
@@ -10,7 +10,7 @@ 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>45</version>
+        <version>46</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>
@@ -185,7 +185,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_tough_pla.xml.fdm_material b/generic_tough_pla.xml.fdm_material
index 74279cac1..b7980e40d 100644
--- a/generic_tough_pla.xml.fdm_material
+++ b/generic_tough_pla.xml.fdm_material
@@ -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>33</version>
+        <version>34</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>
@@ -154,7 +154,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/generic_tpu.xml.fdm_material b/generic_tpu.xml.fdm_material
index dcef69aab..b095fe08c 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>39</version>
+        <version>40</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>
@@ -162,7 +162,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs.xml.fdm_material b/ultimaker_abs.xml.fdm_material
index d2791fe3d..a71f65ce3 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>11</version>
+        <version>12</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>
@@ -171,7 +171,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_black.xml.fdm_material b/ultimaker_abs_black.xml.fdm_material
index 2c66c9056..971675dfc 100644
--- a/ultimaker_abs_black.xml.fdm_material
+++ b/ultimaker_abs_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>2f9d2279-9b0e-4765-bf9b-d1e1e13f3c49</GUID>
-        <version>43</version>
+        <version>44</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_blue.xml.fdm_material b/ultimaker_abs_blue.xml.fdm_material
index 24d25331a..f64c74c56 100644
--- a/ultimaker_abs_blue.xml.fdm_material
+++ b/ultimaker_abs_blue.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Blue</color>
         </name>
         <GUID>7c9575a6-c8d6-40ec-b3dd-18d7956bfaae</GUID>
-        <version>43</version>
+        <version>44</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_green.xml.fdm_material b/ultimaker_abs_green.xml.fdm_material
index 8ba371584..0b97ce05f 100644
--- a/ultimaker_abs_green.xml.fdm_material
+++ b/ultimaker_abs_green.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Green</color>
         </name>
         <GUID>3400c0d1-a4e3-47de-a444-7b704f287171</GUID>
-        <version>43</version>
+        <version>44</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_grey.xml.fdm_material b/ultimaker_abs_grey.xml.fdm_material
index 7d83fb890..4bf2c29a2 100644
--- a/ultimaker_abs_grey.xml.fdm_material
+++ b/ultimaker_abs_grey.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Gray</color>
         </name>
         <GUID>8b75b775-d3f2-4d0f-8fb2-2a3dd53cf673</GUID>
-        <version>44</version>
+        <version>45</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_orange.xml.fdm_material b/ultimaker_abs_orange.xml.fdm_material
index 62949108a..99bc98f01 100644
--- a/ultimaker_abs_orange.xml.fdm_material
+++ b/ultimaker_abs_orange.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Orange</color>
         </name>
         <GUID>0b4ca6ef-eac8-4b23-b3ca-5f21af00e54f</GUID>
-        <version>43</version>
+        <version>44</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_pearl-gold.xml.fdm_material b/ultimaker_abs_pearl-gold.xml.fdm_material
index 6ae7ec443..04b826e48 100644
--- a/ultimaker_abs_pearl-gold.xml.fdm_material
+++ b/ultimaker_abs_pearl-gold.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Pearl Gold</color>
         </name>
         <GUID>7cbdb9ca-081a-456f-a6ba-f73e4e9cb856</GUID>
-        <version>43</version>
+        <version>44</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_red.xml.fdm_material b/ultimaker_abs_red.xml.fdm_material
index 615c53363..d868063c4 100644
--- a/ultimaker_abs_red.xml.fdm_material
+++ b/ultimaker_abs_red.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Red</color>
         </name>
         <GUID>5df7afa6-48bd-4c19-b314-839fe9f08f1f</GUID>
-        <version>43</version>
+        <version>44</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_silver-metallic.xml.fdm_material b/ultimaker_abs_silver-metallic.xml.fdm_material
index 575b29a57..b33b49277 100644
--- a/ultimaker_abs_silver-metallic.xml.fdm_material
+++ b/ultimaker_abs_silver-metallic.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Silver</color>
         </name>
         <GUID>763c926e-a5f7-4ba0-927d-b4e038ea2735</GUID>
-        <version>44</version>
+        <version>45</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_white.xml.fdm_material b/ultimaker_abs_white.xml.fdm_material
index 7f473d31c..c2aec2b3f 100644
--- a/ultimaker_abs_white.xml.fdm_material
+++ b/ultimaker_abs_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>5253a75a-27dc-4043-910f-753ae11bc417</GUID>
-        <version>46</version>
+        <version>47</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_abs_yellow.xml.fdm_material b/ultimaker_abs_yellow.xml.fdm_material
index 7b894ef20..491680c11 100644
--- a/ultimaker_abs_yellow.xml.fdm_material
+++ b/ultimaker_abs_yellow.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Yellow</color>
         </name>
         <GUID>e873341d-d9b8-45f9-9a6f-5609e1bcff68</GUID>
-        <version>43</version>
+        <version>44</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>
@@ -169,7 +169,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe.xml.fdm_material b/ultimaker_cpe.xml.fdm_material
index 39e40bde8..584d616ee 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>10</version>
+        <version>11</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>
@@ -172,7 +172,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_black.xml.fdm_material b/ultimaker_cpe_black.xml.fdm_material
index 7c65f21ff..a0a0708ce 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>45</version>
+        <version>46</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_blue.xml.fdm_material b/ultimaker_cpe_blue.xml.fdm_material
index 18f5c9eed..f3b2c6895 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>45</version>
+        <version>46</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_dark-grey.xml.fdm_material b/ultimaker_cpe_dark-grey.xml.fdm_material
index 4fb493c9b..2fb05e843 100644
--- a/ultimaker_cpe_dark-grey.xml.fdm_material
+++ b/ultimaker_cpe_dark-grey.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Dark Gray</color>
         </name>
         <GUID>10961c00-3caf-48e9-a598-fa805ada1e8d</GUID>
-        <version>46</version>
+        <version>47</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_green.xml.fdm_material b/ultimaker_cpe_green.xml.fdm_material
index 210973531..0e4f8d8fe 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>45</version>
+        <version>46</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_light-grey.xml.fdm_material b/ultimaker_cpe_light-grey.xml.fdm_material
index 71c6a8eab..697bd4e66 100644
--- a/ultimaker_cpe_light-grey.xml.fdm_material
+++ b/ultimaker_cpe_light-grey.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Light Gray</color>
         </name>
         <GUID>173a7bae-5e14-470e-817e-08609c61e12b</GUID>
-        <version>46</version>
+        <version>47</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_plus.xml.fdm_material b/ultimaker_cpe_plus.xml.fdm_material
index 572531cbb..057a46951 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>9</version>
+        <version>10</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>
@@ -156,7 +156,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_plus_black.xml.fdm_material b/ultimaker_cpe_plus_black.xml.fdm_material
index f7eeefec3..069559c8a 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>46</version>
+        <version>47</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>
@@ -154,7 +154,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_plus_transparent.xml.fdm_material b/ultimaker_cpe_plus_transparent.xml.fdm_material
index fc182f6c8..14756d59b 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>46</version>
+        <version>47</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>
@@ -154,7 +154,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_plus_white.xml.fdm_material b/ultimaker_cpe_plus_white.xml.fdm_material
index 35e05372a..dafe5ac77 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>46</version>
+        <version>47</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>
@@ -154,7 +154,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_red.xml.fdm_material b/ultimaker_cpe_red.xml.fdm_material
index 3d69b5908..eb70b8b12 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>45</version>
+        <version>46</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_transparent.xml.fdm_material b/ultimaker_cpe_transparent.xml.fdm_material
index 3154f4faf..4316fc084 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>45</version>
+        <version>46</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_white.xml.fdm_material b/ultimaker_cpe_white.xml.fdm_material
index b5197cb60..9dafce7a1 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>45</version>
+        <version>46</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_cpe_yellow.xml.fdm_material b/ultimaker_cpe_yellow.xml.fdm_material
index 8b3b523cc..cbae4ad34 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>45</version>
+        <version>46</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>
@@ -170,7 +170,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_nylon.xml.fdm_material b/ultimaker_nylon.xml.fdm_material
index 144094712..458789564 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>10</version>
+        <version>11</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>
@@ -180,7 +180,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_nylon_black.xml.fdm_material b/ultimaker_nylon_black.xml.fdm_material
index 63bec3660..ba2049b09 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>39</version>
+        <version>40</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>
@@ -178,7 +178,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_nylon_transparent.xml.fdm_material b/ultimaker_nylon_transparent.xml.fdm_material
index 8c87e94ba..186154f6b 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>39</version>
+        <version>40</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>
@@ -178,7 +178,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_pc.xml.fdm_material b/ultimaker_pc.xml.fdm_material
index c972bb2f8..7255290b5 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>10</version>
+        <version>11</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>
@@ -164,7 +164,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_pc_black.xml.fdm_material b/ultimaker_pc_black.xml.fdm_material
index 8d910e3c5..25512fb46 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>42</version>
+        <version>43</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>
@@ -162,7 +162,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_pc_transparent.xml.fdm_material b/ultimaker_pc_transparent.xml.fdm_material
index 2b18cdb06..035383707 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>42</version>
+        <version>43</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>
@@ -162,7 +162,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_pc_white.xml.fdm_material b/ultimaker_pc_white.xml.fdm_material
index e15000d5e..c350a29c8 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>42</version>
+        <version>43</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>
@@ -162,7 +162,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petcf.xml.fdm_material b/ultimaker_petcf.xml.fdm_material
index 7a2b7e623..11417ea0b 100644
--- a/ultimaker_petcf.xml.fdm_material
+++ b/ultimaker_petcf.xml.fdm_material
@@ -59,6 +59,7 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
diff --git a/ultimaker_petcf_black.xml.fdm_material b/ultimaker_petcf_black.xml.fdm_material
index 825957edf..0030bf6ef 100644
--- a/ultimaker_petcf_black.xml.fdm_material
+++ b/ultimaker_petcf_black.xml.fdm_material
@@ -57,6 +57,7 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
diff --git a/ultimaker_petcf_blue.xml.fdm_material b/ultimaker_petcf_blue.xml.fdm_material
index 34d53ea6c..777af54ca 100644
--- a/ultimaker_petcf_blue.xml.fdm_material
+++ b/ultimaker_petcf_blue.xml.fdm_material
@@ -57,6 +57,7 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
diff --git a/ultimaker_petcf_gray.xml.fdm_material b/ultimaker_petcf_gray.xml.fdm_material
index e52a00576..71ae1b7cf 100644
--- a/ultimaker_petcf_gray.xml.fdm_material
+++ b/ultimaker_petcf_gray.xml.fdm_material
@@ -57,6 +57,7 @@
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>
diff --git a/ultimaker_petg.xml.fdm_material b/ultimaker_petg.xml.fdm_material
index 91063c8ae..3a4277b03 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>10</version>
+        <version>11</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>
@@ -159,7 +159,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_black.xml.fdm_material b/ultimaker_petg_black.xml.fdm_material
index 416fb0590..f6ce643ad 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_blue.xml.fdm_material b/ultimaker_petg_blue.xml.fdm_material
index ebfdc52c9..4902f4a01 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_blue_translucent.xml.fdm_material b/ultimaker_petg_blue_translucent.xml.fdm_material
index a1b5545c2..038afc590 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_green.xml.fdm_material b/ultimaker_petg_green.xml.fdm_material
index 439bbb2bc..1707d2e16 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_green_translucent.xml.fdm_material b/ultimaker_petg_green_translucent.xml.fdm_material
index 2332cb2e1..aac413285 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_grey.xml.fdm_material b/ultimaker_petg_grey.xml.fdm_material
index d037b23d9..2f09d93be 100644
--- a/ultimaker_petg_grey.xml.fdm_material
+++ b/ultimaker_petg_grey.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Gray</color>
         </name>
         <GUID>c8394116-30ba-4112-b4d9-8b2394278cb3</GUID>
-        <version>46</version>
+        <version>47</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_orange.xml.fdm_material b/ultimaker_petg_orange.xml.fdm_material
index 6f3e8797d..349646481 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_red.xml.fdm_material b/ultimaker_petg_red.xml.fdm_material
index 078b7e797..d849c8eee 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_red_translucent.xml.fdm_material b/ultimaker_petg_red_translucent.xml.fdm_material
index 1b0f61961..1a1013fa7 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_silver.xml.fdm_material b/ultimaker_petg_silver.xml.fdm_material
index e225e7447..926e746f5 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_transparent.xml.fdm_material b/ultimaker_petg_transparent.xml.fdm_material
index f54744170..9d1994cc8 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_white.xml.fdm_material b/ultimaker_petg_white.xml.fdm_material
index cc76c2ff5..c9ce2cc6f 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_yellow.xml.fdm_material b/ultimaker_petg_yellow.xml.fdm_material
index d22aa2435..cd3fbc2ad 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_petg_yellow_fluorescent.xml.fdm_material b/ultimaker_petg_yellow_fluorescent.xml.fdm_material
index ed302a528..60daf577e 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>45</version>
+        <version>46</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>
@@ -157,7 +157,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_pp_transparent.xml.fdm_material b/ultimaker_pp_transparent.xml.fdm_material
index 28c257245..6a8650e00 100644
--- a/ultimaker_pp_transparent.xml.fdm_material
+++ b/ultimaker_pp_transparent.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Natural</color>
         </name>
         <GUID>c7005925-2a41-4280-8cdd-4029e3fe5253</GUID>
-        <version>50</version>
+        <version>51</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>
@@ -184,7 +184,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla.xml.fdm_material b/ultimaker_tough_pla.xml.fdm_material
index 154cf5497..62da06161 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>10</version>
+        <version>11</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>
@@ -155,7 +155,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla_175.xml.fdm_material b/ultimaker_tough_pla_175.xml.fdm_material
index 4098ea965..aae4eedd2 100644
--- a/ultimaker_tough_pla_175.xml.fdm_material
+++ b/ultimaker_tough_pla_175.xml.fdm_material
@@ -9,7 +9,7 @@
         </name>
         <GUID>de031137-a8ca-4a72-bd1b-17bb964033ad</GUID>
         <reference_material_id>im-pla</reference_material_id>
-        <version>3</version>
+        <version>4</version>
         <color_code>#f5f2d1</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>No glue required</adhesion_info>
@@ -119,5 +119,20 @@
                 <setting key="hardware compatible">yes</setting>
             </hotend>
         </machine>
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Sketch Sprint" />
+            <setting key="print temperature">215</setting>
+            <setting key="standby temperature">165</setting>
+            <setting key="print cooling">100</setting>
+            <setting key="heated bed temperature">55</setting>
+            <cura:setting key="material_bed_temperature_layer_0">60</cura:setting>
+            <cura:setting key="material_final_print_temperature">215</cura:setting>
+            <cura:setting key="material_initial_print_temperature">215</cura:setting>
+            <cura:setting key="cool_min_temperature">215</cura:setting>
+            <cura:setting key="material_print_temperature_layer_0">230</cura:setting>
+            <hotend id="0.4mm">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
     </settings>
 </fdmmaterial>
diff --git a/ultimaker_tough_pla_black.xml.fdm_material b/ultimaker_tough_pla_black.xml.fdm_material
index fed5b3b01..b2bdde06d 100644
--- a/ultimaker_tough_pla_black.xml.fdm_material
+++ b/ultimaker_tough_pla_black.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Black</color>
         </name>
         <GUID>03f24266-0291-43c2-a6da-5211892a2699</GUID>
-        <version>37</version>
+        <version>38</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>
@@ -153,7 +153,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla_blue.xml.fdm_material b/ultimaker_tough_pla_blue.xml.fdm_material
index eabfdd265..1ecce7c7d 100644
--- a/ultimaker_tough_pla_blue.xml.fdm_material
+++ b/ultimaker_tough_pla_blue.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Blue</color>
         </name>
         <GUID>4b049931-6ee9-408c-8588-ddd4673467d1</GUID>
-        <version>16</version>
+        <version>17</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>
@@ -153,7 +153,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla_gray.xml.fdm_material b/ultimaker_tough_pla_gray.xml.fdm_material
index 6a8d65ec2..f4ab7357f 100644
--- a/ultimaker_tough_pla_gray.xml.fdm_material
+++ b/ultimaker_tough_pla_gray.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Gray</color>
         </name>
         <GUID>6660eb2e-aa40-49ad-ac9b-ada979f3de9b</GUID>
-        <version>16</version>
+        <version>17</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>
@@ -153,7 +153,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla_green.xml.fdm_material b/ultimaker_tough_pla_green.xml.fdm_material
index ef0f161ff..6aa18b319 100644
--- a/ultimaker_tough_pla_green.xml.fdm_material
+++ b/ultimaker_tough_pla_green.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Green</color>
         </name>
         <GUID>6d71f4ad-29ab-4b50-8f65-22d99af294dd</GUID>
-        <version>37</version>
+        <version>38</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>
@@ -153,7 +153,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla_red.xml.fdm_material b/ultimaker_tough_pla_red.xml.fdm_material
index 23082eecb..22caaf0a8 100644
--- a/ultimaker_tough_pla_red.xml.fdm_material
+++ b/ultimaker_tough_pla_red.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Red</color>
         </name>
         <GUID>2db25566-9a91-4145-84a5-46c90ed22bdf</GUID>
-        <version>37</version>
+        <version>38</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>
@@ -153,7 +153,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla_white.xml.fdm_material b/ultimaker_tough_pla_white.xml.fdm_material
index 38965b53f..565015cf6 100644
--- a/ultimaker_tough_pla_white.xml.fdm_material
+++ b/ultimaker_tough_pla_white.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>White</color>
         </name>
         <GUID>851427a0-0c9a-4d7c-a9a8-5cc92f84af1f</GUID>
-        <version>37</version>
+        <version>38</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>
@@ -153,7 +153,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tough_pla_yellow.xml.fdm_material b/ultimaker_tough_pla_yellow.xml.fdm_material
index 63c609453..91dd393f9 100644
--- a/ultimaker_tough_pla_yellow.xml.fdm_material
+++ b/ultimaker_tough_pla_yellow.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Yellow</color>
         </name>
         <GUID>bfdb0787-032d-4cf5-9975-964132bd641c</GUID>
-        <version>16</version>
+        <version>17</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>
@@ -153,7 +153,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tpu.xml.fdm_material b/ultimaker_tpu.xml.fdm_material
index 516a90c43..bff43049b 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>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>
@@ -163,7 +163,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tpu_black.xml.fdm_material b/ultimaker_tpu_black.xml.fdm_material
index 28a2e8db4..8e7a008d6 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>43</version>
+        <version>44</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>
@@ -161,7 +161,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tpu_blue.xml.fdm_material b/ultimaker_tpu_blue.xml.fdm_material
index 321dad795..afbd4204d 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>43</version>
+        <version>44</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>
@@ -161,7 +161,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tpu_red.xml.fdm_material b/ultimaker_tpu_red.xml.fdm_material
index 0e0b19b81..3dff494d5 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>43</version>
+        <version>44</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>
@@ -161,7 +161,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">
diff --git a/ultimaker_tpu_white.xml.fdm_material b/ultimaker_tpu_white.xml.fdm_material
index 948183e40..cb456a5b3 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>43</version>
+        <version>44</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>
@@ -161,7 +161,7 @@
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">