diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json
index 18b377813a..1b3ddcc953 100644
--- a/resources/definitions/ultimaker2_plus.def.json
+++ b/resources/definitions/ultimaker2_plus.def.json
@@ -20,10 +20,14 @@
             "ultimaker_tough_pla_green",
             "ultimaker_tough_pla_red",
             "ultimaker_tough_pla_white",
+            "ultimaker_tough_pla_blue",
+            "ultimaker_tough_pla_gray",
+            "ultimaker_tough_pla_yellow",
             "generic_cffcpe",
             "generic_cffpa",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_petcf",
             "structur3d_dap100silicone",
             "ultimaker_petg_red",
             "ultimaker_petg_blue",
@@ -38,7 +42,10 @@
             "ultimaker_petg_red_translucent",
             "ultimaker_petg_blue_translucent",
             "ultimaker_petg_green_translucent",
-            "ultimaker_petg_yellow_fluorescent"
+            "ultimaker_petg_yellow_fluorescent",
+            "ultimaker_petcf_black",
+            "ultimaker_petcf_blue",
+            "ultimaker_petcf_gray"
         ],
         "firmware_file": "MarlinUltimaker2plus.hex",
         "first_start_actions": [],
diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json
index dc55d8febf..20e914284f 100644
--- a/resources/definitions/ultimaker2_plus_connect.def.json
+++ b/resources/definitions/ultimaker2_plus_connect.def.json
@@ -10,19 +10,14 @@
         "platform": "ultimaker2_plus_connect_platform.obj",
         "exclude_materials": [
             "generic_hips",
-            "generic_petg",
             "generic_bam",
             "ultimaker_bam",
             "generic_pva",
             "ultimaker_pva",
-            "generic_tough_pla",
-            "ultimaker_tough_pla_black",
-            "ultimaker_tough_pla_green",
-            "ultimaker_tough_pla_red",
-            "ultimaker_tough_pla_white",
-            "ultimaker_tough_pla_blue",
-            "ultimaker_tough_pla_gray",
-            "ultimaker_tough_pla_yellow",
+            "ultimaker_petcf_black",
+            "ultimaker_petcf_blue",
+            "ultimaker_petcf_gray",
+            "generic_petcf",
             "generic_cffcpe",
             "generic_cffpa",
             "generic_gffcpe",
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index a929e28258..af8fc07122 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -18,6 +18,10 @@
             "generic_cffpa",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_petcf",
+            "ultimaker_petcf_black",
+            "ultimaker_petcf_blue",
+            "ultimaker_petcf_gray",
             "structur3d_dap100silicone"
         ],
         "firmware_update_info":
diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json
index c34dd4aadf..00f4615971 100644
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@@ -21,10 +21,14 @@
             "ultimaker_tough_pla_green",
             "ultimaker_tough_pla_red",
             "ultimaker_tough_pla_white",
+            "ultimaker_tough_pla_blue",
+            "ultimaker_tough_pla_gray",
+            "ultimaker_tough_pla_yellow",
             "generic_cffcpe",
             "generic_cffpa",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_petcf",
             "structur3d_dap100silicone",
             "ultimaker_petg_blue",
             "ultimaker_petg_grey",
@@ -39,7 +43,10 @@
             "ultimaker_petg_blue_translucent",
             "ultimaker_petg_green_translucent",
             "ultimaker_petg_yellow_fluorescent",
-            "ultimaker_petg_red"
+            "ultimaker_petg_red",
+            "ultimaker_petcf_black",
+            "ultimaker_petcf_blue",
+            "ultimaker_petcf_gray"
         ],
         "firmware_file": "MarlinUltimaker-{baudrate}.hex",
         "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex",
diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json
index 59bc4fb8bb..ee024dcf0d 100644
--- a/resources/definitions/ultimaker_original_dual.def.json
+++ b/resources/definitions/ultimaker_original_dual.def.json
@@ -21,10 +21,14 @@
             "ultimaker_tough_pla_green",
             "ultimaker_tough_pla_red",
             "ultimaker_tough_pla_white",
+            "ultimaker_tough_pla_blue",
+            "ultimaker_tough_pla_gray",
+            "ultimaker_tough_pla_yellow",
             "generic_cffcpe",
             "generic_cffpa",
             "generic_gffcpe",
             "generic_gffpa",
+            "generic_petcf",
             "structur3d_dap100silicone",
             "ultimaker_petg_blue",
             "ultimaker_petg_grey",
@@ -39,7 +43,10 @@
             "ultimaker_petg_blue_translucent",
             "ultimaker_petg_green_translucent",
             "ultimaker_petg_yellow_fluorescent",
-            "ultimaker_petg_red"
+            "ultimaker_petg_red",
+            "ultimaker_petcf_black",
+            "ultimaker_petcf_blue",
+            "ultimaker_petcf_gray"
         ],
         "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex",
         "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex",
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 238df96300..10aaabd6a7 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -16,7 +16,6 @@
         ],
         "exclude_materials": [
             "generic_hips",
-            "generic_petg",
             "structur3d_dap100silicone"
         ],
         "firmware_update_info":